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

[sisbell]

Author: sisbell
Date: Thu Nov  6 08:12:17 2008
New Revision: 711888

URL: http://svn.apache.org/viewvc?rev=711888&view=rev
Log:
If DistributionManagement site url contains a property, build was failing. This 
is a quick fix and will still not return the correct URL. The problem is that 
interpolation occurs after inheritance and resolving URLs based on a parent is 
an inheritance issue.

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=711888&r1=711887&r2=711888&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
 Thu Nov  6 08:12:17 2008
@@ -372,19 +372,22 @@
             }
 
             //Site Rule
+
             ModelProperty siteUrlProperty = getPropertyFor( 
ProjectUri.DistributionManagement.Site.url, tmp );
             if ( siteUrl.length() == 0 && siteUrlProperty != null )
             {
-                siteUrl.append( 
siteUrlProperty.getResolvedValue().substring(0, 
siteUrlProperty.getResolvedValue().lastIndexOf("/")) );
-                for ( String projectName : projectNames )
-                {
-                    siteUrl.append( "/" ).append( projectName );
+                if(!siteUrlProperty.getResolvedValue().endsWith("}")) {
+                    siteUrl.append( 
siteUrlProperty.getResolvedValue().substring(0, 
siteUrlProperty.getResolvedValue().lastIndexOf("/")) );
                 }
-                int index = tmp.indexOf( siteUrlProperty );
-                tmp.remove( index );
-                tmp.add( index, new ModelProperty( 
ProjectUri.DistributionManagement.Site.url, siteUrl.toString() ) );
+                    for ( String projectName : projectNames )
+                    {
+                        siteUrl.append( "/" ).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
             ModelProperty scmUrlProperty = getPropertyFor( ProjectUri.Scm.url, 
tmp );
             if ( scmUrl.length() == 0 && scmUrlProperty != null )