svn commit: r539528 - in /incubator/nmaven/branches/SI_XPT: ./ assemblies/ plugins/ plugins/NMaven.Plugin.Addin/src/main/csharp/NMaven/Plugin/Addin/ plugins/maven-embedder-plugin/src/main/java/org/apa
Author: sisbell Date: Fri May 18 10:21:28 2007 New Revision: 539528 URL: http://svn.apache.org/viewvc?view=rev&rev=539528 Log: Fixed some build problems. Modified: incubator/nmaven/branches/SI_XPT/assemblies/pom.xml incubator/nmaven/branches/SI_XPT/bootstrap-build.bat incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/csharp/NMaven/Plugin/Addin/AutomationExtensibilityMojo.cs incubator/nmaven/branches/SI_XPT/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java incubator/nmaven/branches/SI_XPT/plugins/pom-netplugins.xml incubator/nmaven/branches/SI_XPT/site/pom.xml incubator/nmaven/branches/SI_XPT/site/src/site/apt/adding-executables.apt incubator/nmaven/branches/SI_XPT/site/src/site/apt/features.apt incubator/nmaven/branches/SI_XPT/site/src/site/apt/getting-started.apt incubator/nmaven/branches/SI_XPT/site/src/site/apt/index.apt incubator/nmaven/branches/SI_XPT/site/src/site/site.xml Modified: incubator/nmaven/branches/SI_XPT/assemblies/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/pom.xml?view=diff&rev=539528&r1=539527&r2=539528 == --- incubator/nmaven/branches/SI_XPT/assemblies/pom.xml (original) +++ incubator/nmaven/branches/SI_XPT/assemblies/pom.xml Fri May 18 10:21:28 2007 @@ -153,6 +153,9 @@ org.apache.maven.dotnet.plugins maven-compile-plugin true + + 2.0.50727 + @@ -167,6 +170,19 @@ NMaven.VisualStudio NMaven.VisualStudio.Addin + + + +org.apache.maven.dotnet.plugins +maven-compile-plugin +true + + MICROSOFT + 2.0.50727 + + + + Modified: incubator/nmaven/branches/SI_XPT/bootstrap-build.bat URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/bootstrap-build.bat?view=diff&rev=539528&r1=539527&r2=539528 == --- incubator/nmaven/branches/SI_XPT/bootstrap-build.bat (original) +++ incubator/nmaven/branches/SI_XPT/bootstrap-build.bat Fri May 18 10:21:28 2007 @@ -1,5 +1,5 @@ @echo off -IF %phase%=="" SET phase=install +IF "%phase%"=="" SET phase=install ECHO Executing Phase: %phase% call mvn %phase% @@ -24,18 +24,18 @@ if "%1" == "-DMicrosoft" ( ECHO Compiling Assemblies with Microsoft -call mvn -f ./assemblies/pom.xml -Dmaven.test.skip=true -Dbootstrap -Dvendor=MICROSOFT -DframeworkVersion=2.0.50727 %phase% %* +call mvn -f ./assemblies/pom.xml -Dmaven.test.skip=true -Dbootstrap -Dvendor=MICROSOFT %phase% %* IF errorlevel 1 GOTO END -call mvn -f ./plugins/pom-netplugins.xml -Dmaven.test.skip=true -Dbootstrap -Dvendor=MICROSOFT -DframeworkVersion=2.0.50727 %phase% %* +call mvn -f ./plugins/pom-netplugins.xml -Dmaven.test.skip=true -Dbootstrap -Dvendor=MICROSOFT %phase% %* IF errorlevel 1 GOTO END ) else if "%1" == "-DMono" ( ECHO Compiling Assemblies with Mono -call mvn -f ./assemblies/pom.xml -Dmaven.test.skip=true -Dbootstrap -Dvendor=MONO -DframeworkVersion=2.0.50727 %phase% %* +call mvn -f ./assemblies/pom.xml -Dmaven.test.skip=true -Dbootstrap -Dvendor=MONO %phase% %* IF errorlevel 1 GOTO END -call mvn -f ./plugins/pom-netplugins.xml -Dmaven.test.skip=true -Dbootstrap -Dvendor=MONO -DframeworkVersion=2.0.50727 %phase% %* +call mvn -f ./plugins/pom-netplugins.xml -Dmaven.test.skip=true -Dbootstrap -Dvendor=MONO %phase% %* IF errorlevel 1 GOTO END ) else ( @@ -43,10 +43,8 @@ call mvn -f ./assemblies/pom.xml -Dmaven.test.skip=true -Dbootstrap %phase% %* IF errorlevel 1 GOTO END -call mvn -f ./plugins/pom-netplugins.xml -Dmaven.test.skip=true -Dbootstrap -DframeworkVersion=2.0.50727 %phase% %* +call mvn -f ./plugins/pom-netplugins.xml -Dmaven.test.skip=true -Dbootstrap %phase% %* IF errorlevel 1 GOTO END ) -:END - -rem call mvn org.apache.maven.dotnet.plugins:maven-solution-plugin:solution \ No newline at end of file +:END \ No newline at end of file Modified: incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/csharp/NMaven/Plugin/Addin/AutomationExtensibilityMojo.cs URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/csharp/NMaven/Plugin/Addin/AutomationExtensibilityMojo.cs?view=diff&rev=539528&r1=539527&r2=539528 == --- incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/csharp/NMaven/Plugin/Addin/AutomationExtensibi
svn commit: r539535 - /incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/src/main/java/NMaven/Plugin/Solution/SolutionMojo.java
Author: sisbell Date: Fri May 18 10:49:42 2007 New Revision: 539535 URL: http://svn.apache.org/viewvc?view=rev&rev=539535 Log: Fix for solution generation. Modified: incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/src/main/java/NMaven/Plugin/Solution/SolutionMojo.java Modified: incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/src/main/java/NMaven/Plugin/Solution/SolutionMojo.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/src/main/java/NMaven/Plugin/Solution/SolutionMojo.java?view=diff&rev=539535&r1=539534&r2=539535 == --- incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/src/main/java/NMaven/Plugin/Solution/SolutionMojo.java (original) +++ incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/src/main/java/NMaven/Plugin/Solution/SolutionMojo.java Fri May 18 10:49:42 2007 @@ -58,7 +58,7 @@ public String getMojoGroupId() { -return "NMaven.Plugin"; +return "NMaven.Plugins"; } public String getClassName()
svn commit: r539538 - /incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/FileInstallerMojo.java
Author: sisbell Date: Fri May 18 10:55:26 2007 New Revision: 539538 URL: http://svn.apache.org/viewvc?view=rev&rev=539538 Log: Fix for file installer. Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/FileInstallerMojo.java Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/FileInstallerMojo.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/FileInstallerMojo.java?view=diff&rev=539538&r1=539537&r2=539538 == --- incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/FileInstallerMojo.java (original) +++ incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/FileInstallerMojo.java Fri May 18 10:55:26 2007 @@ -59,7 +59,6 @@ /** * @parameter expression = "${pomFile} - * @required */ private File pomFile;
svn commit: r539566 - in /incubator/nmaven/branches/SI_XPT: assemblies/NMaven.Logging/ assemblies/NMaven.Logging/src/main/csharp/ components/ components/dotnet-executable/src/main/java/org/apache/mave
Author: sisbell Date: Fri May 18 12:15:20 2007 New Revision: 539566 URL: http://svn.apache.org/viewvc?view=rev&rev=539566 Log: Fixed bug causing runtime error for mono using the .NET plugins: NMaven was unable to find the mono.exe file. Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/NMaven.Logging.sln incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/src/main/csharp/NMaven.Logging.csproj incubator/nmaven/branches/SI_XPT/components/README.txt incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/DefaultNetExecutable.java incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/DefaultRepositoryNetExecutable.java incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/SettingsRepository.java incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/VendorInfoTransitionRuleFactory.java Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/NMaven.Logging.sln URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/NMaven.Logging.sln?view=diff&rev=539566&r1=539565&r2=539566 == --- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/NMaven.Logging.sln (original) +++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/NMaven.Logging.sln Fri May 18 12:15:20 2007 @@ -2,5 +2,5 @@ Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 # SharpDevelop 2.1.0.2376 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NMaven.Logging", "C:\Documents and Settings\shane\nmaven-apache\SI_XPT\assemblies\NMaven.Logging\src\main\csharp\NMaven.Logging.csproj", "{f6921049-7c11-472d-85f2-71ca8e0e8243}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NMaven.Logging", "C:\Documents and Settings\shane\nmaven-apache\SI_XPT\assemblies\NMaven.Logging\src\main\csharp\NMaven.Logging.csproj", "{23518384-4dea-4794-bfab-dfa89f4c42c0}" EndProject Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/src/main/csharp/NMaven.Logging.csproj URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/src/main/csharp/NMaven.Logging.csproj?view=diff&rev=539566&r1=539565&r2=539566 == --- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/src/main/csharp/NMaven.Logging.csproj (original) +++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/src/main/csharp/NMaven.Logging.csproj Fri May 18 12:15:20 2007 @@ -1,6 +1,6 @@ http://schemas.microsoft.com/developer/msbuild/2003";> -{36FCE4F7-53D7-48AC-9AF4-74CB0F6020F6} +{23518384-4dea-4794-bfab-dfa89f4c42c0} Debug NMaven.Logging NMaven.Logging @@ -13,6 +13,10 @@ + + + + Modified: incubator/nmaven/branches/SI_XPT/components/README.txt URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/README.txt?view=diff&rev=539566&r1=539565&r2=539566 == --- incubator/nmaven/branches/SI_XPT/components/README.txt (original) +++ incubator/nmaven/branches/SI_XPT/components/README.txt Fri May 18 12:15:20 2007 @@ -4,7 +4,11 @@ 000-019: dotnet-artifact 020-039: dotnet-assembler 040-059: dotnet-core +120-139: dotnet-embedder 060-079: dotnet-executable +140-149: dotnet-jetty +150-179: dotnet-plugin 080-099: dotnet-registry -100-019: dotnet-vendor +180-189: dotnet-service +100-119: dotnet-vendor Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/DefaultNetExecutable.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/DefaultNetExecutable.java?view=diff&rev=539566&r1=539565&r2=539566 == --- incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/DefaultNetExecutable.java (original) +++ incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/DefaultNetExecutable.java Fri May 18 12:15:20 2007 @@ -66,10 +66,10 @@ { for ( String executablePath : executablePaths ) { -File exe = new File( executablePath + File.separator + executable); +File exe = new File(
svn commit: r539580 - /incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java
Author: sisbell Date: Fri May 18 12:49:51 2007 New Revision: 539580 URL: http://svn.apache.org/viewvc?view=rev&rev=539580 Log: Fixed problem with Mono creating the nmaven-settings.xml file. This bug had to do with NMaven having no way of knowing Mono's vendor version prior to generating the settings file. Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java?view=diff&rev=539580&r1=539579&r2=539580 == --- incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java (original) +++ incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java Fri May 18 12:49:51 2007 @@ -104,8 +104,7 @@ throw new PlatformUnsupportedException( "NMAVEN-066-011: Illegal State: Vendor Info = " + vendorInfo, e ); } -if ( vendorInfo.getVendor() == null || vendorInfo.getFrameworkVersion() == null || -vendorInfo.getVendorVersion() == null ) +if ( vendorInfo.getVendor() == null || vendorInfo.getFrameworkVersion() == null ) { throw new PlatformUnsupportedException( "NMAVEN-066-012: Missing Vendor Information: " + vendorInfo ); } @@ -257,10 +256,9 @@ throw new PlatformUnsupportedException( "NMAVEN-066-010: Illegal State: Vendor Info = " + vendorInfo, e ); } -if ( vendorInfo.getVendor() == null || vendorInfo.getFrameworkVersion() == null || -vendorInfo.getVendorVersion() == null ) +if ( vendorInfo.getVendor() == null || vendorInfo.getFrameworkVersion() == null ) { -throw new PlatformUnsupportedException( "NMAVEN-066-018: Missing Vendor Information: " + vendorInfo ); +throw new PlatformUnsupportedException( "NMAVEN-066-020: Missing Vendor Information: " + vendorInfo ); } List artifacts = artifactContext.getArtifactsFor( groupId, artifactId, null, null ); if ( artifacts.size() == 0 ) @@ -278,7 +276,7 @@ List modifiedCommands = new ArrayList(); String exe = null; if ( vendorInfo.getVendor().equals( Vendor.MONO ) ) -{ +{ List executablePaths = vendorInfo.getExecutablePaths(); if ( executablePaths != null ) {
svn commit: r539604 - in /incubator/nmaven/branches/SI_XPT: components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ components/dotnet-executable/src/main/java/org/apache/maven/
Author: sisbell Date: Fri May 18 14:08:04 2007 New Revision: 539604 URL: http://svn.apache.org/viewvc?view=rev&rev=539604 Log: fixed problem with the net-archive deploy and with dependent assemblies/modules not being copied into a modules target directory. Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java incubator/nmaven/branches/SI_XPT/integration-tests/tests/integration-tests.txt incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java?view=diff&rev=539604&r1=539603&r2=539604 == --- incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java (original) +++ incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java Fri May 18 14:08:04 2007 @@ -216,7 +216,7 @@ configExeDependency.setType( "exe.config" ); configExeDependency.setScope( Artifact.SCOPE_RUNTIME ); List dep = new ArrayList(); -dep.add( configExeDependency); +dep.add( configExeDependency ); project.setDependencies( dep ); artifact.getMetadataList().clear(); try @@ -514,7 +514,8 @@ try { File targetDirectoryFile = new File( targetDirectory ); -if ( targetDirectoryFile.lastModified() < artifact.getFile().lastModified() ) +if ( new File( targetDirectoryFile, artifact.getFile().getName() ).lastModified() < +artifact.getFile().lastModified() ) { FileUtils.copyFileToDirectory( artifact.getFile(), targetDirectoryFile ); } Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java?view=diff&rev=539604&r1=539603&r2=539604 == --- incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java (original) +++ incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java Fri May 18 14:08:04 2007 @@ -367,9 +367,6 @@ ExecutableConfig executableConfig = ExecutableConfig.Factory.createDefaultExecutableConfig(); executableConfig.setCommands( commands ); -//List executablePaths = ( executableConfig.getExecutionPaths() == null ) ? new ArrayList() -//: executableConfig.getExecutionPaths(); - executableConfig.setExecutionPaths( new ArrayList() ); executableContext.init( executableRequirement, executableConfig, capabilityMatcher ); @@ -381,30 +378,6 @@ { throw new PlatformUnsupportedException( "NMAVEN-066-001: Unable to find net executable", e ); } -/* -ExecutableConfig executableConfig = ExecutableConfig.Factory.createDefaultExecutableConfig(); -executableConfig.setExecutionPaths( Arrays.asList( "java" ) ); -executableConfig.setCommands( commands ); - -try -{ -repositoryExecutableContext.init( executableConfig ); -} -catch ( InitializationException e ) -{ -throw new PlatformUnsupportedException( -"NMAVEN-066-006: Unable to initialize the repository executable context", e ); -} - -try -{ -return repositoryExecutableContext.getNetExecutable(); -} -catch ( ExecutionException e ) -{ -throw new PlatformUnsupportedException( "NMAVEN-066-004: Unable to find net executable", e ); -} -*/ } /** Modified: incubator/nmaven/branches/SI_XPT/integration-tests/tests/integration-tests.txt URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/integration-tests/tests/integration-tests.txt?view=diff&rev=539604&r1=539603&r2=539604 =
svn commit: r539610 - in /incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0026: ./ expected-results.txt goals.txt pom.xml src/ src/main/ src/main/csharp/ src/main/csharp/It0026.cs
Author: sisbell Date: Fri May 18 14:37:26 2007 New Revision: 539610 URL: http://svn.apache.org/viewvc?view=rev&rev=539610 Log: Forgot to add one of the snapshot it tests. Added: incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0026/ incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0026/expected-results.txt (with props) incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0026/goals.txt (with props) incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0026/pom.xml (with props) incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0026/src/ incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0026/src/main/ incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0026/src/main/csharp/ incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0026/src/main/csharp/It0026.cs Added: incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0026/expected-results.txt URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0026/expected-results.txt?view=auto&rev=539610 == --- incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0026/expected-results.txt (added) +++ incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0026/expected-results.txt Fri May 18 14:37:26 2007 @@ -0,0 +1 @@ +target/it0026.dll \ No newline at end of file Propchange: incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0026/expected-results.txt -- svn:eol-style = native Added: incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0026/goals.txt URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0026/goals.txt?view=auto&rev=539610 == --- incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0026/goals.txt (added) +++ incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0026/goals.txt Fri May 18 14:37:26 2007 @@ -0,0 +1 @@ +install \ No newline at end of file Propchange: incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0026/goals.txt -- svn:eol-style = native Added: incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0026/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0026/pom.xml?view=auto&rev=539610 == --- incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0026/pom.xml (added) +++ incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0026/pom.xml Fri May 18 14:37:26 2007 @@ -0,0 +1,18 @@ + + 4.0.0 + org.apache.maven.it + it0026 + library + 1.0.0-SNAPSHOT + it0026 + +src/main/csharp + + +org.apache.maven.dotnet.plugins +maven-compile-plugin +true + + + + Propchange: incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0026/pom.xml -- svn:eol-style = native Added: incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0026/src/main/csharp/It0026.cs URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0026/src/main/csharp/It0026.cs?view=auto&rev=539610 == --- incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0026/src/main/csharp/It0026.cs (added) +++ incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0026/src/main/csharp/It0026.cs Fri May 18 14:37:26 2007 @@ -0,0 +1,8 @@ +namespace org.apache.maven.it { + +public class It0026 { + public static void Main () { + System.Console.Write("Hello World!"); + } +} +}
svn commit: r539672 - in /incubator/nmaven/branches/SI_XPT: ./ components/dotnet-artifact/src/test/java/org/apache/maven/dotnet/artifact/ components/dotnet-core/src/main/resources/META-INF/nmaven/ com
Author: sisbell Date: Fri May 18 18:51:46 2007 New Revision: 539672 URL: http://svn.apache.org/viewvc?view=rev&rev=539672 Log: Compiling on Linux. Fixed problem with GAC install and fixed unit tests. Modified: incubator/nmaven/branches/SI_XPT/bootstrap-build.sh incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/test/java/org/apache/maven/dotnet/artifact/AssemblyRepositoryLayoutTest.java incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/resources/META-INF/nmaven/executable-plugins.xml incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java incubator/nmaven/branches/SI_XPT/maven-dotnet.iml Modified: incubator/nmaven/branches/SI_XPT/bootstrap-build.sh URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/bootstrap-build.sh?view=diff&rev=539672&r1=539671&r2=539672 == --- incubator/nmaven/branches/SI_XPT/bootstrap-build.sh (original) +++ incubator/nmaven/branches/SI_XPT/bootstrap-build.sh Fri May 18 18:51:46 2007 @@ -1,4 +1,9 @@ -mvn -f ./components/pom.xml install -mvn -f ./plugins/pom.xml install -mvn org.apache.maven.dotnet.plugins:maven-install-plugin:install-file -Dfile=thirdparty/NUnit/NUnit.Framework.dll -DgroupId=NUnit -DartifactId=NUnit.Framework -Dpackaging=dll -Dversion=2.2.8.0 -mvn -f ./assemblies/pom.xml -Dmaven.test.skip=true -Dbootstrap install $* +#mvn install +#mvn -f ./plugins/NMaven.Plugin.Addin/pom-java.xml install +#mvn -f ./plugins/NMaven.Plugin.Devenv/pom-java.xml install +#mvn -f ./plugins/NMaven.Plugin.Settings/pom-java.xml install +#mvn -f ./plugins/NMaven.Plugin.Solution/pom-java.xml install +#mvn org.apache.maven.dotnet.plugins:maven-install-plugin:install-file -Dfile=thirdparty/NUnit/NUnit.Framework.dll -DgroupId=NUnit -DartifactId=NUnit.Framework -Dpackaging=dll -Dversion=2.2.8.0 +#mvn -f ./assemblies/pom.xml -Dmaven.test.skip=true -Dbootstrap install +mvn -f ./plugins/pom-netplugins.xml -Dmaven.test.skip=true -Dbootstrap install +#mvn -f ./assemblies/pom.xml -Dmaven.test.skip=true -Dbootstrap install $* Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/test/java/org/apache/maven/dotnet/artifact/AssemblyRepositoryLayoutTest.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/test/java/org/apache/maven/dotnet/artifact/AssemblyRepositoryLayoutTest.java?view=diff&rev=539672&r1=539671&r2=539672 == --- incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/test/java/org/apache/maven/dotnet/artifact/AssemblyRepositoryLayoutTest.java (original) +++ incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/test/java/org/apache/maven/dotnet/artifact/AssemblyRepositoryLayoutTest.java Fri May 18 18:51:46 2007 @@ -1,5 +1,7 @@ package org.apache.maven.dotnet.artifact; +import java.io.File; + import junit.framework.TestCase; import org.apache.maven.artifact.versioning.VersionRange; import org.apache.maven.artifact.Artifact; @@ -24,11 +26,12 @@ String classifier, ArtifactHandler artifactHandler */ +System.out.println(new File("org\\apache\\maven\\artifact.test\\1.0.0\\3.0\\artifact.test.dll").getAbsolutePath()); Artifact artifact = new DefaultArtifact( "org.apache.maven", "artifact.test", VersionRange.createFromVersion( "1.0.0" ), "compile", "dll", "3.0", new DefaultArtifactHandler( "dll" ) ); assertEquals( new AssemblyRepositoryLayout().pathOf( artifact ), - "org\\apache\\maven\\artifact.test\\1.0.0\\3.0\\artifact.test.dll" ); + normalizePathForTargetPlatform("org\\apache\\maven\\artifact.test\\1.0.0\\3.0\\artifact.test.dll")); } public void testPathOf() @@ -37,7 +40,7 @@ VersionRange.createFromVersion( "1.0.0" ), "compile", "dll", null, new DefaultArtifactHandler( "dll" ) ); assertEquals( new AssemblyRepositoryLayout().pathOf( artifact ), - "org\\apache\\maven\\artifact.test\\1.0.0\\artifact.test.dll" ); + normalizePathForTargetPlatform("org\\apache\\maven\\artifact.test\\1.0.0\\artifact.test.dll") ); } public void testPathOfRemoteRepositoryMetadata() @@ -47,7 +50,7 @@ new DefaultArtifactHandler( "dll" ) ); ArtifactMetadata artifactMetadata = new ProjectArtifactMetadata( artifact ); assertEquals( new
svn commit: r539669 - /incubator/nmaven/branches/SI_IDE/pom.xml
Author: sisbell Date: Fri May 18 18:45:46 2007 New Revision: 539669 URL: http://svn.apache.org/viewvc?view=rev&rev=539669 Log: Test Modified: incubator/nmaven/branches/SI_IDE/pom.xml Modified: incubator/nmaven/branches/SI_IDE/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/pom.xml?view=diff&rev=539669&r1=539668&r2=539669 == --- incubator/nmaven/branches/SI_IDE/pom.xml (original) +++ incubator/nmaven/branches/SI_IDE/pom.xml Fri May 18 18:45:46 2007 @@ -9,4 +9,6 @@ components plugins - \ No newline at end of file + + +
svn commit: r539674 - /incubator/nmaven/branches/SI_XPT/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java
Author: sisbell Date: Fri May 18 19:07:45 2007 New Revision: 539674 URL: http://svn.apache.org/viewvc?view=rev&rev=539674 Log: Fixed problem with nunit-console failing on linux because the path of the test assembly began with '/' which nunit thought was an option. Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java?view=diff&rev=539674&r1=539673&r2=539674 == --- incubator/nmaven/branches/SI_XPT/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java (original) +++ incubator/nmaven/branches/SI_XPT/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java Fri May 18 19:07:45 2007 @@ -120,6 +120,11 @@ { String finalName = project.getBuild().getFinalName(); List commands = new ArrayList(); +if(testAssemblyPath.startsWith( "/"))//nunit-console thinks *nix file format /home/user/ is an option due to / and fails. +{ +testAssemblyPath = "/" + testAssemblyPath; +} + commands.add( testAssemblyPath + File.separator + project.getArtifactId() + "-test.dll" ); commands.add( "/xml:" + reportsDirectory + File.separator + "TEST-" + finalName + ".xml" );
svn commit: r539682 - in /incubator/nmaven/branches/SI_XPT: assemblies/NMaven.Plugin.Loader/src/main/csharp/NMaven/Plugin/Loader/ assemblies/NMaven.Plugin.Runner/src/main/csharp/NMaven/Plugin/Launcher
Author: sisbell Date: Fri May 18 20:09:08 2007 New Revision: 539682 URL: http://svn.apache.org/viewvc?view=rev&rev=539682 Log: Plugin Runner now handles mono executables. Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Loader/src/main/csharp/NMaven/Plugin/Loader/PluginLoader.cs incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Runner/src/main/csharp/NMaven/Plugin/Launcher/PluginLauncher.cs incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Loader/src/main/csharp/NMaven/Plugin/Loader/PluginLoader.cs URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Loader/src/main/csharp/NMaven/Plugin/Loader/PluginLoader.cs?view=diff&rev=539682&r1=539681&r2=539682 == --- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Loader/src/main/csharp/NMaven/Plugin/Loader/PluginLoader.cs (original) +++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Loader/src/main/csharp/NMaven/Plugin/Loader/PluginLoader.cs Fri May 18 20:09:08 2007 @@ -80,7 +80,12 @@ string mojoName = GetArgFor("mojoName", args); Console.WriteLine("ParamFile = {0}, AssemblyFile = {1}, MojoName = {2}", paramFile, assemblyFile, mojoName); - + + if(paramFile == null || assemblyFile == null || mojoName == null) + { + +} + PluginLoader pluginLoader = new PluginLoader(); AppDomain applicationDomain = pluginLoader.LoadPlugin(new FileInfo(assemblyFile)); AbstractMojo abstractMojo = pluginLoader.CreateAbstractMojoFor(mojoName, Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Runner/src/main/csharp/NMaven/Plugin/Launcher/PluginLauncher.cs URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Runner/src/main/csharp/NMaven/Plugin/Launcher/PluginLauncher.cs?view=diff&rev=539682&r1=539681&r2=539682 == --- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Runner/src/main/csharp/NMaven/Plugin/Launcher/PluginLauncher.cs (original) +++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Runner/src/main/csharp/NMaven/Plugin/Launcher/PluginLauncher.cs Fri May 18 20:09:08 2007 @@ -17,11 +17,22 @@ static void Main(string[] args) { - Console.WriteLine("Start Process = " + DateTime.Now); + Console.WriteLine("NMAVEN: Start Process = " + DateTime.Now); Console.WriteLine(@flattenArgs(args)); + String vendor = GetArgFor("vendor", args); String startProcessAssembly = @GetArgFor("startProcessAssembly", args); - ProcessStartInfo processStartInfo = - new ProcessStartInfo(startProcessAssembly, @flattenArgs(args)); + ProcessStartInfo processStartInfo = null; + + if(vendor != null && vendor.Equals("MONO")) + { +processStartInfo = +new ProcessStartInfo("mono", startProcessAssembly + " " + @flattenArgs(args)); +} +else +{ +processStartInfo = +new ProcessStartInfo(startProcessAssembly, @flattenArgs(args)); +} processStartInfo.EnvironmentVariables["APPDOMAIN_MANAGER_ASM"] = "NMaven.Plugin, Version=0.14.0.0, PublicKeyToken=4b435f4d76e2f0e6, culture=neutral"; @@ -30,7 +41,7 @@ processStartInfo.UseShellExecute = false; Process.Start(processStartInfo); -Console.WriteLine("End Process = " + DateTime.Now); +Console.WriteLine("NMAVEN: End Process = " + DateTime.Now); } private static string GetArgFor(string name, string[] args) Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java?view=diff&rev=539682&r1=539681&r2=539682 == --- incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.jav
svn commit: r539685 - in /incubator/nmaven/branches/SI_XPT: assemblies/NMaven.Logging/src/main/csharp/ assemblies/NMaven.Plugin.Loader/src/main/csharp/NMaven/Plugin/Loader/ assemblies/NMaven.Plugin/sr
Author: sisbell Date: Fri May 18 21:03:11 2007 New Revision: 539685 URL: http://svn.apache.org/viewvc?view=rev&rev=539685 Log: Improved exception handling. Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/src/main/csharp/NMaven.Logging.csproj incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Loader/src/main/csharp/NMaven/Plugin/Loader/PluginLoader.cs incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/Injector/Impl/FieldInjectorRepository.cs incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/src/main/csharp/Plugin/Solution/SolutionMojo.cs Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/src/main/csharp/NMaven.Logging.csproj URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/src/main/csharp/NMaven.Logging.csproj?view=diff&rev=539685&r1=539684&r2=539685 == --- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/src/main/csharp/NMaven.Logging.csproj (original) +++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/src/main/csharp/NMaven.Logging.csproj Fri May 18 21:03:11 2007 @@ -1,6 +1,6 @@ http://schemas.microsoft.com/developer/msbuild/2003";> -{23518384-4dea-4794-bfab-dfa89f4c42c0} +{36FCE4F7-53D7-48AC-9AF4-74CB0F6020F6} Debug NMaven.Logging NMaven.Logging @@ -13,10 +13,6 @@ - - - - Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Loader/src/main/csharp/NMaven/Plugin/Loader/PluginLoader.cs URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Loader/src/main/csharp/NMaven/Plugin/Loader/PluginLoader.cs?view=diff&rev=539685&r1=539684&r2=539685 == --- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Loader/src/main/csharp/NMaven/Plugin/Loader/PluginLoader.cs (original) +++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Loader/src/main/csharp/NMaven/Plugin/Loader/PluginLoader.cs Fri May 18 21:03:11 2007 @@ -73,26 +73,41 @@ return abstractMojo; } - public static void Main(string[] args) + public static int Main(string[] args) { - string paramFile = GetArgFor("parameterFile", args); - string assemblyFile = GetArgFor("assemblyFile", args); + string paramFilePath = GetArgFor("parameterFile", args); + string assemblyFilePath = GetArgFor("assemblyFile", args); string mojoName = GetArgFor("mojoName", args); Console.WriteLine("ParamFile = {0}, AssemblyFile = {1}, MojoName = {2}", - paramFile, assemblyFile, mojoName); + paramFilePath, assemblyFilePath, mojoName); - if(paramFile == null || assemblyFile == null || mojoName == null) + if(paramFilePath == null || assemblyFilePath == null || mojoName == null) { +Console.WriteLine("Missing arguement"); +return 1; +} +FileInfo assemblyFile = new FileInfo(assemblyFilePath); +if (!assemblyFile.Exists) +{ +Console.WriteLine("Assembly File does not exist: File = " + assemblyFile.FullName); +return 1; +} +FileInfo paramFile = new FileInfo(paramFilePath); +if (!paramFile.Exists) +{ +Console.WriteLine("Param File does not exist: File = " + paramFile.FullName); +return 1; } PluginLoader pluginLoader = new PluginLoader(); - AppDomain applicationDomain = pluginLoader.LoadPlugin(new FileInfo(assemblyFile)); + AppDomain applicationDomain = pluginLoader.LoadPlugin(assemblyFile); AbstractMojo abstractMojo = pluginLoader.CreateAbstractMojoFor(mojoName, - new FileInfo(assemblyFile), - new FileInfo(paramFile), + assemblyFile, + paramFile, applicationDomain); abstractMojo.Execute(); +return 0; }
svn commit: r539699 - /incubator/nmaven/tags/STABLE-2007-05-18/
Author: sisbell Date: Fri May 18 23:57:35 2007 New Revision: 539699 URL: http://svn.apache.org/viewvc?view=rev&rev=539699 Log: Copy of rev-539698 Added: incubator/nmaven/tags/STABLE-2007-05-18/ - copied from r539698, incubator/nmaven/trunk/
svn commit: r539700 - in /incubator/nmaven/branches/SI_XPT: assemblies/NMaven.Plugin.Loader/src/main/csharp/NMaven/Plugin/Loader/PluginLoader.cs plugins/NMaven.Plugin.Resx/src/main/csharp/Plugin/Resx/
Author: sisbell Date: Fri May 18 23:59:12 2007 New Revision: 539700 URL: http://svn.apache.org/viewvc?view=rev&rev=539700 Log: Fix for resx plugin. Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Loader/src/main/csharp/NMaven/Plugin/Loader/PluginLoader.cs incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Resx/src/main/csharp/Plugin/Resx/ResX.cs Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Loader/src/main/csharp/NMaven/Plugin/Loader/PluginLoader.cs URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Loader/src/main/csharp/NMaven/Plugin/Loader/PluginLoader.cs?view=diff&rev=539700&r1=539699&r2=539700 == --- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Loader/src/main/csharp/NMaven/Plugin/Loader/PluginLoader.cs (original) +++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Loader/src/main/csharp/NMaven/Plugin/Loader/PluginLoader.cs Fri May 18 23:59:12 2007 @@ -49,7 +49,7 @@ AppDomain applicationDomain = AppDomain.CreateDomain("Loader", null, setup); PluginDomainManager pluginDomainManager = (PluginDomainManager) applicationDomain.DomainManager; -pluginDomainManager.LoadPlugin(pluginAssemblyFile); + pluginDomainManager.LoadPlugin(pluginAssemblyFile); return applicationDomain; } Modified: incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Resx/src/main/csharp/Plugin/Resx/ResX.cs URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Resx/src/main/csharp/Plugin/Resx/ResX.cs?view=diff&rev=539700&r1=539699&r2=539700 == --- incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Resx/src/main/csharp/Plugin/Resx/ResX.cs (original) +++ incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Resx/src/main/csharp/Plugin/Resx/ResX.cs Fri May 18 23:59:12 2007 @@ -94,6 +94,7 @@ public static int Main(string[] args) { Console.WriteLine("NMAVEN Resource Generator Utility "); +/* if (args.Length != 2) { StringBuilder stringBuilder = new StringBuilder(); @@ -104,7 +105,7 @@ args.Length, stringBuilder.ToString()); return 1; } - +*/ string sourceDirectory = args[0]; string outputFile = args[1];