Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-3846] Inherited URLs are not automatically extended with the child's artifactId 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@717941 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2008-11-15 22:35:14 +00:00
parent 7de89c1ee9
commit 0d28d1719a
1 changed files with 47 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
View File

@ -258,7 +258,7 @@ public final class PomClassicTransformer
} }
/** /**
* @see ModelTransformer#transformToModelProperties(java.util.List * @see ModelTransformer#transformToModelProperties(java.util.List)
*/ */
public List<ModelProperty> transformToModelProperties(List<DomainModel> domainModels public List<ModelProperty> transformToModelProperties(List<DomainModel> domainModels
) )
@ -271,10 +271,11 @@ public final class PomClassicTransformer
List<ModelProperty> modelProperties = new ArrayList<ModelProperty>(); List<ModelProperty> modelProperties = new ArrayList<ModelProperty>();
List<String> projectNames = new ArrayList<String>(); List<String> projectNames = new ArrayList<String>();
StringBuffer siteUrl = new StringBuffer(); StringBuilder projectUrl = new StringBuilder( 128 );
StringBuffer scmUrl = new StringBuffer(); StringBuilder siteUrl = new StringBuilder( 128 );
StringBuffer scmConnectionUrl = new StringBuffer(); StringBuilder scmUrl = new StringBuilder( 128 );
StringBuffer scmDeveloperUrl = new StringBuffer(); StringBuilder scmConnectionUrl = new StringBuilder( 128 );
StringBuilder scmDeveloperUrl = new StringBuilder( 128 );
boolean containsBuildResources = false; boolean containsBuildResources = false;
boolean containsTestResources = false; boolean containsTestResources = false;
@ -392,64 +393,16 @@ public final class PomClassicTransformer
tmp.removeAll( removeProperties ); tmp.removeAll( removeProperties );
} }
//Site Rule // Project URL Rule
adjustUrl( projectUrl, tmp, ProjectUri.url, projectNames );
ModelProperty siteUrlProperty = getPropertyFor( ProjectUri.DistributionManagement.Site.url, tmp ); // Site Rule
if ( siteUrl.length() == 0 && siteUrlProperty != null ) adjustUrl( siteUrl, tmp, ProjectUri.DistributionManagement.Site.url, projectNames );
{ // SCM Rule
siteUrl.append( siteUrlProperty.getResolvedValue());//.substring(0, siteUrlProperty.getResolvedValue().lastIndexOf("/")) ); adjustUrl( scmUrl, tmp, ProjectUri.Scm.url, projectNames );
for ( String projectName : projectNames ) // SCM Connection Rule
{ adjustUrl( scmConnectionUrl, tmp, ProjectUri.Scm.connection, projectNames );
if(!siteUrl.toString().endsWith( "/")) { // SCM Developer Rule
siteUrl.append( "/" ); adjustUrl( scmDeveloperUrl, tmp, ProjectUri.Scm.developerConnection, projectNames );
}
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
ModelProperty scmUrlProperty = getPropertyFor( ProjectUri.Scm.url, tmp );
if ( scmUrl.length() == 0 && scmUrlProperty != null )
{
scmUrl.append( scmUrlProperty.getResolvedValue() );
for ( String projectName : projectNames )
{
scmUrl.append( "/" ).append( projectName );
}
int index = tmp.indexOf( scmUrlProperty );
tmp.remove( index );
tmp.add( index, new ModelProperty( ProjectUri.Scm.url, scmUrl.toString() ) );
}
//SCM Connection Rule
scmUrlProperty = getPropertyFor( ProjectUri.Scm.connection, tmp );
if ( scmConnectionUrl.length() == 0 && scmUrlProperty != null )
{
scmConnectionUrl.append( scmUrlProperty.getResolvedValue() );
for ( String projectName : projectNames )
{
scmConnectionUrl.append( "/" ).append( projectName );
}
int index = tmp.indexOf( scmUrlProperty );
tmp.remove( index );
tmp.add( index, new ModelProperty( ProjectUri.Scm.connection, scmConnectionUrl.toString() ) );
}
//SCM Developer Rule
scmUrlProperty = getPropertyFor( ProjectUri.Scm.developerConnection, tmp );
if ( scmDeveloperUrl.length() == 0 && scmUrlProperty != null )
{
scmDeveloperUrl.append( scmUrlProperty.getResolvedValue() );
for ( String projectName : projectNames )
{
scmDeveloperUrl.append( "/" ).append( projectName );
}
int index = tmp.indexOf( scmUrlProperty );
tmp.remove( index );
tmp.add( index, new ModelProperty( ProjectUri.Scm.developerConnection, scmDeveloperUrl.toString() ) );
}
//Project Name Inheritance Rule //Project Name Inheritance Rule
//Packaging Inheritance Rule //Packaging Inheritance Rule
@ -542,6 +495,37 @@ public final class PomClassicTransformer
return modelProperties; return modelProperties;
} }
/**
* Adjusts an inherited URL to compensate for a child's relation/distance to the parent that defines the URL.
*
* @param url The buffer for the adjusted URL, must not be {@code null}.
* @param properties The model properties to update, must not be {@code null}.
* @param uri The URI of the model property defining the URL to adjust, must not be {@code null}.
* @param ids The artifact identifiers of the parent projects, starting with the least significant parent, must not
* be {@code null}.
*/
private void adjustUrl( StringBuilder url, List<ModelProperty> properties, String uri, List<String> ids )
{
if ( url.length() == 0 )
{
ModelProperty property = getPropertyFor( uri, properties );
if ( property != null )
{
url.append( property.getResolvedValue() );
for ( String id : ids )
{
if ( url.length() > 0 && url.charAt( url.length() - 1 ) != '/' )
{
url.append( '/' );
}
url.append( id );
}
int index = properties.indexOf( property );
properties.set( index, new ModelProperty( uri, url.toString() ) );
}
}
}
public void interpolateModelProperties(List<ModelProperty> modelProperties, public void interpolateModelProperties(List<ModelProperty> modelProperties,
List<InterpolatorProperty> interpolatorProperties, List<InterpolatorProperty> interpolatorProperties,
DomainModel domainModel) DomainModel domainModel)