svn commit: r712680 - /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java

[sisbell]

Author: sisbell
Date: Mon Nov 10 07:44:37 2008
New Revision: 712680

URL: http://svn.apache.org/viewvc?rev=712680&view=rev
Log:
Fix for it0141

Modified:
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java?rev=712680&r1=712679&r2=712680&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
 Mon Nov 10 07:44:37 2008
@@ -376,16 +376,17 @@
             ModelProperty siteUrlProperty = getPropertyFor( 
ProjectUri.DistributionManagement.Site.url, tmp );
             if ( siteUrl.length() == 0 && siteUrlProperty != null )
             {
-                if(!siteUrlProperty.getResolvedValue().endsWith("}")) {
-                    siteUrl.append( 
siteUrlProperty.getResolvedValue().substring(0, 
siteUrlProperty.getResolvedValue().lastIndexOf("/")) );
-                }
-                    for ( String projectName : projectNames )
-                    {
-                        siteUrl.append( "/" ).append( projectName );
+                siteUrl.append( 
siteUrlProperty.getResolvedValue());//.substring(0, 
siteUrlProperty.getResolvedValue().lastIndexOf("/")) );
+                for ( String projectName : projectNames )
+                {
+                    if(!siteUrl.toString().endsWith( "/")) {
+                        siteUrl.append( "/" );
                     }
-                    int index = tmp.indexOf( siteUrlProperty );
-                    tmp.remove( index );
-                    tmp.add( index, new ModelProperty( 
ProjectUri.DistributionManagement.Site.url, siteUrl.toString() ) );
+                    siteUrl.append( projectName );
+                }
+                int index = tmp.indexOf( siteUrlProperty );
+                tmp.remove( index );
+                tmp.add( index, new ModelProperty( 
ProjectUri.DistributionManagement.Site.url, siteUrl.toString() ) );
             }            
   //If DistributionManagement site URL is property,
             //SCM Rule
@@ -602,7 +603,9 @@
         aliases.put( "\\$\\{project.build.", "\\$\\{build.");
 
         List<String> aliasList = Arrays.asList("artifactId", "groupId", 
"version", "packaging", "name", "description",
-            "url", "inceptionYear", "scm.url", "ciManagement.url", 
"distributionManagement.repository.name",
+            "url", "inceptionYear", "scm.url", "ciManagement.url",
+            "distributionManagement.repository.name",
+            "distributionManagement.site.url",
             "reporting.outputDirectory", "parent.groupId", "parent.artifactId",
             "parent.version", "prerequisites.maven", "issueManagement.url", 
"organization.name");
         for(String alias : aliasList) {