svn commit: r737622 - in /maven/components/trunk: maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java

[sisbell]

Author: sisbell
Date: Mon Jan 26 01:40:40 2009
New Revision: 737622

URL: http://svn.apache.org/viewvc?rev=737622&view=rev
Log:
Fixed regression on MNG-3821. Should not add any subcontainers to the Model 
Container Info list, which is the one that the ModelTransformerContext uses. 
This will match ids for subcontainers from different parent containers.

Modified:
    
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
    
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java

Modified: 
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java?rev=737622&r1=737621&r2=737622&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
 (original)
+++ 
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
 Mon Jan 26 01:40:40 2009
@@ -59,7 +59,7 @@
                      null, goals_infos)
             );
 
-
+    //Don't add subcontainers here, breaks MNG-3821
     public static final Collection<ModelContainerInfo> MODEL_CONTAINER_INFOS = 
Arrays.asList(
             ModelContainerInfo.Factory.createModelContainerInfo(
                     new ArtifactModelContainerFactory(), null, 
plugin_executions),
@@ -67,8 +67,8 @@
                     new 
IdModelContainerFactory(ProjectUri.PluginRepositories.PluginRepository.xUri), 
null, null),
             ModelContainerInfo.Factory.createModelContainerInfo(
                     new 
IdModelContainerFactory(ProjectUri.Repositories.Repository.xUri), null, null),
-            ModelContainerInfo.Factory.createModelContainerInfo(
-                    new 
IdModelContainerFactory(ProjectUri.Reporting.Plugins.Plugin.ReportSets.ReportSet.xUri),
 null, null),
+           // ModelContainerInfo.Factory.createModelContainerInfo(
+           //         new 
IdModelContainerFactory(ProjectUri.Reporting.Plugins.Plugin.ReportSets.ReportSet.xUri),
 null, null),
             ModelContainerInfo.Factory.createModelContainerInfo(
                     new 
IdModelContainerFactory(ProjectUri.Profiles.Profile.xUri), null, null)
     );

Modified: 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java?rev=737622&r1=737621&r2=737622&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
 (original)
+++ 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
 Mon Jan 26 01:40:40 2009
@@ -91,7 +91,7 @@
         assertEquals( 1, ( (List<?>) pom.getValue( 
"build/plugins[1]/dependencies" ) ).size() );
     }
 
-    /** MNG-3821 FIX THIS
+    /** MNG-3821 */
     public void testErroneousJoiningOfDifferentPluginsWithEqualExecutionIds()
         throws Exception
     {
@@ -105,7 +105,7 @@
         assertEquals( "maven-it-plugin-b", pom.getValue( 
"reporting/plugins[2]/artifactId" ) );
         assertEquals( 1, ( (List<?>) pom.getValue( 
"reporting/plugins[1]/reportSets" ) ).size() );
     }
-      */
+
      /** MNG-3998 */
     public void testExecutionConfiguration()
         throws Exception
@@ -145,6 +145,7 @@
         throws Exception
     {
         PomTestWrapper pom = buildPom( "foo/sub" );
+        System.out.println(pom.getDomainModel().asString());
     }
 
     /** MNG-3985 */