Fixing the legacy lifecycle mappings back to compatibility with 2.0.x in terms of classname, then mapping them back to a field in the lifecycle executor so the enforcer plugin continues to function.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@602972 13f79535-47bb-0310-9956-ffa450edef68

maven-core/src/main/aspect/org/apache/maven/compat/Maven20xCompatAspect.aj

@@ -1,6 +1,10 @@
-package org.apache.maven.compat.plugin;
+package org.apache.maven.compat;
 
+import org.apache.maven.lifecycle.binding.DefaultLifecycleBindingManager;
+import org.apache.maven.lifecycle.binding.LifecycleBindingManager;
+import org.codehaus.plexus.PlexusContainer;
 import org.apache.maven.DefaultMaven;
+import org.apache.maven.lifecycle.DefaultLifecycleExecutor;
 import org.apache.maven.lifecycle.MojoBindingUtils;
 import org.apache.maven.lifecycle.LifecycleUtils;
 import org.apache.maven.lifecycle.NoSuchPhaseException;
@@ -34,10 +38,12 @@ import org.apache.maven.settings.DefaultMavenSettingsBuilder;
 import org.apache.maven.settings.Settings;
 import org.codehaus.plexus.classworlds.realm.ClassRealm;
 import org.codehaus.plexus.classworlds.realm.NoSuchRealmException;
+import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.codehaus.plexus.logging.Logger;
 
+import java.util.List;
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.Collection;
@@ -355,4 +361,30 @@ public privileged aspect Maven20xCompatAspect
         return result;
     }
 
+    // This is to support the maven-enforcer-plugin.
+    private List DefaultLifecycleExecutor.lifecycles;
+
+    private pointcut lifecycleExecutorExecute( DefaultLifecycleExecutor executor ):
+        execution( * DefaultLifecycleExecutor.execute( .. ) )
+        && this( executor );
+
+    before( DefaultLifecycleExecutor executor ): lifecycleExecutorExecute( executor )
+    {
+        PlexusContainer container = executor.container;
+        DefaultLifecycleBindingManager bindingMgr;
+        try
+        {
+            bindingMgr = (DefaultLifecycleBindingManager) container.lookup( LifecycleBindingManager.ROLE, "default" );
+        }
+        catch ( ComponentLookupException e )
+        {
+            IllegalStateException err = new IllegalStateException( "Cannot lookup default role-hint for: " + LifecycleBindingManager.ROLE );
+            err.initCause( e );
+
+            throw err;
+        }
+
+        executor.lifecycles = bindingMgr.lifecycles;
+    }
+
 }

maven-core/src/main/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManager.java

@@ -63,7 +63,7 @@ public class DefaultLifecycleBindingManager
     private Logger logger;
 
     // configured. Moved out of DefaultLifecycleExecutor...
-    private List legacyLifecycles;
+    private List lifecycles;
 
     // configured. Moved out of DefaultLifecycleExecutor...
     private List defaultReports;
