svn commit: r358830 - /maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java

[sn...@apache.org]

Author: snicoll
Date: Fri Dec 23 08:55:00 2005
New Revision: 358830

URL: http://svn.apache.org/viewcvs?rev=358830&view=rev
Log:
MEAR-3: Fixed handling of includes and excludes settings ; now handles comma separated values properly
Submitted by: David Hawkins
Reviewed by: Stéphane Nicoll

Modified:
    maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java

Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java?rev=358830&r1=358829&r2=358830&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java Fri Dec 23 08:55:00 2005
@@ -23,12 +23,14 @@
 import org.codehaus.plexus.archiver.jar.JarArchiver;
 import org.codehaus.plexus.util.DirectoryScanner;
 import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.StringUtils;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Arrays;
 
 /**
  * Builds J2EE Enteprise Archive (EAR) files.
@@ -261,7 +263,7 @@
         List excludeList = new ArrayList( FileUtils.getDefaultExcludesAsList() );
         if ( earSourceExcludes != null && !"".equals( earSourceExcludes ) )
         {
-            excludeList.add( earSourceExcludes );
+            excludeList.addAll( Arrays.asList( StringUtils.split( earSourceExcludes, "," ) ) );
         }
 
         // if applicationXml is specified, omit the one in the source directory
@@ -281,7 +283,7 @@
      */
     protected String[] getIncludes()
     {
-        return new String[]{earSourceIncludes};
+        return StringUtils.split( StringUtils.defaultString( earSourceIncludes ), "," );
     }
 
     private static File buildDestinationFile( File buildDir, String uri )