Author: jvanzyl
Date: Wed May 20 13:23:56 2009
New Revision: 776690
URL: http://svn.apache.org/viewvc?rev=776690&view=rev
Log:
o have the build plan take into consideration multiple tasks, so the
calculation of the build plan can take in any number lifecycle phases, or
individual goals and you will get the fully fleshed out configurations
o one thing that's apparent is that it is not possible to only collect the
metadata about the plugins that will execute. if the plugin.xml files were
actually available in the repository outside of the plugin's JAR then the
calculation could be made without having to crack open the JAR. i can't have a
real plan per se when i have to grab the plugin JAR anywhere to open it and get
the metadata. ideally someone should be able to see the build plan and optimize
it and if plugins were removed they those will never have a requirement of
being downloaded. Deploying the plugin metadata along side the plugin as an
attached artifact or indexing the information and made available for querying
would be very useful.
o now that the build plan is calculated and the project dependencies
downloading has been decoupled from the plugin manager i can make a proper
analysis of all he dependencies for all the project and start making optimized
requests for downloading
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=776690&r1=776689&r2=776690&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Wed May 20 13:23:56 2009
@@ -116,12 +116,17 @@
public void execute( MavenSession session )
{
+ // TODO: Use a listener here instead of loggers
+
logger.info( "Build Order:" );
+
logger.info( "" );
+
for( MavenProject project : session.getProjects() )
{
logger.info( project.getName() );
}
+
logger.info( "" );
MavenProject rootProject = session.getTopLevelProject();
@@ -146,238 +151,239 @@
{
session.setCurrentProject( currentProject );
- for ( String goal : goals )
- {
- List<MojoExecution> lifecyclePlan;
-
- try
+ List<MojoExecution> lifecyclePlan;
+
+ try
+ {
+ lifecyclePlan = calculateBuildPlan( session,
goals.toArray( new String[] {} ) );
+ }
+ catch ( Exception e )
+ {
+ session.getResult().addException( e );
+ return;
+ }
+
+ //TODO: once we have calculated the build plan then we should
accurately be able to download
+ // the project dependencies. Having it happen in the plugin
manager is a tangled mess. We can optimize this
+ // later by looking at the build plan. Would be better to just
batch download everything required by the reactor.
+
+ // mojoDescriptor.isDependencyResolutionRequired() is actually
the scope of the dependency resolution required, not a boolean ... yah.
+ try
+ {
+ downloadProjectDependencies( session, Artifact.SCOPE_TEST
/** mojoDescriptor.isDependencyResolutionRequired()*/ );
+ }
+ catch ( ArtifactNotFoundException e )
+ {
+ session.getResult().addException( e );
+ return;
+ }
+ catch ( ArtifactResolutionException e )
+ {
+ session.getResult().addException( e );
+ return;
+ }
+
+ if ( logger.isDebugEnabled() )
+ {
+ logger.debug( "=== BUILD PLAN ===" );
+ logger.debug( "Project: " + currentProject );
+ for ( MojoExecution mojoExecution : lifecyclePlan )
{
- lifecyclePlan = calculateBuildPlan( goal, session );
+ MojoDescriptor mojoDescriptor =
mojoExecution.getMojoDescriptor();
+ PluginDescriptor pluginDescriptor =
mojoDescriptor.getPluginDescriptor();
+ logger.debug( "------------------" );
+ logger.debug( "Goal: " +
pluginDescriptor.getGroupId() + ':' + pluginDescriptor.getArtifactId() + ':' +
pluginDescriptor.getVersion() + ':' + mojoDescriptor.getGoal()
+ + ':' + mojoExecution.getExecutionId() );
+ logger.debug( "Configuration: " + String.valueOf(
mojoExecution.getConfiguration() ) );
}
- catch ( Exception e )
- {
- session.getResult().addException( e );
- return;
- }
+ logger.debug( "==================" );
+ }
- //TODO: once we have calculated the build plan then we
should accurately be able to download
- // the project dependencies. Having it happen in the
plugin manager is a tangled mess. We can optimize this
- // later by looking at the build plan. Would be better to
just batch download everything required by the reactor.
-
- // mojoDescriptor.isDependencyResolutionRequired() is
actually the scope of the dependency resolution required, not a boolean ... yah.
+ for ( MojoExecution mojoExecution : lifecyclePlan )
+ {
try
{
- downloadProjectDependencies( session,
Artifact.SCOPE_TEST /**mojoDescriptor.isDependencyResolutionRequired()*/ );
- }
- catch ( ArtifactNotFoundException e )
- {
- session.getResult().addException( e );
- return;
+ logger.info( executionDescription( mojoExecution,
currentProject ) );
+ pluginManager.executeMojo( session, mojoExecution );
}
- catch ( ArtifactResolutionException e )
+ catch ( Exception e )
{
session.getResult().addException( e );
return;
}
-
- if ( logger.isDebugEnabled() )
- {
- logger.debug( "=== BUILD PLAN ===" );
- logger.debug( "Project: " + currentProject );
- for ( MojoExecution mojoExecution : lifecyclePlan )
- {
- MojoDescriptor mojoDescriptor =
mojoExecution.getMojoDescriptor();
- PluginDescriptor pluginDescriptor =
mojoDescriptor.getPluginDescriptor();
- logger.debug( "------------------" );
- logger.debug( "Goal: " +
pluginDescriptor.getGroupId() + ':' + pluginDescriptor.getArtifactId() + ':'
- + pluginDescriptor.getVersion() + ':' +
mojoDescriptor.getGoal() + ':'
- + mojoExecution.getExecutionId() );
- logger.debug( "Configuration: " + String.valueOf(
mojoExecution.getConfiguration() ) );
- }
- logger.debug( "==================" );
- }
-
- for ( MojoExecution mojoExecution : lifecyclePlan )
- {
- try
- {
- logger.info( executionDescription( mojoExecution,
currentProject ) );
- pluginManager.executeMojo( session, mojoExecution
);
- }
- catch ( Exception e )
- {
- session.getResult().addException( e );
- return;
- }
- }
- }
+ }
+
}
finally
{
session.setCurrentProject( null );
}
}
- }
-
- private String executionDescription( MojoExecution me, MavenProject
project )
- {
- PluginDescriptor pd = me.getMojoDescriptor().getPluginDescriptor();
- StringBuffer sb = new StringBuffer();
- sb.append( "Executing " + pd.getArtifactId() + "[" + pd.getVersion() +
"]: " + me.getMojoDescriptor().getGoal() + " on " + project.getArtifactId() );
- return sb.toString();
- }
+ }
// 1. Find the lifecycle given the phase (default lifecycle when given
install)
// 2. Find the lifecycle mapping that corresponds to the project packaging
(jar lifecycle mapping given the jar packaging)
// 3. Find the mojos associated with the lifecycle given the project
packaging (jar lifecycle mapping for the default lifecycle)
// 4. Bind those mojos found in the lifecycle mapping for the packaging to
the lifecycle
// 5. Bind mojos specified in the project itself to the lifecycle
- public List<MojoExecution> calculateBuildPlan( String task, MavenSession
session )
+ public List<MojoExecution> calculateBuildPlan( MavenSession session,
String... tasks )
throws PluginNotFoundException, PluginResolutionException,
PluginDescriptorParsingException, CycleDetectedInPluginGraphException,
MojoNotFoundException, NoPluginFoundForPrefixException
{
MavenProject project = session.getCurrentProject();
-
+
List<String> phasesWithMojosToExecute = new ArrayList<String>();
List<MojoExecution> lifecyclePlan = new ArrayList<MojoExecution>();
- if ( task.indexOf( ":" ) > 0 )
- {
- MojoDescriptor mojoDescriptor = getMojoDescriptor( task, session );
-
- MojoExecution mojoExecution = getMojoExecution( project,
mojoDescriptor );
-
- lifecyclePlan.add( mojoExecution );
- }
- else
+ for ( String task : tasks )
{
- // 1.
- //
- // Based on the lifecycle phase we are given, let's find the
corresponding lifecycle.
- //
- Lifecycle lifecycle = phaseToLifecycleMap.get( task );
+ if ( task.indexOf( ":" ) > 0 )
+ {
+ MojoDescriptor mojoDescriptor = getMojoDescriptor( task,
session );
- // 2.
- //
- // If we are dealing with the "clean" or "site" lifecycle then
there are currently no lifecycle mappings but there are default phases
- // that need to be run instead.
- //
- // Now we need to take into account the packaging type of the
project. For a project of type WAR, the lifecycle where mojos are mapped
- // on to the given phases in the lifecycle are going to be a
little different then, say, a project of type JAR.
- //
+ MojoExecution mojoExecution = getMojoExecution( project,
mojoDescriptor );
- // 3.
- //
- // Once we have the lifecycle mapping for the given packaging, we
need to know whats phases we need to worry about executing.
- //
+ lifecyclePlan.add( mojoExecution );
+ }
+ else
+ {
+ // 1.
+ //
+ // Based on the lifecycle phase we are given, let's find the
corresponding lifecycle.
+ //
+ Lifecycle lifecycle = phaseToLifecycleMap.get( task );
- // Create an ordered Map of the phases in the lifecycle to a list
of mojos to execute.
- Map<String, List<String>> phaseToMojoMapping = new
LinkedHashMap<String, List<String>>();
+ // 2.
+ //
+ // If we are dealing with the "clean" or "site" lifecycle then
there are currently no lifecycle mappings but there are default phases
+ // that need to be run instead.
+ //
+ // Now we need to take into account the packaging type of the
project. For a project of type WAR, the lifecycle where mojos are mapped
+ // on to the given phases in the lifecycle are going to be a
little different then, say, a project of type JAR.
+ //
- // 4.
+ // 3.
+ //
+ // Once we have the lifecycle mapping for the given packaging,
we need to know whats phases we need to worry about executing.
+ //
- //TODO: need to separate the lifecycles
+ // Create an ordered Map of the phases in the lifecycle to a
list of mojos to execute.
+ Map<String, List<String>> phaseToMojoMapping = new
LinkedHashMap<String, List<String>>();
- for ( String phase : lifecycle.getPhases() )
- {
- List<String> mojos = new ArrayList<String>();
-
- if ( phase.equals( "clean" ) )
+ // 4.
+
+ //TODO: need to separate the lifecycles
+
+ for ( String phase : lifecycle.getPhases() )
{
- mojos.add(
"org.apache.maven.plugins:maven-clean-plugin:clean" );
- }
-
- // This is just just laying out the initial structure of the
mojos to run in each phase of the
- // lifecycle. Everything is now done in the project builder
correctly so this could likely
- // go away shortly. We no longer need to pull out bits from
the default lifecycle. The MavenProject
- // comes to us intact as it should.
+ List<String> mojos = new ArrayList<String>();
- phaseToMojoMapping.put( phase, mojos );
- }
+ if ( phase.equals( "clean" ) )
+ {
+ mojos.add(
"org.apache.maven.plugins:maven-clean-plugin:clean" );
+ }
- // 5. Just build up the list of mojos that will execute for every
phase.
- //
- // This will be useful for having the complete build plan and then
we can filter/optimize later.
- //
- for ( Plugin plugin : project.getBuild().getPlugins() )
- {
- for ( PluginExecution execution : plugin.getExecutions() )
+ // This is just just laying out the initial structure of
the mojos to run in each phase of the
+ // lifecycle. Everything is now done in the project
builder correctly so this could likely
+ // go away shortly. We no longer need to pull out bits
from the default lifecycle. The MavenProject
+ // comes to us intact as it should.
+
+ phaseToMojoMapping.put( phase, mojos );
+ }
+
+ // 5. Just build up the list of mojos that will execute for
every phase.
+ //
+ // This will be useful for having the complete build plan and
then we can filter/optimize later.
+ //
+ for ( Plugin plugin : project.getBuild().getPlugins() )
{
- // if the phase is specified then I don't have to go fetch
the plugin yet and pull it down
- // to examine the phase it is associated to.
- if ( execution.getPhase() != null )
+ for ( PluginExecution execution : plugin.getExecutions() )
{
- for ( String goal : execution.getGoals() )
+ // if the phase is specified then I don't have to go
fetch the plugin yet and pull it down
+ // to examine the phase it is associated to.
+ if ( execution.getPhase() != null )
{
- String s = plugin.getGroupId() + ":" +
plugin.getArtifactId() + ":" + plugin.getVersion() + ":" + goal;
-
- if ( phaseToMojoMapping.get( execution.getPhase()
) == null )
+ for ( String goal : execution.getGoals() )
{
- // This is happening because executions in the
POM are getting mixed into the clean lifecycle
- // So for the lifecycle mapping we need a map
with the phases as keys so we can easily check
- // if this phase belongs to the given
lifecycle. this shows the system is messed up. this
- // shouldn't happen.
- phaseToMojoMapping.put( execution.getPhase(),
new ArrayList<String>() );
- }
+ String s = plugin.getGroupId() + ":" +
plugin.getArtifactId() + ":" + plugin.getVersion() + ":" + goal;
+
+ if ( phaseToMojoMapping.get(
execution.getPhase() ) == null )
+ {
+ // This is happening because executions in
the POM are getting mixed into the clean lifecycle
+ // So for the lifecycle mapping we need a
map with the phases as keys so we can easily check
+ // if this phase belongs to the given
lifecycle. this shows the system is messed up. this
+ // shouldn't happen.
+ phaseToMojoMapping.put(
execution.getPhase(), new ArrayList<String>() );
+ }
- phaseToMojoMapping.get( execution.getPhase()
).add( s );
+ phaseToMojoMapping.get( execution.getPhase()
).add( s );
+ }
}
- }
- // if not then i need to grab the mojo descriptor and look
at the phase that is specified
- else
- {
- for ( String goal : execution.getGoals() )
+ // if not then i need to grab the mojo descriptor and
look at the phase that is specified
+ else
{
- String s = plugin.getGroupId() + ":" +
plugin.getArtifactId() + ":" + plugin.getVersion() + ":" + goal;
- MojoDescriptor mojoDescriptor =
pluginManager.getMojoDescriptor( plugin, goal, session.getLocalRepository(),
project.getRemoteArtifactRepositories() );
-
- if ( mojoDescriptor.getPhase() != null &&
phaseToMojoMapping.get( mojoDescriptor.getPhase() ) != null )
+ for ( String goal : execution.getGoals() )
{
- phaseToMojoMapping.get(
mojoDescriptor.getPhase() ).add( s );
+ String s = plugin.getGroupId() + ":" +
plugin.getArtifactId() + ":" + plugin.getVersion() + ":" + goal;
+ MojoDescriptor mojoDescriptor =
pluginManager.getMojoDescriptor( plugin, goal, session.getLocalRepository(),
project.getRemoteArtifactRepositories() );
+
+ if ( mojoDescriptor.getPhase() != null &&
phaseToMojoMapping.get( mojoDescriptor.getPhase() ) != null )
+ {
+ phaseToMojoMapping.get(
mojoDescriptor.getPhase() ).add( s );
+ }
}
}
}
}
- }
-
- // 6.
- //
- // We are only interested in the phases that correspond to the
lifecycle we are trying to run. If we are running the "clean"
- // lifecycle we are not interested in goals -- like
"generate-sources -- that belong to the default lifecycle.
- //
- for ( String phase : phaseToMojoMapping.keySet() )
- {
- phasesWithMojosToExecute.addAll( phaseToMojoMapping.get( phase
) );
+ // 6.
+ //
+ // We are only interested in the phases that correspond to the
lifecycle we are trying to run. If we are running the "clean"
+ // lifecycle we are not interested in goals -- like
"generate-sources -- that belong to the default lifecycle.
+ //
- if ( phase.equals( task ) )
+ for ( String phase : phaseToMojoMapping.keySet() )
{
- break;
+ phasesWithMojosToExecute.addAll( phaseToMojoMapping.get(
phase ) );
+
+ if ( phase.equals( task ) )
+ {
+ break;
+ }
}
+
}
-
- // 7. Now we create the correct configuration for the mojo to
execute.
- //TODO: this needs to go to the model builder.
+ }
+
+ // 7. Now we create the correct configuration for the mojo to execute.
+ //TODO: this needs to go to the model builder.
- for ( String mojo : phasesWithMojosToExecute )
- {
- // These are bits that look like this:
- //
- //
org.apache.maven.plugins:maven-remote-resources-plugin:1.0:process
- //
+ for ( String mojo : phasesWithMojosToExecute )
+ {
+ // These are bits that look like this:
+ //
+ //
org.apache.maven.plugins:maven-remote-resources-plugin:1.0:process
+ //
- MojoDescriptor mojoDescriptor = getMojoDescriptor( mojo,
session );
+ MojoDescriptor mojoDescriptor = getMojoDescriptor( mojo, session );
- MojoExecution mojoExecution = getMojoExecution( project,
mojoDescriptor );
-
- lifecyclePlan.add( mojoExecution );
- }
- }
-
+ MojoExecution mojoExecution = getMojoExecution( project,
mojoDescriptor );
+
+ lifecyclePlan.add( mojoExecution );
+ }
+
return lifecyclePlan;
}
+ private String executionDescription( MojoExecution me, MavenProject
project )
+ {
+ PluginDescriptor pd = me.getMojoDescriptor().getPluginDescriptor();
+ StringBuffer sb = new StringBuffer();
+ sb.append( "Executing " + pd.getArtifactId() + "[" + pd.getVersion() +
"]: " + me.getMojoDescriptor().getGoal() + " on " + project.getArtifactId() );
+ return sb.toString();
+ }
+
private MojoExecution getMojoExecution( MavenProject project,
MojoDescriptor mojoDescriptor )
{
MojoExecution mojoExecution = new MojoExecution( mojoDescriptor );
@@ -742,63 +748,13 @@
return dom;
}
-
- // assign all values
- // validate everything is fine
- private Xpp3Dom processConfiguration( MavenSession session, MojoExecution
mojoExecution )
- {
- ExpressionEvaluator expressionEvaluator = new
PluginParameterExpressionEvaluator( session, mojoExecution );
-
- MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();
-
- Map<String,Parameter> parameters = mojoDescriptor.getParameterMap();
-
- Xpp3Dom configuration = mojoExecution.getConfiguration();
-
- for( Xpp3Dom c : configuration.getChildren() )
- {
- String configurationName = c.getName();
-
- Parameter parameter = parameters.get( configurationName );
-
- // Read-only
-
- if ( !parameter.isEditable() )
- {
-
- }
-
- try
- {
- Object value = expressionEvaluator.evaluate( c.getValue() );
- if ( value == null )
- {
- String e = c.getAttribute( "default-value" );
- if ( e != null )
- {
- value = expressionEvaluator.evaluate( e );
- }
- }
-
- if ( value instanceof String || value instanceof File )
- c.setValue( value.toString() );
- }
- catch ( ExpressionEvaluationException e )
- {
- // do nothing
- }
- }
-
- return mojoExecution.getConfiguration();
- }
-
+
private void downloadProjectDependencies( MavenSession session, String
scope )
throws ArtifactResolutionException, ArtifactNotFoundException
{
MavenProject project = session.getCurrentProject();
- Artifact artifact =
- repositorySystem.createProjectArtifact( project.getGroupId(),
project.getArtifactId(), project.getVersion() );
+ Artifact artifact = repositorySystem.createProjectArtifact(
project.getGroupId(), project.getArtifactId(), project.getVersion() );
artifact.setFile( project.getFile() );
ArtifactFilter filter = new ScopeArtifactFilter( scope );
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java?rev=776690&r1=776689&r2=776690&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
Wed May 20 13:23:56 2009
@@ -43,7 +43,7 @@
public interface LifecycleExecutor
{
List<String> getLifecyclePhases();
-
+
/**
* Calculate the list of {...@link
org.apache.maven.plugin.descriptor.MojoDescriptor} objects to run for the
selected lifecycle phase.
*
@@ -52,7 +52,7 @@
* @return
* @throws LifecycleExecutionException
*/
- List<MojoExecution> calculateBuildPlan( String lifecyclePhase,
MavenSession session )
+ List<MojoExecution> calculateBuildPlan( MavenSession session, String...
tasks )
throws PluginNotFoundException, PluginResolutionException,
PluginDescriptorParsingException, CycleDetectedInPluginGraphException,
MojoNotFoundException, NoPluginFoundForPrefixException;
// For a given project packaging find all the plugins that are bound to
any registered
Modified:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java?rev=776690&r1=776689&r2=776690&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
Wed May 20 13:23:56 2009
@@ -62,7 +62,7 @@
MavenSession session = createMavenSession( pom );
assertEquals( "project-with-additional-lifecycle-elements",
session.getCurrentProject().getArtifactId() );
assertEquals( "1.0", session.getCurrentProject().getVersion() );
- List<MojoExecution> lifecyclePlan =
lifecycleExecutor.calculateBuildPlan( "resources:resources", session );
+ List<MojoExecution> lifecyclePlan =
lifecycleExecutor.calculateBuildPlan( session, "resources:resources" );
assertEquals( 1, lifecyclePlan.size() );
MojoExecution mojoExecution = lifecyclePlan.get( 0 );
assertNotNull( mojoExecution );
@@ -80,7 +80,7 @@
MavenSession session = createMavenSession( pom );
assertEquals( "project-with-additional-lifecycle-elements",
session.getCurrentProject().getArtifactId() );
assertEquals( "1.0", session.getCurrentProject().getVersion() );
- List<MojoExecution> lifecyclePlan =
lifecycleExecutor.calculateBuildPlan( "clean", session );
+ List<MojoExecution> lifecyclePlan =
lifecycleExecutor.calculateBuildPlan( session, "clean" );
assertEquals( 1, lifecyclePlan.size() );
MojoExecution mojoExecution = lifecyclePlan.get( 0 );
assertNotNull( mojoExecution );
@@ -89,6 +89,42 @@
assertEquals( "2.2",
mojoExecution.getMojoDescriptor().getPluginDescriptor().getVersion() );
}
+ // We need to take in multiple lifecycles
+ public void
testCalculationOfBuildPlanTasksOfTheCleanLifecycleAndTheInstallLifecycle()
+ throws Exception
+ {
+ File pom = getProject( "project-with-additional-lifecycle-elements" );
+ MavenSession session = createMavenSession( pom );
+ assertEquals( "project-with-additional-lifecycle-elements",
session.getCurrentProject().getArtifactId() );
+ assertEquals( "1.0", session.getCurrentProject().getVersion() );
+ List<MojoExecution> lifecyclePlan =
lifecycleExecutor.calculateBuildPlan( session, "clean", "install" );
+
+ //[01] clean:clean
+ //[02] resources:resources
+ //[03] compiler:compile
+ //[04] plexus-component-metadata:generate-metadata
+ //[05] resources:testResources
+ //[06] compiler:testCompile
+ //[07] plexus-component-metadata:generate-test-metadata
+ //[08] surefire:test
+ //[09] jar:jar
+ //[10] install:install
+ //
+ assertEquals( 10, lifecyclePlan.size() );
+
+ assertEquals( "clean:clean", lifecyclePlan.get( 0
).getMojoDescriptor().getFullGoalName() );
+ assertEquals( "resources:resources", lifecyclePlan.get( 1
).getMojoDescriptor().getFullGoalName() );
+ assertEquals( "compiler:compile", lifecyclePlan.get( 2
).getMojoDescriptor().getFullGoalName() );
+ assertEquals( "plexus-component-metadata:generate-metadata",
lifecyclePlan.get( 3 ).getMojoDescriptor().getFullGoalName() );
+ assertEquals( "resources:testResources", lifecyclePlan.get( 4
).getMojoDescriptor().getFullGoalName() );
+ assertEquals( "compiler:testCompile", lifecyclePlan.get( 5
).getMojoDescriptor().getFullGoalName() );
+ assertEquals( "plexus-component-metadata:generate-test-metadata",
lifecyclePlan.get( 6 ).getMojoDescriptor().getFullGoalName() );
+ assertEquals( "surefire:test", lifecyclePlan.get( 7
).getMojoDescriptor().getFullGoalName() );
+ assertEquals( "jar:jar", lifecyclePlan.get( 8
).getMojoDescriptor().getFullGoalName() );
+ assertEquals( "install:install", lifecyclePlan.get( 9
).getMojoDescriptor().getFullGoalName() );
+ }
+
+
public void
testCalculationOfBuildPlanWithIndividualTaskOfTheCleanCleanGoal()
throws Exception
{
@@ -98,7 +134,7 @@
MavenSession session = createMavenSession( pom );
assertEquals( "project-with-additional-lifecycle-elements",
session.getCurrentProject().getArtifactId() );
assertEquals( "1.0", session.getCurrentProject().getVersion() );
- List<MojoExecution> lifecyclePlan =
lifecycleExecutor.calculateBuildPlan( "clean:clean", session );
+ List<MojoExecution> lifecyclePlan =
lifecycleExecutor.calculateBuildPlan( session, "clean:clean" );
assertEquals( 1, lifecyclePlan.size() );
MojoExecution mojoExecution = lifecyclePlan.get( 0 );
assertNotNull( mojoExecution );
@@ -114,16 +150,18 @@
MavenSession session = createMavenSession( pom );
assertEquals( "project-with-additional-lifecycle-elements",
session.getCurrentProject().getArtifactId() );
assertEquals( "1.0", session.getCurrentProject().getVersion() );
- List<MojoExecution> lifecyclePlan =
lifecycleExecutor.calculateBuildPlan( "package", session );
+ List<MojoExecution> lifecyclePlan =
lifecycleExecutor.calculateBuildPlan( session, "package" );
- // resources:resources
- // compiler:compile
- // plexus-component-metadata:generate-metadata
- // resources:testResources
- // compiler:testCompile
- // plexus-component-metadata:generate-test-metadata
- // surefire:test
- // jar:jar
+ //[01] resources:resources
+ //[02] compiler:compile
+ //[03] plexus-component-metadata:generate-metadata
+ //[04] resources:testResources
+ //[05] compiler:testCompile
+ //[06] plexus-component-metadata:generate-test-metadata
+ //[07] surefire:test
+ //[08] jar:jar
+ //
+ assertEquals( 8, lifecyclePlan.size() );
assertEquals( "resources:resources", lifecyclePlan.get( 0
).getMojoDescriptor().getFullGoalName() );
assertEquals( "compiler:compile", lifecyclePlan.get( 1
).getMojoDescriptor().getFullGoalName() );
Modified:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java?rev=776690&r1=776689&r2=776690&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java
Wed May 20 13:23:56 2009
@@ -49,7 +49,7 @@
implements LifecycleExecutor
{
- public List<MojoExecution> calculateBuildPlan( String lifecyclePhase,
MavenSession session )
+ public List<MojoExecution> calculateBuildPlan( MavenSession session,
String... tasks )
throws PluginNotFoundException, PluginResolutionException,
PluginDescriptorParsingException, CycleDetectedInPluginGraphException,
MojoNotFoundException
{
return Collections.emptyList();
