svn commit: r384107 - in /maven/components/trunk: maven-core-it/it0095/sub1/src/test/verifier/verifications.xml maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java

[jdcasey]

Author: jdcasey
Date: Tue Mar  7 19:28:38 2006
New Revision: 384107

URL: http://svn.apache.org/viewcvs?rev=384107&view=rev
Log:
(Merged from 384102.) Fixing site URL calculation to disregard child module 
path adjustment. Second attempt.

Modified:
    
maven/components/trunk/maven-core-it/it0095/sub1/src/test/verifier/verifications.xml
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java

Modified: 
maven/components/trunk/maven-core-it/it0095/sub1/src/test/verifier/verifications.xml
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0095/sub1/src/test/verifier/verifications.xml?rev=384107&r1=384106&r2=384107&view=diff
==============================================================================
--- 
maven/components/trunk/maven-core-it/it0095/sub1/src/test/verifier/verifications.xml
 (original)
+++ 
maven/components/trunk/maven-core-it/it0095/sub1/src/test/verifier/verifications.xml
 Tue Mar  7 19:28:38 2006
@@ -2,7 +2,7 @@
   <files>
     <file>
       <location>target/effective-pom.xml</location>
-      <contains>scp://host/path/sub1</contains>
+      <contains>scp://host/path/parent/sub1</contains>
     </file>
     <file>
       <location>target/effective-pom.xml</location>

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java?rev=384107&r1=384106&r2=384107&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
 Tue Mar  7 19:28:38 2006
@@ -108,7 +108,7 @@
             }
         }
 
-        assembleDistributionInheritence( child, parent, childPathAdjustment, 
appendPaths );
+        assembleDistributionInheritence( child, parent, appendPaths );
 
         // issueManagement
         if ( child.getIssueManagement() == null )
@@ -399,8 +399,7 @@
         }
     }
 
-    private void assembleDistributionInheritence( Model child, Model parent, 
String childPathAdjustment,
-                                                  boolean appendPaths )
+    private void assembleDistributionInheritence( Model child, Model parent, 
boolean appendPaths )
     {
         if ( parent.getDistributionManagement() != null )
         {
@@ -432,7 +431,7 @@
                     if ( site.getUrl() != null )
                     {
                         site.setUrl(
-                            appendPath( site.getUrl(), child.getArtifactId(), 
childPathAdjustment, appendPaths ) );
+                            appendPath( site.getUrl(), child.getArtifactId(), 
null, appendPaths ) );
                     }
                 }
             }