svn commit: r1061510 - in /maven/shared/trunk/maven-filtering/src: main/java/org/apache/maven/shared/filtering/FilteringUtils.java test/java/org/apache/maven/shared/filtering/FilteringUtilsTest.java

[dennisl]

Author: dennisl
Date: Thu Jan 20 20:58:23 2011
New Revision: 1061510

URL: http://svn.apache.org/viewvc?rev=1061510&view=rev
Log:
[MSHARED-179] FilteringUtils.escapeWindowsPath only works if the Windows path 
is at the beginning of a property

Modified:
    
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java
    
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/FilteringUtilsTest.java

Modified: 
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java?rev=1061510&r1=1061509&r2=1061510&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java
 (original)
+++ 
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java
 Thu Jan 20 20:58:23 2011
@@ -24,11 +24,12 @@ import org.codehaus.plexus.util.StringUt
 
 /**
  * @author <a href="mailto:ol...@apache.org";>olamy</a>
+ * @author Dennis Lundberg
  * @version $Id$
  */
 public final class FilteringUtils
 {
-    private static final String WINDOWS_PATH_PATTERN = "^[a-zA-Z]:\\\\(.*)";
+    private static final String WINDOWS_PATH_PATTERN = 
"^(.*)[a-zA-Z]:\\\\(.*)";
 
     private static final Pattern PATTERN = Pattern.compile( 
WINDOWS_PATH_PATTERN ) ;
 

Modified: 
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/FilteringUtilsTest.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/FilteringUtilsTest.java?rev=1061510&r1=1061509&r2=1061510&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/FilteringUtilsTest.java
 (original)
+++ 
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/FilteringUtilsTest.java
 Thu Jan 20 20:58:23 2011
@@ -61,12 +61,10 @@ public class FilteringUtilsTest
     }
     */
 
-    // This doesn't work, see MSHARED-179
-    /*
+    // MSHARED-179
     public void testEscapeWindowsPathNotAtBeginning()
         throws Exception
     {
         assertEquals( 
"jdbc:derby:C:\\\\Users\\\\Administrator/test;create=true", 
FilteringUtils.escapeWindowsPath( 
"jdbc:derby:C:\\Users\\Administrator/test;create=true" ) );
     }
-    */
 }