Author: sisbell
Date: Wed Nov 5 13:46:12 2008
New Revision: 711707
URL: http://svn.apache.org/viewvc?rev=711707&view=rev
Log:
Fix for IT 3134.
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=711707&r1=711706&r2=711707&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
Wed Nov 5 13:46:12 2008
@@ -252,6 +252,7 @@
List<ModelProperty> modelProperties = new ArrayList<ModelProperty>();
List<String> projectNames = new ArrayList<String>();
+ StringBuffer siteUrl = new StringBuffer();
StringBuffer scmUrl = new StringBuffer();
StringBuffer scmConnectionUrl = new StringBuffer();
StringBuffer scmDeveloperUrl = new StringBuffer();
@@ -372,6 +373,20 @@
tmp.removeAll( removeProperties );
}
+ //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 );
+ }
+ int index = tmp.indexOf( siteUrlProperty );
+ tmp.remove( index );
+ tmp.add( index, new ModelProperty(
ProjectUri.DistributionManagement.Site.url, siteUrl.toString() ) );
+ }
+
//SCM Rule
ModelProperty scmUrlProperty = getPropertyFor( ProjectUri.Scm.url,
tmp );
if ( scmUrl.length() == 0 && scmUrlProperty != null )