You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2008/09/05 08:02:45 UTC
svn commit: r692343 - in
/maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model:
ModelProperty.java ModelTransformerContext.java
impl/DefaultModelDataSource.java
Author: sisbell
Date: Thu Sep 4 23:02:44 2008
New Revision: 692343
URL: http://svn.apache.org/viewvc?rev=692343&view=rev
Log:
Fix for append.child properties.
Modified:
maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelProperty.java
maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java
maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java
Modified: maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelProperty.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelProperty.java?rev=692343&r1=692342&r2=692343&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelProperty.java (original)
+++ maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelProperty.java Thu Sep 4 23:02:44 2008
@@ -90,7 +90,7 @@
int index = uri.lastIndexOf( "/" );
if(index > -1) {
uriWithoutProperty = uri.substring( 0, uri.lastIndexOf( "/" ) );
- if(uriWithoutProperty.endsWith("#property"))
+ if(uriWithoutProperty.endsWith("#property") || uriWithoutProperty.endsWith("combine.children") )
{
uriWithoutProperty = uriWithoutProperty.substring( 0, uriWithoutProperty.lastIndexOf( "/" ) );
}
Modified: maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java?rev=692343&r1=692342&r2=692343&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java (original)
+++ maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java Thu Sep 4 23:02:44 2008
@@ -291,11 +291,6 @@
{
String uri = p.getUri();
String parentUri = uri.substring( 0, uri.lastIndexOf( "/" ) );
- if(parentUri.endsWith("#property") && !parentUri.substring( 0, parentUri.lastIndexOf( "/" )).equals(baseUri))
- {
- parentUri = parentUri.substring( 0, parentUri.lastIndexOf( "/" ) );
- }
- parentUri = parentUri.replaceAll("#property", "");
if ( !projectIsContained && uri.equals( baseUri ) )
{
@@ -305,7 +300,8 @@
}
else if ( !position.contains( uri ) || parentUri.contains( "#collection" ) || parentUri.contains( "#set" ) )
{
- int pst = position.indexOf( parentUri ) + 1;
+ int pst = (parentUri.endsWith("#property"))
+ ? (position.indexOf( parentUri.replaceAll("#property", "") ) + 1) : (position.indexOf( parentUri ) + 1);
if(pst == 0 && !uri.equals(properties.get(0).getUri()) )
{
throw new IllegalArgumentException("Could not locate parent: Parent URI = " + parentUri
Modified: maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java?rev=692343&r1=692342&r2=692343&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java (original)
+++ maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java Thu Sep 4 23:02:44 2008
@@ -538,7 +538,7 @@
}
}
- private static List<ModelProperty> sort( List<ModelProperty> properties, String baseUri )
+ protected static List<ModelProperty> sort( List<ModelProperty> properties, String baseUri )
{
if ( properties == null )
{
@@ -552,7 +552,6 @@
{
String uri = p.getUri();
String parentUri = uri.substring( 0, uri.lastIndexOf( "/" ) );
- parentUri = parentUri.replaceAll("#property", "");
if ( !projectIsContained && uri.equals( baseUri ) )
{
@@ -562,7 +561,8 @@
}
else if ( !position.contains( uri ) || parentUri.contains( "#collection" ) || parentUri.contains( "#set" ) )
{
- int pst = position.indexOf( parentUri ) + 1;
+ int pst = (parentUri.endsWith("#property"))
+ ? (position.indexOf( parentUri.replaceAll("#property", "") ) + 1) : (position.indexOf( parentUri ) + 1);
processedProperties.add( pst, p );
position.add( pst, uri );
}