Author: jdcasey
Date: Thu Mar 15 10:57:18 2007
New Revision: 518711

URL: http://svn.apache.org/viewvc?view=rev&rev=518711
Log:
Fixing all but it0111 and [intermittently] it0108.

Added:
    
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DirectInvocationModifier.java
   (with props)
    
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DirectInvocationOriginElement.java
   (with props)
    
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/ForkedDirectInvocationModifier.java
   (with props)
    
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/SubLifecycleBuildPlan.java
      - copied, changed from r518461, 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/ForkedLifecycleBuildPlan.java
Removed:
    
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DirectInvocationPlan.java
    
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/ForkedLifecycleBuildPlan.java
Modified:
    
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManager.java
    
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/binding/LifecycleBindingManager.java
    
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/BuildPlan.java
    
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/BuildPlanUtils.java
    
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultBuildPlanner.java
    
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/LifecycleBuildPlan.java

Modified: 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManager.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManager.java?view=diff&rev=518711&r1=518710&r2=518711
==============================================================================
--- 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManager.java
 (original)
+++ 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManager.java
 Thu Mar 15 10:57:18 2007
@@ -8,7 +8,7 @@
 import org.apache.maven.lifecycle.model.LifecycleBinding;
 import org.apache.maven.lifecycle.model.LifecycleBindings;
 import org.apache.maven.lifecycle.model.MojoBinding;
-import org.apache.maven.lifecycle.plan.BuildPlan;
+import org.apache.maven.lifecycle.plan.DirectInvocationModifier;
 import org.apache.maven.lifecycle.plan.LifecyclePlannerException;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.PluginExecution;
@@ -582,7 +582,7 @@
         return assembleMojoBindingList( tasks, bindings, 
Collections.EMPTY_MAP, project );
     }
 