@@ -128,7 +128,7 @@ public class DefaultLifecycleBindingManager
      */
     public LifecycleBindings getDefaultBindings( final MavenProject project ) throws LifecycleSpecificationException
     {
-        LifecycleBindings bindings = legacyLifecycleMappingParser.parseDefaultMappings( legacyLifecycles );
+        LifecycleBindings bindings = legacyLifecycleMappingParser.parseDefaultMappings( lifecycles );
 
         BindingUtils.injectProjectConfiguration( bindings, project );
 
@@ -325,7 +325,7 @@ public class DefaultLifecycleBindingManager
 
         if ( lifecycleOverlay == null )
         {
-            throw new LifecycleLoaderException( "LegacyLifecycle '" + lifecycleId + "' not found in plugin" );
+            throw new LifecycleLoaderException( "Lifecycle '" + lifecycleId + "' not found in plugin" );
         }
 
         LifecycleBindings bindings = new LifecycleBindings();

maven-core/src/main/java/org/apache/maven/lifecycle/binding/LegacyLifecycleMappingParser.java

@@ -39,7 +39,7 @@ public class LegacyLifecycleMappingParser
 
         for ( Iterator it = lifecycles.iterator(); it.hasNext(); )
         {
-            LegacyLifecycle lifecycle = (LegacyLifecycle) it.next();
+            Lifecycle lifecycle = (Lifecycle) it.next();
 
             if ( "clean".equals( lifecycle.getId() ) )
             {

maven-core/src/main/java/org/apache/maven/lifecycle/binding/Lifecycle.java

@@ -24,9 +24,9 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * Class LegacyLifecycle.
+ * Class Lifecycle.
  */
-public class LegacyLifecycle
+public class Lifecycle
 {
     /**
      * Field id
@@ -58,7 +58,7 @@ public class LegacyLifecycle
      */
     public String getId()
     {
-        return this.id;
+        return id;
     } //-- String getId()
 
     /**
@@ -66,12 +66,12 @@ public class LegacyLifecycle
      */
     public List getPhases()
     {
-        if ( this.phases == null )
+        if ( phases == null )
         {
-            this.phases = new ArrayList();
+            phases = new ArrayList();
         }
 
-        return this.phases;
+        return phases;
     } //-- java.util.List getPhases()
 
     /**

maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java

@@ -25,7 +25,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * LegacyLifecycle mapping for a POM.
+ * Lifecycle mapping for a POM.
  *
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  * @version $Id$

maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java

@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * Class LegacyLifecycle.
+ * Class Lifecycle.
  */
 public class Lifecycle
 {

maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java

@@ -1262,7 +1262,7 @@ public class DefaultPluginManager
     }
 
     // ----------------------------------------------------------------------
-    // LegacyLifecycle
+    // Lifecycle
     // ----------------------------------------------------------------------
 
     public void contextualize( Context context )

maven-core/src/main/resources/META-INF/plexus/components.xml

@@ -725,8 +725,8 @@ under the License.
         </requirement>
       </requirements>
       <configuration>
-        <legacyLifecycles>
+        <lifecycles>
-          <legacyLifecycle>
+          <lifecycle>
             <id>default</id>
             <!-- START SNIPPET: lifecycle -->
             <phases>
@@ -755,8 +755,8 @@ under the License.
               <phase>deploy</phase>
             </phases>
             <!-- END SNIPPET: lifecycle -->
-          </legacyLifecycle>
+          </lifecycle>
-          <legacyLifecycle>
+          <lifecycle>
             <id>clean</id>
             <phases>
               <phase>pre-clean</phase>
@@ -766,8 +766,8 @@ under the License.
             <default-phases>
               <clean>org.apache.maven.plugins:maven-clean-plugin:clean</clean>
             </default-phases>
-          </legacyLifecycle>
+          </lifecycle>
-          <legacyLifecycle>
+          <lifecycle>
             <id>site</id>
             <phases>
               <phase>pre-site</phase>
@@ -779,8 +779,8 @@ under the License.
               <site>org.apache.maven.plugins:maven-site-plugin:site</site>
               <site-deploy>org.apache.maven.plugins:maven-site-plugin:deploy</site-deploy>
             </default-phases>
-          </legacyLifecycle>
+          </lifecycle>
-        </legacyLifecycles>
+        </lifecycles>
         <!-- START SNIPPET: default-reports -->
         <defaultReports>
           <report>org.apache.maven.plugins:maven-project-info-reports-plugin</report>

maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java

@@ -483,7 +483,7 @@ public class MavenEmbedder
     // Execution of phases/goals
     // ----------------------------------------------------------------------
     // ----------------------------------------------------------------------
-    // LegacyLifecycle information
+    // Lifecycle information
     // ----------------------------------------------------------------------
 
     public List getLifecyclePhases()
@@ -517,7 +517,7 @@ public class MavenEmbedder
     }
 
     // ----------------------------------------------------------------------
-    //  LegacyLifecycle
+    //  Lifecycle
     // ----------------------------------------------------------------------
 
     private MavenExecutionRequest request;
@@ -629,7 +629,7 @@ public class MavenEmbedder
     }
 
     // ----------------------------------------------------------------------
-    // LegacyLifecycle
+    // Lifecycle
     // ----------------------------------------------------------------------
 
     private void handleExtensions( List extensions )

maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java

@@ -640,7 +640,7 @@ public class DefaultMavenExecutionRequestPopulator
     }
 
     // ----------------------------------------------------------------------------
-    // LegacyLifecycle
+    // Lifecycle
     // ----------------------------------------------------------------------------
 
     public void contextualize( Context context )

maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java

@@ -266,7 +266,7 @@ public class MavenEmbedderTest
     }
 
     // ----------------------------------------------------------------------
-    // LegacyLifecycle phases
+    // Lifecycle phases
     // ----------------------------------------------------------------------
 
     public void testRetrievingLifecyclePhases()