You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2009/02/26 13:24:10 UTC
svn commit: r748111 - in
/maven/components/branches/maven-2.1.x/maven-project/src:
main/java/org/apache/maven/project/inheritance/
test/java/org/apache/maven/project/inheritance/
Author: brett
Date: Thu Feb 26 12:24:10 2009
New Revision: 748111
URL: http://svn.apache.org/viewvc?rev=748111&view=rev
Log:
[MNG-3621] site url inheritance broken for UNC paths
Submitted by: Benjamin Bentmann
Modified:
maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java
Modified: maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java?rev=748111&r1=748110&r2=748111&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java (original)
+++ maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java Thu Feb 26 12:24:10 2009
@@ -499,7 +499,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.1.x/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java?rev=748111&r1=748110&r2=748111&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java (original)
+++ maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java Thu Feb 26 12:24:10 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" );