svn commit: r628554 - /maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java

[olamy]

Author: olamy
Date: Sun Feb 17 13:45:07 2008
New Revision: 628554

URL: http://svn.apache.org/viewvc?rev=628554&view=rev
Log:
use the method from maven-filtering component

Modified:
    
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java

Modified: 
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java?rev=628554&r1=628553&r2=628554&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
 Sun Feb 17 13:45:07 2008
@@ -47,6 +47,7 @@
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.shared.filtering.MavenFileFilter;
 import org.apache.maven.shared.filtering.MavenFilteringException;
+import org.apache.maven.shared.filtering.MavenResourcesFiltering;
 import org.apache.maven.shared.filtering.ReflectionProperties;
 import org.codehaus.plexus.archiver.jar.JarArchiver;
 import org.codehaus.plexus.archiver.manager.ArchiverManager;
@@ -184,12 +185,20 @@
     private ArchiverManager archiverManager;
     
     /**
-     * The Jar archiver needed for archiving classes directory into jar file 
under WEB-INF/lib.
+     * 
      *
      * @parameter 
expression="${component.org.apache.maven.shared.filtering.MavenFileFilter}"
      * @required
      */
-    private MavenFileFilter mavenFileFilter;    
+    private MavenFileFilter mavenFileFilter; 
+    
+    /**
+     * 
+     *
+     * @parameter 
expression="${component.org.apache.maven.shared.filtering.MavenResourcesFiltering}"
+     * @required
+     */    
+    private MavenResourcesFiltering mavenResourcesFiltering;
 
     private static final String WEB_INF = "WEB-INF";
 
@@ -612,8 +621,7 @@
 
         public boolean isNonFilteredExtension( String fileName )
         {
-            return !StringUtils.isEmpty( fileName ) &&
-                nonFilteredFileExtensions.contains( FileUtils.extension( 
fileName ) );
+            return !mavenResourcesFiltering.filteredFileExtension( fileName, 
nonFilteredFileExtensions );
         }
         
     }