svn commit: r756941 - in /maven/components/trunk/maven-project/src: main/java/org/apache/maven/project/processor/ test/java/org/apache/maven/project/

[bentmann]

Author: bentmann
Date: Sat Mar 21 14:04:59 2009
New Revision: 756941

URL: http://svn.apache.org/viewvc?rev=756941&view=rev
Log:
o Fixed site URL adjustment

Modified:
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DistributionManagementProcessor.java
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java
    
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DistributionManagementProcessor.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DistributionManagementProcessor.java?rev=756941&r1=756940&r2=756941&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DistributionManagementProcessor.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DistributionManagementProcessor.java
 Sat Mar 21 14:04:59 2009
@@ -132,7 +132,14 @@
 
         if ( target.getUrl() == null )
         {
-            target.setUrl( source.getUrl() + "/" + artifactId );
+            if ( isChild )
+            {
+                target.setUrl( source.getUrl() );
+            }
+            else
+            {
+                target.setUrl( source.getUrl() + "/" + artifactId );
+            }
         }
     }
 

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java?rev=756941&r1=756940&r2=756941&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java
 Sat Mar 21 14:04:59 2009
@@ -171,8 +171,8 @@
         }
         
         List<Processor> processors =
-            Arrays.asList( (Processor) new BuildProcessor( new 
ArrayList<Processor>() ),
-                           (Processor) new ModuleProcessor(), new 
PropertiesProcessor(), new ParentProcessor(),
+            Arrays.<Processor> asList( new BuildProcessor( new 
ArrayList<Processor>() ),
+                           new ModuleProcessor(), new PropertiesProcessor(), 
new ParentProcessor(),
                            new OrganizationProcessor(), new 
MailingListProcessor(), new IssueManagementProcessor(),
                            new CiManagementProcessor(), new 
ReportingProcessor(), new RepositoriesProcessor(),
                            new DistributionManagementProcessor(), new 
LicensesProcessor(), new ScmProcessor());        

Modified: 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java?rev=756941&r1=756940&r2=756941&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
 (original)
+++ 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
 Sat Mar 21 14:04:59 2009
@@ -594,12 +594,18 @@
         assertEquals( null, pom.getValue( "organization/url" ) );
         assertEquals( null, pom.getValue( "issueManagement/system" ) );
         assertEquals( 0, ( (List<?>) pom.getValue( "ciManagement/notifiers" ) 
).size() );
+        assertEquals( "child-distros", pom.getValue( 
"distributionManagement/repository/id" ) );
+        assertEquals( "ssh://child.url/distros", pom.getValue( 
"distributionManagement/repository/url" ) );
         assertEquals( null, pom.getValue( 
"distributionManagement/repository/name" ) );
         assertEquals( true, pom.getValue( 
"distributionManagement/repository/uniqueVersion" ) );
         assertEquals( "default", pom.getValue( 
"distributionManagement/repository/layout" ) );
+        assertEquals( "child-snaps", pom.getValue( 
"distributionManagement/snapshotRepository/id" ) );
+        assertEquals( "ssh://child.url/snaps", pom.getValue( 
"distributionManagement/snapshotRepository/url" ) );
         assertEquals( null, pom.getValue( 
"distributionManagement/snapshotRepository/name" ) );
         assertEquals( true, pom.getValue( 
"distributionManagement/snapshotRepository/uniqueVersion" ) );
         assertEquals( "default", pom.getValue( 
"distributionManagement/snapshotRepository/layout" ) );
+        assertEquals( "child-site", pom.getValue( 
"distributionManagement/site/id" ) );
+        assertEquals( "scp://child.url/site", pom.getValue( 
"distributionManagement/site/url" ) );
         assertEquals( null, pom.getValue( "distributionManagement/site/name" ) 
);
     }
 
@@ -943,7 +949,7 @@
         assertEquals( "TEST-CHARS: 
\u00C4\u00D6\u00DC\u00E4\u00F6\u00FC\u00DF", pom.getValue( "description" ) );
     }
 
-    /* FIXME: MNG-4070, fixed in model-builder trunk, awaiting update to 
model-builder:1.7+*/
+    /* MNG-4070 */
     public void testXmlWhitespaceHandling()
         throws Exception
     {