svn commit: r758338 - in /maven/components/trunk: maven-model/src/main/mdo/ maven-project/src/test/java/org/apache/maven/project/ maven-project/src/test/resources-project-builder/dual-execution-ids/sub/ maven-project/src/test/resources-project-builder/...

[sisbell]

Author: sisbell
Date: Wed Mar 25 16:40:21 2009
New Revision: 758338

URL: http://svn.apache.org/viewvc?rev=758338&view=rev
Log:
[MNG-3938] -  Plugin executions with default id are not always merged. Had 
previously changed the id to default-execution-id to make default clearer. Some 
tests had changed this value, others had not. Brought back inline with Maven 2.x

Modified:
    maven/components/trunk/maven-model/src/main/mdo/maven.mdo
    
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
    
maven/components/trunk/maven-project/src/test/resources-project-builder/dual-execution-ids/sub/pom.xml
    
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/sub/pom.xml
    
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/sub/pom.xml

Modified: maven/components/trunk/maven-model/src/main/mdo/maven.mdo
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-model/src/main/mdo/maven.mdo?rev=758338&r1=758337&r2=758338&view=diff
==============================================================================
--- maven/components/trunk/maven-model/src/main/mdo/maven.mdo (original)
+++ maven/components/trunk/maven-model/src/main/mdo/maven.mdo Wed Mar 25 
16:40:21 2009
@@ -2742,7 +2742,7 @@
           <name>id</name>
           <version>4.0.0</version>
           <type>String</type>
-          <defaultValue>default-execution-id</defaultValue>
+          <defaultValue>default</defaultValue>
           <description>The identifier of this execution for labelling the 
goals during the build,
             and for matching executions to merge during 
inheritance.</description>
         </field>
@@ -2768,7 +2768,7 @@
           <version>4.0.0</version>
           <code>
             <![CDATA[
-    public static final String DEFAULT_EXECUTION_ID = "default-execution-id";
+    public static final String DEFAULT_EXECUTION_ID = "default";
             ]]>
           </code>
         </codeSegment>

Modified: 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java?rev=758338&r1=758337&r2=758338&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
 (original)
+++ 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
 Wed Mar 25 16:40:21 2009
@@ -472,12 +472,13 @@
         assertEquals( "parent-a", pom.getValue( 
"build/plugins[1]/executions[1]/goals[5]" ) );
     }
 
+    /*MNG-3938*/
     public void 
testOverridingOfInheritedPluginExecutionsWithoutPluginManagement()
         throws Exception
     {
         PomTestWrapper pom = buildPom( 
"plugin-exec-merging/wo-plugin-mngt/sub" );
         assertEquals( 2, ( (List<?>) pom.getValue( 
"build/plugins[1]/executions" ) ).size() );
-        assertEquals( "child-default", pom.getValue( 
"build/plugins[1]/executio...@id='default-execution-id']/phase" ) );
+        assertEquals( "child-default", pom.getValue( 
"build/plugins[1]/executio...@id='default']/phase" ) );
         assertEquals( "child-non-default", pom.getValue( 
"build/plugins[1]/executio...@id='non-default']/phase" ) );
     }
 
@@ -487,7 +488,7 @@
     {
         PomTestWrapper pom = buildPom( "plugin-exec-merging/w-plugin-mngt/sub" 
);
         assertEquals( 2, ( (List<?>) pom.getValue( 
"build/plugins[1]/executions" ) ).size() );
-        assertEquals( "child-default", pom.getValue( 
"build/plugins[1]/executio...@id='default-execution-id']/phase" ) );
+        assertEquals( "child-default", pom.getValue( 
"build/plugins[1]/executio...@id='default']/phase" ) );
         assertEquals( "child-non-default", pom.getValue( 
"build/plugins[1]/executio...@id='non-default']/phase" ) );
     }
 
@@ -1205,8 +1206,7 @@
         assertEquals( "CHILD", pom.getValue( "properties/overridden" ) );
         assertEquals( "CHILD", pom.getValue( "properties/interpolated" ) );
     }
-
-
+    
     private void assertPathSuffixEquals( String expected, Object actual )
     {
         String a = actual.toString();

Modified: 
maven/components/trunk/maven-project/src/test/resources-project-builder/dual-execution-ids/sub/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/dual-execution-ids/sub/pom.xml?rev=758338&r1=758337&r2=758338&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/test/resources-project-builder/dual-execution-ids/sub/pom.xml
 (original)
+++ 
maven/components/trunk/maven-project/src/test/resources-project-builder/dual-execution-ids/sub/pom.xml
 Wed Mar 25 16:40:21 2009
@@ -26,7 +26,7 @@
       <version>1.0</version>
       <executions>
         <execution>
-          <id>default-execution-id</id> 
+          <id>default</id> 
           <goals>
             <goal>process</goal>
           </goals>

Modified: 
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/sub/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/sub/pom.xml?rev=758338&r1=758337&r2=758338&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/sub/pom.xml
 (original)
+++ 
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/sub/pom.xml
 Wed Mar 25 16:40:21 2009
@@ -45,7 +45,7 @@
         <executions>
           <execution>
             <!-- NOTE: Explicitly reference "default" id here -->
-            <id>default-execution-id</id>
+            <id>default</id>
             <phase>child-default</phase>
           </execution>
           <execution>

Modified: 
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/sub/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/sub/pom.xml?rev=758338&r1=758337&r2=758338&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/sub/pom.xml
 (original)
+++ 
maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/sub/pom.xml
 Wed Mar 25 16:40:21 2009
@@ -45,7 +45,7 @@
         <executions>
           <execution>
             <!-- NOTE: Explicitly reference "default" id here -->
-            <id>default-execution-id</id>
+            <id>default</id>
             <phase>child-default</phase>
           </execution>
           <execution>