svn commit: r588090 - in /maven/components/branches/maven-2.0.x/maven-project/src: main/java/org/apache/maven/project/inheritance/ test/java/org/apache/maven/project/inheritance/

[brianf]

Author: brianf
Date: Wed Oct 24 17:11:46 2007
New Revision: 588090

URL: http://svn.apache.org/viewvc?rev=588090&view=rev
Log:
reverting MNG-3244. This caused MNG-3254

Modified:
    
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

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=588090&r1=588089&r2=588090&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
 Wed Oct 24 17:11:46 2007
@@ -432,7 +432,7 @@
 
                     site.setUrl( parentDistMgmt.getSite().getUrl() );
 
-                    if ( site.getUrl() != null && (site.getUrl().endsWith( "/" 
)||  site.getUrl().endsWith( "\\" )))
+                    if ( site.getUrl() != null )
                     {
                         site.setUrl(
                             appendPath( site.getUrl(), child.getArtifactId(), 
childPathAdjustment, appendPaths ) );
@@ -494,30 +494,10 @@
         if ( appendPaths )
         {
             if ( pathAdjustment != null )
-            {
-                if (uncleanPath.endsWith( "/" )|| uncleanPath.endsWith( "\\" ))
-                {
-                    uncleanPath += pathAdjustment;
-                    
-                }
-                else
-                {
-                    uncleanPath += "/" + pathAdjustment;
-                }
-            }
+                uncleanPath += "/" + pathAdjustment;
 
             if ( childPath != null )
-            {
-               
-                if (uncleanPath.endsWith( "/" )|| uncleanPath.endsWith( "\\" ))
-                {
-                    uncleanPath += childPath;
-                }
-                else
-                {
-                    uncleanPath += "/" + childPath;
-                }
-            }
+                uncleanPath += "/" + childPath;
         }
 
         String 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=588090&r1=588089&r2=588090&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
 Wed Oct 24 17:11:46 2007
@@ -53,66 +53,6 @@
 {
     private ModelInheritanceAssembler assembler = new 
DefaultModelInheritanceAssembler();
     
-    public void 
testSiteUrlWithTrailingForwardSlashInParentHasArtifactIdAppendedInChild()
-    {
-       Site site = new Site();
-       site.setName("docs");
-       site.setUrl("sftp://machine/path/to/site/";);
-       
-       DistributionManagement distributionManagement = new 
DistributionManagement();
-       distributionManagement.setSite(site);
-       
-       Model parent = makeBaseModel( "parent" );
-       parent.setDistributionManagement(distributionManagement);
-       
-       Model child = makeBaseModel( "child" );
-       child.setParent(parent.getParent());
-       
-       assembler.assembleModelInheritance(child, parent);
-       
-       assertEquals(site.getUrl()+ "child", 
child.getDistributionManagement().getSite().getUrl());
-    }
-
-    public void 
testSiteUrlWithTrailingBackSlashInParentHasArtifactIdAppendedInChild()
-    {
-       Site site = new Site();
-       site.setName("docs");
-       site.setUrl("file://machine\\path\\to\\site\\");
-       
-       DistributionManagement distributionManagement = new 
DistributionManagement();
-       distributionManagement.setSite(site);
-       
-       Model parent = makeBaseModel( "parent" );
-       parent.setDistributionManagement(distributionManagement);
-       
-       Model child = makeBaseModel( "child" );
-       child.setParent(parent.getParent());
-       
-       assembler.assembleModelInheritance(child, parent);
-       
-       assertEquals(site.getUrl()+ "child", 
child.getDistributionManagement().getSite().getUrl());
-    }
-    
-    public void 
testSiteUrlWithoutTrailingSlashInParentHasNoArtifactIdAppendedInChild()
-    {
-       Site site = new Site();
-       site.setName("docs");
-       site.setUrl("sftp://machine/path/to/site";);
-       
-       DistributionManagement distributionManagement = new 
DistributionManagement();
-       distributionManagement.setSite(site);
-       
-       Model parent = makeBaseModel( "parent" );
-       parent.setDistributionManagement(distributionManagement);
-       
-       Model child = makeBaseModel( "child" );
-       child.setParent(parent.getParent());
-       
-       assembler.assembleModelInheritance(child, parent);
-       
-       assertEquals(site.getUrl(), 
child.getDistributionManagement().getSite().getUrl());
-    }
-    
     public void 
testShouldAdjustChildUrlBasedOnParentAndModulePathInSiblingDir()
     {
         Model parent = makeBaseModel( "parent" );