-    public List assembleMojoBindingList( List tasks, LifecycleBindings 
lifecycleBindings, Map directInvocationPlans,
+    public List assembleMojoBindingList( List tasks, LifecycleBindings 
lifecycleBindings, Map directInvocationModifiers,
                                                 MavenProject project )
         throws LifecycleSpecificationException, LifecyclePlannerException, 
LifecycleLoaderException
     {
@@ -626,11 +626,11 @@
                 mojoBinding.setOrigin( "direct invocation" );
 
                 String key = LifecycleUtils.createMojoBindingKey( mojoBinding, 
true );
-                BuildPlan diPlan = (BuildPlan) directInvocationPlans.get( key 
);
+                DirectInvocationModifier modifier = (DirectInvocationModifier) 
directInvocationModifiers.get( key );
 
-                if ( diPlan != null )
+                if ( modifier != null )
                 {
-                    planBindings.addAll( diPlan.getPlanMojoBindings( project, 
this ) );
+                    planBindings.addAll( modifier.getModifiedBindings( 
project, this ) );
                 }
                 else
                 {

Modified: 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/binding/LifecycleBindingManager.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/binding/LifecycleBindingManager.java?view=diff&rev=518711&r1=518710&r2=518711
==============================================================================
--- 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/binding/LifecycleBindingManager.java
 (original)
+++ 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/binding/LifecycleBindingManager.java
 Thu Mar 15 10:57:18 2007
@@ -31,7 +31,7 @@
     List getReportBindings( MavenProject project )
         throws LifecycleLoaderException, LifecycleSpecificationException;
 
-    List assembleMojoBindingList( List tasks, LifecycleBindings bindings, Map 
directInvocationPlans, MavenProject project )
+    List assembleMojoBindingList( List tasks, LifecycleBindings bindings, Map 
directInvocationModifiers, MavenProject project )
         throws LifecycleSpecificationException, LifecyclePlannerException, 
LifecycleLoaderException;
 
     List assembleMojoBindingList( List tasks, LifecycleBindings 
lifecycleBindings, MavenProject project )

Modified: 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/BuildPlan.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/BuildPlan.java?view=diff&rev=518711&r1=518710&r2=518711
==============================================================================
--- 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/BuildPlan.java
 (original)
+++ 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/BuildPlan.java
 Thu Mar 15 10:57:18 2007
@@ -3,21 +3,16 @@
 import org.apache.maven.lifecycle.LifecycleLoaderException;
 import org.apache.maven.lifecycle.LifecycleSpecificationException;
 import org.apache.maven.lifecycle.binding.LifecycleBindingManager;
-import org.apache.maven.lifecycle.model.MojoBinding;
 import org.apache.maven.project.MavenProject;
 
 import java.util.List;
 
 public interface BuildPlan
-    extends ModifiablePlanElement
+    extends ModifiablePlanElement, DirectInvocationOriginElement
 {
 
     List getPlanMojoBindings(MavenProject project, LifecycleBindingManager 
bindingManager)
         throws LifecycleSpecificationException, LifecyclePlannerException, 
LifecycleLoaderException;
-
-    void addDirectInvocationPlan( MojoBinding directInvocationBinding, 
BuildPlan plan );
-
-    boolean hasDirectInvocationPlans();
 
     List getTasks();
 

Modified: 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/BuildPlanUtils.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/BuildPlanUtils.java?view=diff&rev=518711&r1=518710&r2=518711
==============================================================================
--- 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/BuildPlanUtils.java
 (original)
+++ 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/BuildPlanUtils.java
 Thu Mar 15 10:57:18 2007
@@ -89,7 +89,7 @@
 
                 indentLevel++;
             }
-            else if ( StateManagementUtils.isForkedExecutionEndMarker( binding 
) )
+            else if ( StateManagementUtils.isForkedExecutionClearMarker( 
binding ) )
             {
                 indentLevel--;
 

Modified: 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultBuildPlanner.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultBuildPlanner.java?view=diff&rev=518711&r1=518710&r2=518711
==============================================================================
--- 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultBuildPlanner.java
 (original)
+++ 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultBuildPlanner.java
 Thu Mar 15 10:57:18 2007
@@ -16,11 +16,14 @@
 import org.codehaus.plexus.logging.LogEnabled;
 import org.codehaus.plexus.logging.Logger;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
+// FIXME: The forkingBindings collections are misused; they will probably not 
prevent cyclic build 
+// processes consisting of > 1 elements.
 public class DefaultBuildPlanner
     implements BuildPlanner, LogEnabled
 {
@@ -172,43 +175,31 @@
                                                            LinkedList 
forkingBindings, List tasks )
         throws LifecyclePlannerException, LifecycleSpecificationException, 
LifecycleLoaderException
     {
-        if ( LifecycleUtils.findPhaseForMojoBinding( invokedVia, 
mergedBindings, true ) != null )
+        if ( planElement instanceof DirectInvocationOriginElement )
         {
-            ForkPlanModifier modifier = new ForkPlanModifier( invokedVia, 
Collections.singletonList( invokedBinding ) );
-
-            forkingBindings.addLast( invokedBinding );
-            try
-            {
-                findForkModifiers( invokedBinding, pluginDescriptor, modifier, 
mergedBindings, project, forkingBindings, tasks );
-            }
-            finally
-            {
-                forkingBindings.removeLast();
-            }
-
-            planElement.addModifier( modifier );
-        }
-        else if ( planElement instanceof BuildPlan )
-        {
-            BuildPlan directInvocationPlan = new DirectInvocationPlan( 
invokedBinding, tasks );
-
+            List noTasks = Collections.EMPTY_LIST;
+            
+            LifecycleBindings forkedBindings = new LifecycleBindings();
+            LifecycleBuildPlan forkedPlan = new LifecycleBuildPlan( noTasks, 
forkedBindings );
+            
             forkingBindings.addLast( invokedBinding );
             try
             {
-                findForkModifiers( invokedBinding, pluginDescriptor, 
directInvocationPlan, mergedBindings, project,
+                findForkModifiers( invokedBinding, pluginDescriptor, 
forkedPlan, forkedBindings, project,
                                    forkingBindings, tasks );
             }
             finally
             {
                 forkingBindings.removeLast();
             }
+            
+            List forkedMojos = new ArrayList();
+            forkedMojos.addAll( 
lifecycleBindingManager.assembleMojoBindingList( noTasks, forkedBindings, 
project ) );
+            forkedMojos.add( invokedBinding );
 
-            // if we don't have further modifications to this single direct 
invocation, don't weigh
-            // things down.
-            if ( directInvocationPlan.hasModifiers() || 
directInvocationPlan.hasDirectInvocationPlans() )
-            {
-                ( (BuildPlan) planElement ).addDirectInvocationPlan( 
invokedVia, directInvocationPlan );
-            }
+            DirectInvocationModifier modifier = new 
ForkedDirectInvocationModifier( invokedVia, forkedMojos );
+
+            ( (DirectInvocationOriginElement) planElement 
).addDirectInvocationModifier( modifier );
         }
         else
         {
@@ -237,7 +228,7 @@
         }
         else if ( planElement instanceof BuildPlan )
         {
-            mpe = new ForkedLifecycleBuildPlan( mojoBinding, phase, bindings );
+            mpe = new SubLifecycleBuildPlan( phase, bindings );
         }
         else
         {
@@ -271,9 +262,13 @@
         {
             planElement.addModifier( (BuildPlanModifier) mpe );
         }
-        else if ( planElement instanceof BuildPlan )
+        else if ( planElement instanceof DirectInvocationOriginElement )
         {
-            ( (BuildPlan) planElement ).addDirectInvocationPlan( mojoBinding, 
(BuildPlan) mpe );
+            List planMojoBindings = ((BuildPlan) mpe).getPlanMojoBindings( 
project, lifecycleBindingManager );
+            
+            ForkedDirectInvocationModifier modifier = new 
ForkedDirectInvocationModifier( mojoBinding, planMojoBindings );
+            
+            ( (DirectInvocationOriginElement) planElement 
).addDirectInvocationModifier( modifier );
         }
     }
 

Added: 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DirectInvocationModifier.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DirectInvocationModifier.java?view=auto&rev=518711
==============================================================================
--- 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DirectInvocationModifier.java
 (added)
+++ 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DirectInvocationModifier.java
 Thu Mar 15 10:57:18 2007
@@ -0,0 +1,16 @@
+package org.apache.maven.lifecycle.plan;
+
+import org.apache.maven.lifecycle.binding.LifecycleBindingManager;
+import org.apache.maven.lifecycle.model.MojoBinding;
+import org.apache.maven.project.MavenProject;
+
+import java.util.List;
+
+public interface DirectInvocationModifier
+{
+    
+    MojoBinding getBindingToModify();
+    
+    List getModifiedBindings( MavenProject project, LifecycleBindingManager 
bindingManager );
+
+}

Propchange: 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DirectInvocationModifier.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DirectInvocationModifier.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DirectInvocationOriginElement.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DirectInvocationOriginElement.java?view=auto&rev=518711
==============================================================================
--- 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DirectInvocationOriginElement.java
 (added)
+++ 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DirectInvocationOriginElement.java
 Thu Mar 15 10:57:18 2007
@@ -0,0 +1,8 @@
+package org.apache.maven.lifecycle.plan;
+
+public interface DirectInvocationOriginElement
+{
+    
+    void addDirectInvocationModifier( DirectInvocationModifier modifier );
+
+}

Propchange: 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DirectInvocationOriginElement.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DirectInvocationOriginElement.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/ForkedDirectInvocationModifier.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/ForkedDirectInvocationModifier.java?view=auto&rev=518711
==============================================================================
--- 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/ForkedDirectInvocationModifier.java
 (added)
+++ 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/ForkedDirectInvocationModifier.java
 Thu Mar 15 10:57:18 2007
@@ -0,0 +1,42 @@
+package org.apache.maven.lifecycle.plan;
+
+import org.apache.maven.lifecycle.binding.LifecycleBindingManager;
+import org.apache.maven.lifecycle.model.MojoBinding;
+import org.apache.maven.lifecycle.statemgmt.StateManagementUtils;
+import org.apache.maven.project.MavenProject;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ForkedDirectInvocationModifier
+    implements DirectInvocationModifier
+{
+
+    private final List forkedBindings;
+    private final MojoBinding forkingBinding;
+
+    public ForkedDirectInvocationModifier( MojoBinding forkingBinding, List 
forkedBindings )
+    {
+        this.forkingBinding = forkingBinding;
+        this.forkedBindings = forkedBindings;
+    }
+
+    public List getModifiedBindings( MavenProject project, 
LifecycleBindingManager bindingManager )
+    {
+        List result = new ArrayList();
+
+        result.add( 
StateManagementUtils.createStartForkedExecutionMojoBinding() );
+        result.addAll( forkedBindings );
+        result.add( StateManagementUtils.createEndForkedExecutionMojoBinding() 
);
+        result.add( forkingBinding );
+        result.add( 
StateManagementUtils.createClearForkedExecutionMojoBinding() );
+
+        return result;
+    }
+
+    public MojoBinding getBindingToModify()
+    {
+        return forkingBinding;
+    }
+
+}

Propchange: 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/ForkedDirectInvocationModifier.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/ForkedDirectInvocationModifier.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/LifecycleBuildPlan.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/LifecycleBuildPlan.java?view=diff&rev=518711&r1=518710&r2=518711
==============================================================================
--- 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/LifecycleBuildPlan.java
 (original)
+++ 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/LifecycleBuildPlan.java
 Thu Mar 15 10:57:18 2007
@@ -5,7 +5,6 @@
 import org.apache.maven.lifecycle.LifecycleUtils;
 import org.apache.maven.lifecycle.binding.LifecycleBindingManager;
 import org.apache.maven.lifecycle.model.LifecycleBindings;
-import org.apache.maven.lifecycle.model.MojoBinding;
 import org.apache.maven.project.MavenProject;
 
 import java.util.ArrayList;
@@ -23,7 +22,7 @@
 
     private List planModifiers = new ArrayList();
 
-    private Map directInvocationPlans = new HashMap();
+    private Map directInvocationModifiers = new HashMap();
 
     public LifecycleBuildPlan( List tasks, LifecycleBindings lifecycleBindings 
)
     {
@@ -36,7 +35,7 @@
     {
         LifecycleBindings cloned = BuildPlanUtils.modifyPlanBindings( 
lifecycleBindings, planModifiers );
 
-        return bindingManager.assembleMojoBindingList( tasks, cloned, 
directInvocationPlans, project );
+        return bindingManager.assembleMojoBindingList( tasks, cloned, 
directInvocationModifiers, project );
     }
 
     public List getTasks()
@@ -54,14 +53,9 @@
         return !planModifiers.isEmpty();
     }
 
-    public void addDirectInvocationPlan( MojoBinding directInvocationBinding, 
BuildPlan plan )
+    public void addDirectInvocationModifier( DirectInvocationModifier modifier 
)
     {
-        directInvocationPlans.put( LifecycleUtils.createMojoBindingKey( 
directInvocationBinding, true ), plan );
-    }
-
-    public boolean hasDirectInvocationPlans()
-    {
-        return !directInvocationPlans.isEmpty();
+        directInvocationModifiers.put( LifecycleUtils.createMojoBindingKey( 
modifier.getBindingToModify(), true ), modifier );
     }
 
 }

Copied: 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/SubLifecycleBuildPlan.java
 (from r518461, 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/ForkedLifecycleBuildPlan.java)
URL: 
http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/SubLifecycleBuildPlan.java?view=diff&rev=518711&p1=maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/ForkedLifecycleBuildPlan.java&r1=518461&p2=maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/SubLifecycleBuildPlan.java&r2=518711
==============================================================================
--- 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/ForkedLifecycleBuildPlan.java
 (original)
+++ 
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/SubLifecycleBuildPlan.java
 Thu Mar 15 10:57:18 2007
@@ -4,35 +4,25 @@
 import org.apache.maven.lifecycle.LifecycleSpecificationException;
 import org.apache.maven.lifecycle.binding.LifecycleBindingManager;
 import org.apache.maven.lifecycle.model.LifecycleBindings;
-import org.apache.maven.lifecycle.model.MojoBinding;
-import org.apache.maven.lifecycle.statemgmt.StateManagementUtils;
 import org.apache.maven.project.MavenProject;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-public class ForkedLifecycleBuildPlan
+public class SubLifecycleBuildPlan
     extends LifecycleBuildPlan
 {
     
-    private final MojoBinding forkPoint;
-
-    public ForkedLifecycleBuildPlan( MojoBinding forkPoint, String phase, 
LifecycleBindings bindings )
+    public SubLifecycleBuildPlan( String phase, LifecycleBindings bindings )
     {
         super( Collections.singletonList( phase ), bindings );
-        this.forkPoint = forkPoint;
     }
 
     public List getPlanMojoBindings(MavenProject project, 
LifecycleBindingManager bindingManager)
         throws LifecycleSpecificationException, LifecyclePlannerException, 
LifecycleLoaderException
     {
         List bindings = new ArrayList( super.getPlanMojoBindings(project, 
bindingManager) );
-        
-        bindings.add( 0, 
StateManagementUtils.createStartForkedExecutionMojoBinding() );
-        bindings.add( 
StateManagementUtils.createEndForkedExecutionMojoBinding() );
-        bindings.add( forkPoint );
-        bindings.add( 
StateManagementUtils.createClearForkedExecutionMojoBinding() );
         
         return bindings;
     }


Reply via email to