svn commit: r1200108 - in /maven/plugins/trunk/maven-dependency-plugin/src: main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java test/java/org/apache/maven/plugin/dependency/utils/TestDependencyUtil.java

[carlos]

Author: carlos
Date: Thu Nov 10 03:05:47 2011
New Revision: 1200108

URL: http://svn.apache.org/viewvc?rev=1200108&view=rev
Log:
[MDEP-306] Unpack does not handle spaces in includes/excludes

Modified:
    
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java
    
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestDependencyUtil.java

Modified: 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java?rev=1200108&r1=1200107&r2=1200108&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java
 (original)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java
 Thu Nov 10 03:05:47 2011
@@ -241,7 +241,8 @@ public final class DependencyUtil
         String ret = "";
         if ( !StringUtils.isEmpty( str ) )
         {
-            ret = StringUtils.join( StringUtils.split( str ), "," );
+            // remove initial and ending spaces, plus all spaces next to 
commas 
+            ret = str.trim().replaceAll( "[\\s]*,[\\s]*", "," );
         }
 
         return ret;

Modified: 
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestDependencyUtil.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestDependencyUtil.java?rev=1200108&r1=1200107&r2=1200108&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestDependencyUtil.java
 (original)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestDependencyUtil.java
 Thu Nov 10 03:05:47 2011
@@ -34,6 +34,7 @@ import org.apache.maven.plugin.MojoExecu
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.plugin.testing.SilentLog;
 import org.apache.maven.plugin.testing.stubs.DefaultArtifactHandlerStub;
+import org.codehaus.plexus.util.StringUtils;
 
 /**
  * @author brianf
@@ -269,17 +270,21 @@ public class TestDependencyUtil
     
     public void testTokenizer()
     {
+        String [] tokens = DependencyUtil.tokenizer( " alpha,bravo, charlie , 
delta kappa, theta" );
+        String[] expected = new String[] { "alpha", "bravo", "charlie", "delta 
kappa", "theta" };
+        // easier to see in the JUnit reports
+        assertEquals( StringUtils.join( expected, ", " ), StringUtils.join( 
tokens, ", " ) );
+        assertEquals( expected.length, tokens.length );
         
-        String [] tokens = DependencyUtil.tokenizer( " \r\n a, \t \n \r b \t 
\n \r" );
+        tokens = DependencyUtil.tokenizer( " \r\n a, \t \n \r b \t \n \r" );
         assertEquals( 2, tokens.length );
         assertEquals( "a", tokens[0] );
         assertEquals( "b", tokens[1] );
         
         tokens = DependencyUtil.tokenizer( null );
         assertEquals( 0, tokens.length );
-        
+
         tokens = DependencyUtil.tokenizer( "  " );
         assertEquals( 0, tokens.length );
-        
     }
 }