svn commit: r721607 [1/3] - in /maven/shared/trunk/maven-shared-model/src: main/java/org/apache/maven/shared/model/ main/java/org/apache/maven/shared/model/impl/ test/java/org/apache/maven/shared/model/ test/java/org/apache/maven/shared/model/impl/

[si...@apache.org]

Author: sisbell
Date: Fri Nov 28 17:40:49 2008
New Revision: 721607

URL: http://svn.apache.org/viewvc?rev=721607&view=rev
Log:
Some changes to fix issues with pluginManagement and goals.

Added:
    maven/shared/trunk/maven-shared-model/src/test/java/org/apache/maven/shared/model/ProjectUri.java
Modified:
    maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelDataSource.java
    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/impl/DefaultModelDataSource.java
    maven/shared/trunk/maven-shared-model/src/test/java/org/apache/maven/shared/model/impl/DefaultModelDataSourceTest.java

Modified: maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelDataSource.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelDataSource.java?rev=721607&r1=721606&r2=721607&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelDataSource.java (original)
+++ maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelDataSource.java Fri Nov 28 17:40:49 2008
@@ -26,7 +26,7 @@
  * Provides services for joining, deleting and querying model containers.
  */
 public interface ModelDataSource
-{   
+{
     /**
      * Join model properties of the specified container a with the specified container b. Any elements of model container
      * a must take precedence over model container b. All elements of model container A must exist in the data source;
@@ -77,4 +77,6 @@
      * @return history of all joins and deletes
      */
     String getEventHistory();
+
+    void insertModelPropertiesAfter(ModelProperty insertAfter, List<ModelProperty> modelProperties);
 }

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=721607&r1=721606&r2=721607&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 Fri Nov 28 17:40:49 2008
@@ -239,6 +239,11 @@
         return resolved;
     }
 
+    public String toCode() {
+        String val = (value != null) ? "\"" + value + "\"" : null;
+        return "mpz.add(new ModelProperty(\"" + uri + "\", " + val +"));";
+    }
+
     public String toString()
     {
         return "Uri = " + uri + ", Value = " + value + ", Resolved Value = " + resolvedValue + ", Hash = " +

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=721607&r1=721606&r2=721607&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 Fri Nov 28 17:40:49 2008
@@ -335,6 +335,11 @@
         return sb.toString();
     }
 
+    public void insertModelPropertiesAfter(ModelProperty insertAfter, List<ModelProperty> mps)
+    {
+        modelProperties.addAll(modelProperties.indexOf(insertAfter) + 1, mps);
+    }
+
     /**
      * Removes duplicate model properties from the containers and return list.
      *
@@ -369,8 +374,14 @@
                 throw new IllegalArgumentException(
                     "Base URI is longer than model property uri: Base URI = " + baseUri + ", ModelProperty = " + p );
             }
+            String subUri = p.getUri().substring( baseUri.length(), modelPropertyLength );
+
+            //MAVEN_SPECIFIC WORK AROUND
+            if(p.getUri().endsWith("goals#collection")) {
+                    processedProperties.add( findLastIndexOfParent( p, processedProperties ) + 1, p );
+                    uris.add( p.getUri() );
+            }
 
-           String subUri = p.getUri().substring( baseUri.length(), modelPropertyLength );
             if ( !uris.contains( p.getUri() ) || ( (subUri.contains( "#collection" ) || subUri.contains("#set")) &&
                 (!subUri.endsWith( "#collection" ) && !subUri.endsWith("#set")) && !isParentASet(subUri) && combineChildrenRule(p, combineChildrenUris) )
                )
@@ -587,4 +598,4 @@
             }
             return baseUri;
         }
-}
\ No newline at end of file
+}