svn commit: r628487 - in /maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering: DefaultMavenResourcesFiltering.java MavenResourcesFiltering.java

[olamy]

Author: olamy
Date: Sun Feb 17 05:57:28 2008
New Revision: 628487

URL: http://svn.apache.org/viewvc?rev=628487&view=rev
Log:
add a predefined list (jpg,jpeg,gif,bmp,png) of known extensions which doesn't 
support filtering 
force the extension in lowerCase when testing if the file need filtering

Modified:
    
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
    
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java

Modified: 
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java?rev=628487&r1=628486&r2=628487&view=diff
==============================================================================
--- 
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
 (original)
+++ 
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
 Sun Feb 17 05:57:28 2008
@@ -20,14 +20,18 @@
  */
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
 import org.apache.maven.model.Resource;
 import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
+import 
org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
 import org.codehaus.plexus.util.DirectoryScanner;
 import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.StringUtils;
 
 /**
  * @author <a href="mailto:[EMAIL PROTECTED]">olamy</a>
@@ -38,13 +42,32 @@
  *                   role-hint="default"
  */
 public class DefaultMavenResourcesFiltering
-    implements MavenResourcesFiltering
+    implements MavenResourcesFiltering, Initializable
 {
 
     private static final String[] EMPTY_STRING_ARRAY = {};
 
     private static final String[] DEFAULT_INCLUDES = {"**/**"};
     
+    private List defaultNonFilteredFileExtensions;
+    
+    // ------------------------------------------------
+    //  Plexus lifecycle
+    // ------------------------------------------------
+    public void initialize()
+        throws InitializationException
+    {
+        // jpg,jpeg,gif,bmp,png
+        this.defaultNonFilteredFileExtensions = new ArrayList( 5 );
+        this.defaultNonFilteredFileExtensions.add( "jpg" );
+        this.defaultNonFilteredFileExtensions.add( "jpeg" );
+        this.defaultNonFilteredFileExtensions.add( "gif" );
+        this.defaultNonFilteredFileExtensions.add( "bmp" );
+        this.defaultNonFilteredFileExtensions.add( "png" );
+    }    
+    
+    
+    
     /**
      * @plexus.requirement
      *  role-hint="default"
@@ -144,13 +167,19 @@
     }
 
     
-    private boolean filteredFileExtension(File file, List 
nonFilteredFileExtensions)
+    private boolean filteredFileExtension( File file, List 
userNonFilteredFileExtensions )
     {
-        if (nonFilteredFileExtensions == null)
+        List nonFilteredFileExtensions = new ArrayList( 
getDefaultNonFilteredFileExtensions() );
+        if ( userNonFilteredFileExtensions != null )
         {
-            return true;
+            nonFilteredFileExtensions.addAll( userNonFilteredFileExtensions );
         }
-        return !nonFilteredFileExtensions.contains( FileUtils.extension( 
file.getName() ) );
+        return !nonFilteredFileExtensions.contains( StringUtils.lowerCase( 
FileUtils.extension( file.getName() ) ) );
+    }
+
+    public List getDefaultNonFilteredFileExtensions()
+    {
+        return this.defaultNonFilteredFileExtensions;
     }
     
     

Modified: 
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java?rev=628487&r1=628486&r2=628487&view=diff
==============================================================================
--- 
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java
 (original)
+++ 
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java
 Sun Feb 17 05:57:28 2008
@@ -57,4 +57,10 @@
     void filterResources( List resources, File outputDirectory, String 
encoding, List filterWrappers,
                           File resourcesBaseDirectory, List 
nonFilteredFileExtensions )
         throws MavenFilteringException;    
+    
+    /**
+     * return the List of the non filtered extensions (jpg,jpeg,gif,bmp,png)
+     * @return [EMAIL PROTECTED] List} of [EMAIL PROTECTED] String}
+     */
+    public List getDefaultNonFilteredFileExtensions();
 }