incubator-nmaven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject 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/dotnet/executable/impl/ integration-tests/tests/ plu...
Date Fri, 18 May 2007 21:08:05 GMT
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<Dependency> dep = new ArrayList<Dependency>();
-            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<String> executablePaths = ( executableConfig.getExecutionPaths() ==
null ) ? new ArrayList<String>()
-    //        : executableConfig.getExecutionPaths();
-
         executableConfig.setExecutionPaths( new ArrayList<String>() );
         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
==============================================================================
--- incubator/nmaven/branches/SI_XPT/integration-tests/tests/integration-tests.txt (original)
+++ incubator/nmaven/branches/SI_XPT/integration-tests/tests/integration-tests.txt Fri May
18 14:08:04 2007
@@ -15,4 +15,4 @@
 it0026
 it0028
 it0029
-it0030
\ No newline at end of file
+it0030

Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=539604&r1=539603&r2=539604
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml
(original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml
Fri May 18 14:08:04 2007
@@ -41,8 +41,7 @@
           </install>
           <package>org.apache.maven.dotnet.plugins:maven-webapp-plugin:package</package>
           <deploy>
-            org.apache.maven.dotnet.plugins:maven-webapp-plugin:deploy,
-            org.apache.maven.dotnet.plugins:maven-deploy-plugin:deploy-dotnet
+            org.apache.maven.dotnet.plugins:maven-webapp-plugin:deploy
           </deploy>
         </phases>
       </configuration>



Mime
View raw message