incubator-nmaven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ewor...@apache.org
Subject svn commit: r608284 - in /incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler: SourceProcessorMojo.java TestSourceProcessorMojo.java
Date Wed, 02 Jan 2008 23:40:58 GMT
Author: eworley
Date: Wed Jan  2 15:40:55 2008
New Revision: 608284

URL: http://svn.apache.org/viewvc?rev=608284&view=rev
Log:
Fixing bug in synchronization patch witch deleted AssemblyInfo, It0016 passes now

Modified:
    incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/SourceProcessorMojo.java
    incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestSourceProcessorMojo.java

Modified: incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/SourceProcessorMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/SourceProcessorMojo.java?rev=608284&r1=608283&r2=608284&view=diff
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/SourceProcessorMojo.java
(original)
+++ incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/SourceProcessorMojo.java
Wed Jan  2 15:40:55 2008
@@ -128,7 +128,11 @@
         }
         
         // Update the scanner to scan the output directory, and rescan
-        directoryScanner.setBasedir(outputDirectory);
+        List<String> outputDirExcludes = new ArrayList<String>(excludeList);
+        // Ignore meta-inf, including assembly info
+        outputDirExcludes.add( "META-INF/**" );
+        directoryScanner.setExcludes( outputDirExcludes.toArray( new String[0] ) );
+        directoryScanner.setBasedir( outputDirectory );
         directoryScanner.scan();
         
         // Synchronize the target folder with the source.  Specifically delete the targetFile
if

Modified: incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestSourceProcessorMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestSourceProcessorMojo.java?rev=608284&r1=608283&r2=608284&view=diff
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestSourceProcessorMojo.java
(original)
+++ incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestSourceProcessorMojo.java
Wed Jan  2 15:40:55 2008
@@ -128,6 +128,11 @@
         
         // Update the scanner to scan the output directory, and rescan
         directoryScanner.setBasedir(outputDirectory);
+        List<String> outputDirExcludes = new ArrayList<String>(excludeList);
+        // Ignore meta-inf, including assembly info
+        outputDirExcludes.add( "META-INF/**" );
+        directoryScanner.setExcludes( outputDirExcludes.toArray( new String[0] ) );
+        directoryScanner.setBasedir( outputDirectory );
         directoryScanner.scan();
         
     	// Synchronize the target folder with the source.  Specifically delete the targetFile
if



Mime
View raw message