Author: brett
Date: Thu Feb 26 12:27:33 2009
New Revision: 748114

URL: http://svn.apache.org/viewvc?rev=748114&view=rev
Log:
[MNG-3621] site url inheritance broken for UNC paths
Submitted by: Benjamin Bentmann
Merged from: r748111

Modified:
    maven/components/branches/maven-2.0.x/   (props changed)
    maven/components/branches/maven-2.0.x/apache-maven/   (props changed)
    maven/components/branches/maven-2.0.x/apache-maven/src/test/   (props 
changed)
    maven/components/branches/maven-2.0.x/maven-integration-tests/   (props 
changed)
    maven/components/branches/maven-2.0.x/maven-model/src/test/   (props 
changed)
    
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
    
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java

Propchange: maven/components/branches/maven-2.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 26 12:27:33 2009
@@ -1,3 +1,3 @@
 /maven/components/branches/maven-2.0.10-RC:708790-728809,728834
-/maven/components/branches/maven-2.1.x:720038,727670,727762,727868,728933,728937,737683,738723,738753,739385,741507,741518,741870,742819,744645,745836,747468,747683,747799,748102
+/maven/components/branches/maven-2.1.x:720038,727670,727762,727868,728933,728937,737683,738723,738753,739385,741507,741518,741870,742819,744645,745836,747468,747683,747799,748102,748111
 /maven/components/trunk:720001,721902,726845,729292

Propchange: maven/components/branches/maven-2.0.x/apache-maven/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 26 12:27:33 2009
@@ -1,5 +1,5 @@
 /maven/components/branches/maven-2.0.10-RC/apache-maven:708790-728809,728834
 
/maven/components/branches/maven-2.0.x/apache-maven:533160,636838,645583,645642,647357,649903,657432,659677,662033,662251,669665,670358,673499,673905,674059,675074,675087,675096,675375,675380,680604,682055
-/maven/components/branches/maven-2.1.x/apache-maven:720038,728933,728937,737683,738723,738753,741507,741518,742819,745836,747683,747799,748102
+/maven/components/branches/maven-2.1.x/apache-maven:720038,728933,728937,737683,738723,738753,741507,741518,742819,745836,747683,747799,748102,748111
 /maven/components/trunk/apache-maven:720001,721902,726845
 /maven/components/trunk/maven-distribution:727688

Propchange: maven/components/branches/maven-2.0.x/apache-maven/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 26 12:27:33 2009
@@ -1,2 +1,2 @@
 
/maven/components/branches/maven-2.0.10-RC/apache-maven/src/test:727009-728809,728834
-/maven/components/branches/maven-2.1.x/apache-maven/src/test:728933,728937,737683,738723,738753,741507,741518,742819,745836,747683,747799,748102
+/maven/components/branches/maven-2.1.x/apache-maven/src/test:728933,728937,737683,738723,738753,741507,741518,742819,745836,747683,747799,748102,748111

Propchange: maven/components/branches/maven-2.0.x/maven-integration-tests/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 26 12:27:33 2009
@@ -1,2 +1,2 @@
 
/maven/components/branches/maven-2.0.10-RC/maven-integration-tests:709246-728809,728834
-/maven/components/branches/maven-2.1.x/maven-integration-tests:728933,728937,737683,738723,738753,741507,741518,742819,745836,747683,747799,748102
+/maven/components/branches/maven-2.1.x/maven-integration-tests:728933,728937,737683,738723,738753,741507,741518,742819,745836,747683,747799,748102,748111

Propchange: maven/components/branches/maven-2.0.x/maven-model/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 26 12:27:33 2009
@@ -1,2 +1,2 @@
 
/maven/components/branches/maven-2.0.10-RC/maven-model/src/test:727009-728809,728834
-/maven/components/branches/maven-2.1.x/maven-model/src/test:728933,728937,737683,738723,738753,741507,741518,742819,745836,747683,747799,748102
+/maven/components/branches/maven-2.1.x/maven-model/src/test:728933,728937,737683,738723,738753,741507,741518,742819,745836,747683,747799,748102,748111

Modified: 
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java?rev=748114&r1=748113&r2=748114&view=diff
==============================================================================
--- 
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
 (original)
+++ 
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
 Thu Feb 26 12:27:33 2009
@@ -492,7 +492,12 @@
             uncleanPath = uncleanPath.substring( protocolIdx + 3 );
         }
 
-        if ( uncleanPath.startsWith( "/" ) )
+        if ( uncleanPath.startsWith( "//" ) )
+        {
+            // preserve leading double slash for UNC paths like 
"file:////host/pom.xml"
+            cleanedPath += "//";
+        }
+        else if ( uncleanPath.startsWith( "/" ) )
         {
             cleanedPath += "/";
         }

Modified: 
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java?rev=748114&r1=748113&r2=748114&view=diff
==============================================================================
--- 
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java
 (original)
+++ 
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java
 Thu Feb 26 12:27:33 2009
@@ -221,6 +221,18 @@
         assertEquals( "Append with path adjustment failed.", 
"http://maven.apache.org/shared/file-management";, result );
     }
 
+    public void testAppendPathUNC()
+    {
+        String parentPath = "file:////host/shared/maven-shared-parent";
+        String childPath = "file-management";
+        String pathAdjustment = null;
+
+        String result =
+            ( (DefaultModelInheritanceAssembler) assembler ).appendPath( 
parentPath, childPath, pathAdjustment, true );
+
+        assertEquals( 
"file:////host/shared/maven-shared-parent/file-management", result );
+    }
+
     public void testDistributionManagementInheritance()
     {
         Model parent = makeBaseModel( "parent" );


Reply via email to