svn commit: r267436 - /maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java

[brett]

Author: brett
Date: Sat Sep  3 01:00:53 2005
New Revision: 267436

URL: http://svn.apache.org/viewcvs?rev=267436&view=rev
Log:
PR: MNG-811
Add default excludes after the main excludes are set so that they don't get 
overwritten.

Modified:
    
maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java

Modified: 
maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java?rev=267436&r1=267435&r2=267436&view=diff
==============================================================================
--- 
maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java
 Sat Sep  3 01:00:53 2005
@@ -35,9 +35,7 @@
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import java.util.Properties;
-import java.util.TreeMap;
 
 /**
  * @author <a href="[EMAIL PROTECTED]">Michal Maczka</a>
@@ -105,8 +103,6 @@
     {
         initializeFiltering();
 
-        Map resourceEntries = new TreeMap();
-
         for ( Iterator i = resources.iterator(); i.hasNext(); )
         {
             Resource resource = (Resource) i.next();
@@ -121,7 +117,6 @@
             }
 
             DirectoryScanner scanner = new DirectoryScanner();
-            scanner.addDefaultExcludes();
 
             scanner.setBasedir( resource.getDirectory() );
             if ( resource.getIncludes() != null && 
!resource.getIncludes().isEmpty() )
@@ -137,6 +132,7 @@
                 scanner.setExcludes( (String[]) 
resource.getExcludes().toArray( EMPTY_STRING_ARRAY ) );
             }
 
+            scanner.addDefaultExcludes();
             scanner.scan();
 
             List includedFiles = Arrays.asList( scanner.getIncludedFiles() );



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]