You are viewing a plain text version of this content. The canonical link for it is here.
Posted to m2-dev@maven.apache.org by jv...@apache.org on 2004/08/12 20:41:15 UTC
cvs commit: maven-components/maven-core/src/test/java/org/apache/maven/plugin OgnlProjectValueExtractorTest.java
jvanzyl 2004/08/12 11:41:15
Modified: maven-core/src/main/java/org/apache/maven DefaultMaven.java
maven-core/src/main/java/org/apache/maven/lifecycle
AbstractMavenLifecyclePhase.java
DefaultMavenLifecycleManager.java
MavenLifecycleManager.java MavenLifecyclePhase.java
maven-core/src/main/java/org/apache/maven/lifecycle/phase
DependencyDownloadPhase.java
DependencyResolutionPhase.java
GoalAttainmentPhase.java GoalDecorationPhase.java
GoalResolutionPhase.java
InheritanceAssemblyPhase.java
PluginDownloadPhase.java
maven-core/src/main/java/org/apache/maven/plugin
OgnlProjectValueExtractor.java
maven-core/src/test/java/org/apache/maven/lifecycle/phase
GoalDecorationPhaseTest.java
GoalResolutionPhaseTest.java
maven-core/src/test/java/org/apache/maven/plugin
OgnlProjectValueExtractorTest.java
Added: maven-core/src/main/java/org/apache/maven/lifecycle
MavenGoalExecutionContext.java
Removed: maven-core/src/main/java/org/apache/maven/lifecycle
MavenLifecycleContext.java
Log:
o changing MavenLifecycleContext to MavenGoalExecutionContext which is what
it really is. Making way for the notion of a MavenSessionExecutionContext
and it is looking like we will end up with two lifecycles. Where we are
dealing with notions of goals and sessions: some operations need to be
done at the session level and don't need to be repeated for the execution
of every goal.
Revision Changes Path
1.2 +3 -3 maven-components/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Index: DefaultMaven.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/DefaultMaven.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultMaven.java 9 Aug 2004 19:02:34 -0000 1.1
+++ DefaultMaven.java 12 Aug 2004 18:41:13 -0000 1.2
@@ -17,7 +17,7 @@
*/
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.lifecycle.MavenLifecycleContext;
+import org.apache.maven.lifecycle.MavenGoalExecutionContext;
import org.apache.maven.lifecycle.MavenLifecycleManager;
import org.apache.maven.plugin.PluginManager;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
@@ -105,13 +105,13 @@
}
*/
- MavenLifecycleContext context;
+ MavenGoalExecutionContext context;
try
{
//!! we may not know anything about the plugin at this point.
- context = new MavenLifecycleContext( container,
+ context = new MavenGoalExecutionContext( container,
project,
getMojoDescriptor( goal ),
getLocalRepository() );
1.2 +2 -2 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/AbstractMavenLifecyclePhase.java
Index: AbstractMavenLifecyclePhase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/AbstractMavenLifecyclePhase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractMavenLifecyclePhase.java 9 Aug 2004 19:02:35 -0000 1.1
+++ AbstractMavenLifecyclePhase.java 12 Aug 2004 18:41:13 -0000 1.2
@@ -26,6 +26,6 @@
extends AbstractLogEnabled
implements MavenLifecyclePhase
{
- public abstract void execute( MavenLifecycleContext context )
+ public abstract void execute( MavenGoalExecutionContext context )
throws Exception;
}
1.2 +2 -2 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultMavenLifecycleManager.java
Index: DefaultMavenLifecycleManager.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultMavenLifecycleManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultMavenLifecycleManager.java 9 Aug 2004 19:02:35 -0000 1.1
+++ DefaultMavenLifecycleManager.java 12 Aug 2004 18:41:14 -0000 1.2
@@ -36,7 +36,7 @@
return lifecyclePhases;
}
- public void execute( MavenLifecycleContext context )
+ public void execute( MavenGoalExecutionContext context )
throws Exception
{
for ( Iterator iterator = lifecyclePhases.iterator(); iterator.hasNext(); )
1.2 +2 -2 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/MavenLifecycleManager.java
Index: MavenLifecycleManager.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/MavenLifecycleManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MavenLifecycleManager.java 9 Aug 2004 19:02:35 -0000 1.1
+++ MavenLifecycleManager.java 12 Aug 2004 18:41:14 -0000 1.2
@@ -26,7 +26,7 @@
{
String ROLE = MavenLifecycleManager.class.getName();
- void execute( MavenLifecycleContext context )
+ void execute( MavenGoalExecutionContext context )
throws Exception;
List getLifecyclePhases();
1.2 +2 -2 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/MavenLifecyclePhase.java
Index: MavenLifecyclePhase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/MavenLifecyclePhase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MavenLifecyclePhase.java 9 Aug 2004 19:02:35 -0000 1.1
+++ MavenLifecyclePhase.java 12 Aug 2004 18:41:14 -0000 1.2
@@ -27,7 +27,7 @@
{
String ROLE = MavenLifecyclePhase.class.getName();
- void execute( MavenLifecycleContext context )
+ void execute( MavenGoalExecutionContext context )
throws Exception;
void enableLogging( Logger logger );
1.1 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/MavenGoalExecutionContext.java
Index: MavenGoalExecutionContext.java
===================================================================
package org.apache.maven.lifecycle;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.decoration.GoalDecoratorBindings;
import org.apache.maven.plugin.FailureResponse;
import org.apache.maven.plugin.PluginManager;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.project.MavenProject;
import org.apache.maven.repository.RepositoryUtils;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id: MavenGoalExecutionContext.java,v 1.1 2004/08/12 18:41:14 jvanzyl Exp $
*/
public class MavenGoalExecutionContext
{
private String failedGoal;
private FailureResponse failureResponse;
private PlexusContainer container;
private MavenProject project;
private MojoDescriptor mojoDescriptor;
private List resolvedGoals;
private PluginManager pluginManager;
private Set pluginDependencies;
private GoalDecoratorBindings goalDecoratorBindings;
private ArtifactRepository localRepository;
private Set remoteRepositories;
private String goalName;
public MavenGoalExecutionContext( PlexusContainer container,
MavenProject project,
MojoDescriptor goal,
ArtifactRepository localRepository )
throws Exception
{
this.container = container;
this.project = project;
this.mojoDescriptor = goal;
this.localRepository = localRepository;
pluginManager = (PluginManager) lookup( PluginManager.ROLE );
pluginDependencies = new HashSet();
}
// ----------------------------------------------------------------------
// Provide an easy way to lookup plexus components
// ----------------------------------------------------------------------
public Object lookup( String role )
throws ComponentLookupException
{
return container.lookup( role );
}
public Object lookup( String role, String roleHint )
throws ComponentLookupException
{
return container.lookup( role, roleHint );
}
public void release( Object component )
{
if ( component != null )
{
try
{
container.release( component );
}
catch ( Exception e )
{
//@todo what to do here?
}
}
}
// ----------------------------------------------------------------------
//
// ----------------------------------------------------------------------
public boolean requiresDependencyResolution()
{
return mojoDescriptor.requiresDependencyResolution();
}
// ----------------------------------------------------------------------
//
// ----------------------------------------------------------------------
public PlexusContainer getContainer()
{
return container;
}
public MavenProject getProject()
{
return project;
}
public MojoDescriptor getMojoDescriptor()
{
return mojoDescriptor;
}
public void setMojoDescriptor( MojoDescriptor mojoDescriptor )
{
this.mojoDescriptor = mojoDescriptor;
}
// ----------------------------------------------------------------------
// Resolved MojoDescriptors
// ----------------------------------------------------------------------
public List getResolvedGoals()
{
return resolvedGoals;
}
public void setResolvedGoals( List resolvedGoals )
{
this.resolvedGoals = resolvedGoals;
}
// ----------------------------------------------------------------------
// Delegation to the plugin manager
// ----------------------------------------------------------------------
public MojoDescriptor getMojoDescriptor( String mojoDescriptorName )
{
return pluginManager.getMojoDescriptor( mojoDescriptorName );
}
public String getPluginId( MojoDescriptor mojoDescriptor )
{
return mojoDescriptor.getId();
}
// ----------------------------------------------------------------------
// Execution failure
// ----------------------------------------------------------------------
public void setExecutionFailure( String failedGoal, FailureResponse response )
{
this.failedGoal = failedGoal;
this.failureResponse = response;
}
public boolean isExecutionFailure()
{
return ( failedGoal != null );
}
public String getFailedGoal()
{
return failedGoal;
}
public void setFailedGoal( String failedGoal )
{
this.failedGoal = failedGoal;
}
public FailureResponse getFailureResponse()
{
return failureResponse;
}
public void setFailureResponse( FailureResponse failureResponse )
{
this.failureResponse = failureResponse;
}
public Set getPluginDependencies()
{
return pluginDependencies;
}
public void setPluginDependencies( Set pluginDependencies )
{
this.pluginDependencies = pluginDependencies;
}
public GoalDecoratorBindings getGoalDecoratorBindings()
{
return goalDecoratorBindings;
}
public void setGoalDecoratorBindings( GoalDecoratorBindings goalDecoratorBindings )
{
this.goalDecoratorBindings = goalDecoratorBindings;
}
// ----------------------------------------------------------------------
// Local repository
// ----------------------------------------------------------------------
public ArtifactRepository getLocalRepository()
{
return localRepository;
}
public Set getRemoteRepositories()
{
if ( remoteRepositories == null )
{
remoteRepositories = RepositoryUtils.mavenToWagon( project.getRepositories() );
}
return remoteRepositories;
}
public String getGoalName()
{
return goalName;
}
public void setGoalName( String goalName )
{
this.goalName = goalName;
}
}
1.2 +3 -3 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/phase/DependencyDownloadPhase.java
Index: DependencyDownloadPhase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/phase/DependencyDownloadPhase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DependencyDownloadPhase.java 9 Aug 2004 19:02:35 -0000 1.1
+++ DependencyDownloadPhase.java 12 Aug 2004 18:41:14 -0000 1.2
@@ -19,7 +19,7 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.lifecycle.AbstractMavenLifecyclePhase;
-import org.apache.maven.lifecycle.MavenLifecycleContext;
+import org.apache.maven.lifecycle.MavenGoalExecutionContext;
import java.util.Iterator;
@@ -30,7 +30,7 @@
public class DependencyDownloadPhase
extends AbstractMavenLifecyclePhase
{
- public void execute( MavenLifecycleContext context )
+ public void execute( MavenGoalExecutionContext context )
throws Exception
{
ArtifactResolver artifactResolver = null;
1.2 +4 -4 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/phase/DependencyResolutionPhase.java
Index: DependencyResolutionPhase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/phase/DependencyResolutionPhase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DependencyResolutionPhase.java 9 Aug 2004 19:02:35 -0000 1.1
+++ DependencyResolutionPhase.java 12 Aug 2004 18:41:14 -0000 1.2
@@ -20,7 +20,7 @@
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.artifact.MavenMetadataSource;
import org.apache.maven.lifecycle.AbstractMavenLifecyclePhase;
-import org.apache.maven.lifecycle.MavenLifecycleContext;
+import org.apache.maven.lifecycle.MavenGoalExecutionContext;
import org.apache.maven.project.MavenProject;
import java.util.Iterator;
@@ -32,7 +32,7 @@
public class DependencyResolutionPhase
extends AbstractMavenLifecyclePhase
{
- public void execute( MavenLifecycleContext context )
+ public void execute( MavenGoalExecutionContext context )
throws Exception
{
for ( Iterator iterator = context.getResolvedGoals().iterator(); iterator.hasNext(); )
@@ -48,7 +48,7 @@
}
}
- private void resolveTransitiveDependencies( MavenLifecycleContext context )
+ private void resolveTransitiveDependencies( MavenGoalExecutionContext context )
throws Exception
{
ArtifactResolver artifactResolver = null;
1.2 +5 -5 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/phase/GoalAttainmentPhase.java
Index: GoalAttainmentPhase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/phase/GoalAttainmentPhase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GoalAttainmentPhase.java 9 Aug 2004 19:02:35 -0000 1.1
+++ GoalAttainmentPhase.java 12 Aug 2004 18:41:14 -0000 1.2
@@ -17,7 +17,7 @@
*/
import org.apache.maven.lifecycle.AbstractMavenLifecyclePhase;
-import org.apache.maven.lifecycle.MavenLifecycleContext;
+import org.apache.maven.lifecycle.MavenGoalExecutionContext;
import org.apache.maven.plugin.OgnlProjectValueExtractor;
import org.apache.maven.plugin.Plugin;
import org.apache.maven.plugin.PluginExecutionRequest;
@@ -37,7 +37,7 @@
public class GoalAttainmentPhase
extends AbstractMavenLifecyclePhase
{
- public void execute( MavenLifecycleContext context )
+ public void execute( MavenGoalExecutionContext context )
throws Exception
{
PluginExecutionResponse response;
@@ -82,7 +82,7 @@
}
}
- private Map createParameters( MojoDescriptor goal, MavenLifecycleContext context )
+ private Map createParameters( MojoDescriptor goal, MavenGoalExecutionContext context )
{
Map map = null;
@@ -115,7 +115,7 @@
return map;
}
- private void releaseComponents( MojoDescriptor goal, PluginExecutionRequest request, MavenLifecycleContext context )
+ private void releaseComponents( MojoDescriptor goal, PluginExecutionRequest request, MavenGoalExecutionContext context )
{
if ( request != null && request.getParameters() != null )
{
1.2 +4 -4 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/phase/GoalDecorationPhase.java
Index: GoalDecorationPhase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/phase/GoalDecorationPhase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GoalDecorationPhase.java 9 Aug 2004 19:02:35 -0000 1.1
+++ GoalDecorationPhase.java 12 Aug 2004 18:41:14 -0000 1.2
@@ -19,7 +19,7 @@
import org.apache.maven.decoration.GoalDecorationParser;
import org.apache.maven.decoration.GoalDecoratorBindings;
import org.apache.maven.lifecycle.AbstractMavenLifecyclePhase;
-import org.apache.maven.lifecycle.MavenLifecycleContext;
+import org.apache.maven.lifecycle.MavenGoalExecutionContext;
import org.apache.maven.project.MavenProject;
import org.xmlpull.v1.XmlPullParserException;
@@ -40,7 +40,7 @@
private GoalDecoratorBindings decorators;
private boolean decoratorsInitialized = false;
- public void execute( MavenLifecycleContext context )
+ public void execute( MavenGoalExecutionContext context )
throws Exception
{
synchronized ( this )
@@ -54,7 +54,7 @@
context.setGoalDecoratorBindings(decorators);
}
- private void initializeDecorators( MavenLifecycleContext context )
+ private void initializeDecorators( MavenGoalExecutionContext context )
throws XmlPullParserException, IOException
{
MavenProject project = context.getProject( );
1.3 +6 -6 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/phase/GoalResolutionPhase.java
Index: GoalResolutionPhase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/phase/GoalResolutionPhase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GoalResolutionPhase.java 10 Aug 2004 02:38:07 -0000 1.2
+++ GoalResolutionPhase.java 12 Aug 2004 18:41:14 -0000 1.3
@@ -21,7 +21,7 @@
import org.apache.maven.decoration.GoalDecorator;
import org.apache.maven.decoration.GoalDecoratorBindings;
import org.apache.maven.lifecycle.AbstractMavenLifecyclePhase;
-import org.apache.maven.lifecycle.MavenLifecycleContext;
+import org.apache.maven.lifecycle.MavenGoalExecutionContext;
import org.apache.maven.plugin.PluginManager;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
@@ -38,7 +38,7 @@
*/
public class GoalResolutionPhase extends AbstractMavenLifecyclePhase
{
- public void execute( MavenLifecycleContext context )
+ public void execute( MavenGoalExecutionContext context )
throws Exception
{
PluginManager pluginManager = null;
@@ -65,7 +65,7 @@
}
}
- private List resolveTopLevel( String goal, Set includedGoals, List results, MavenLifecycleContext context, PluginManager pluginManager )
+ private List resolveTopLevel( String goal, Set includedGoals, List results, MavenGoalExecutionContext context, PluginManager pluginManager )
{
// Retrieve the prereqs-driven execution path for this goal, using the DAG.
@@ -77,7 +77,7 @@
return resolveWithPrereqs( work, includedGoals, results, context, pluginManager );
}
- private List resolveWithPrereqs( List work, Set includedGoals, List results, MavenLifecycleContext context, PluginManager pluginManager )
+ private List resolveWithPrereqs( List work, Set includedGoals, List results, MavenGoalExecutionContext context, PluginManager pluginManager )
{
if ( !work.isEmpty() )
{
@@ -109,7 +109,7 @@
return results;
}
- private List resolveGoalDecorators( List preGoals, Set includedGoals, List results, MavenLifecycleContext context, PluginManager pluginManager )
+ private List resolveGoalDecorators( List preGoals, Set includedGoals, List results, MavenGoalExecutionContext context, PluginManager pluginManager )
{
for ( Iterator it = preGoals.iterator(); it.hasNext(); )
{
1.2 +3 -3 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/phase/InheritanceAssemblyPhase.java
Index: InheritanceAssemblyPhase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/phase/InheritanceAssemblyPhase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InheritanceAssemblyPhase.java 9 Aug 2004 19:02:35 -0000 1.1
+++ InheritanceAssemblyPhase.java 12 Aug 2004 18:41:14 -0000 1.2
@@ -17,7 +17,7 @@
*/
import org.apache.maven.lifecycle.AbstractMavenLifecyclePhase;
-import org.apache.maven.lifecycle.MavenLifecycleContext;
+import org.apache.maven.lifecycle.MavenGoalExecutionContext;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
@@ -26,7 +26,7 @@
public class InheritanceAssemblyPhase
extends AbstractMavenLifecyclePhase
{
- public void execute( MavenLifecycleContext context )
+ public void execute( MavenGoalExecutionContext context )
throws Exception
{
}
1.2 +3 -3 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/phase/PluginDownloadPhase.java
Index: PluginDownloadPhase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/phase/PluginDownloadPhase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PluginDownloadPhase.java 9 Aug 2004 19:02:35 -0000 1.1
+++ PluginDownloadPhase.java 12 Aug 2004 18:41:14 -0000 1.2
@@ -17,7 +17,7 @@
*/
import org.apache.maven.lifecycle.AbstractMavenLifecyclePhase;
-import org.apache.maven.lifecycle.MavenLifecycleContext;
+import org.apache.maven.lifecycle.MavenGoalExecutionContext;
import org.apache.maven.plugin.PluginManager;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
@@ -34,7 +34,7 @@
public class PluginDownloadPhase
extends AbstractMavenLifecyclePhase
{
- public void execute( MavenLifecycleContext context )
+ public void execute( MavenGoalExecutionContext context )
throws Exception
{
PluginManager pluginManager = (PluginManager) context.lookup( PluginManager.ROLE );
1.2 +3 -3 maven-components/maven-core/src/main/java/org/apache/maven/plugin/OgnlProjectValueExtractor.java
Index: OgnlProjectValueExtractor.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/OgnlProjectValueExtractor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OgnlProjectValueExtractor.java 9 Aug 2004 19:02:35 -0000 1.1
+++ OgnlProjectValueExtractor.java 12 Aug 2004 18:41:15 -0000 1.2
@@ -18,7 +18,7 @@
import ognl.Ognl;
import ognl.OgnlException;
-import org.apache.maven.lifecycle.MavenLifecycleContext;
+import org.apache.maven.lifecycle.MavenGoalExecutionContext;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
/**
@@ -27,7 +27,7 @@
*/
public class OgnlProjectValueExtractor
{
- public static Object evaluate( String expression, MavenLifecycleContext context )
+ public static Object evaluate( String expression, MavenGoalExecutionContext context )
{
Object value = null;
1.2 +2 -2 maven-components/maven-core/src/test/java/org/apache/maven/lifecycle/phase/GoalDecorationPhaseTest.java
Index: GoalDecorationPhaseTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/lifecycle/phase/GoalDecorationPhaseTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GoalDecorationPhaseTest.java 9 Aug 2004 19:02:38 -0000 1.1
+++ GoalDecorationPhaseTest.java 12 Aug 2004 18:41:15 -0000 1.2
@@ -20,7 +20,7 @@
import junit.framework.TestCase;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.decoration.GoalDecoratorBindings;
-import org.apache.maven.lifecycle.MavenLifecycleContext;
+import org.apache.maven.lifecycle.MavenGoalExecutionContext;
import org.apache.maven.model.Model;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.project.MavenProject;
@@ -95,7 +95,7 @@
ArtifactRepository localRepository = new ArtifactRepository();
- MavenLifecycleContext context = new MavenLifecycleContext( embedder.getContainer(),
+ MavenGoalExecutionContext context = new MavenGoalExecutionContext( embedder.getContainer(),
project,
descriptor,
localRepository );
1.2 +2 -2 maven-components/maven-core/src/test/java/org/apache/maven/lifecycle/phase/GoalResolutionPhaseTest.java
Index: GoalResolutionPhaseTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/lifecycle/phase/GoalResolutionPhaseTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GoalResolutionPhaseTest.java 9 Aug 2004 19:02:38 -0000 1.1
+++ GoalResolutionPhaseTest.java 12 Aug 2004 18:41:15 -0000 1.2
@@ -5,7 +5,7 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.decoration.DefaultGoalDecorator;
import org.apache.maven.decoration.GoalDecoratorBindings;
-import org.apache.maven.lifecycle.MavenLifecycleContext;
+import org.apache.maven.lifecycle.MavenGoalExecutionContext;
import org.apache.maven.model.Model;
import org.apache.maven.plugin.PluginManager;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
@@ -292,7 +292,7 @@
ArtifactRepository localRepository = new ArtifactRepository();
- MavenLifecycleContext context = new MavenLifecycleContext( embedder.getContainer(),
+ MavenGoalExecutionContext context = new MavenGoalExecutionContext( embedder.getContainer(),
project,
descriptor,
localRepository );
1.2 +4 -4 maven-components/maven-core/src/test/java/org/apache/maven/plugin/OgnlProjectValueExtractorTest.java
Index: OgnlProjectValueExtractorTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/plugin/OgnlProjectValueExtractorTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OgnlProjectValueExtractorTest.java 9 Aug 2004 19:02:38 -0000 1.1
+++ OgnlProjectValueExtractorTest.java 12 Aug 2004 18:41:15 -0000 1.2
@@ -2,7 +2,7 @@
import org.apache.maven.MavenTestCase;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.lifecycle.MavenLifecycleContext;
+import org.apache.maven.lifecycle.MavenGoalExecutionContext;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
@@ -19,7 +19,7 @@
private MavenProjectBuilder builder;
- private MavenLifecycleContext context;
+ private MavenGoalExecutionContext context;
protected void setUp()
throws Exception
@@ -34,7 +34,7 @@
project.setProperty( "foo", "bar" );
- context = new MavenLifecycleContext( getContainer(), project, null, new ArtifactRepository( "foo", "http://bar" ) );
+ context = new MavenGoalExecutionContext( getContainer(), project, null, new ArtifactRepository( "foo", "http://bar" ) );
}
public void testPropertyValueExtraction()