Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

o Filtered non-applicable parameters when converting from plugin execution to mojo execution 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@771298 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-05-04 13:16:45 +00:00
parent bdc2d8c7e3
commit 4ff21e67bd
1 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
View File

@ -349,9 +349,14 @@ public class DefaultLifecycleExecutor
{ {
for( String goal : e.getGoals() ) for( String goal : e.getGoals() )
{ {
if( mojoDescriptor.getGoal().equals( goal ) ) if ( mojoDescriptor.getGoal().equals( goal ) )
{ {
mojoExecution.setConfiguration( (Xpp3Dom) e.getConfiguration() ); Xpp3Dom executionConfiguration = (Xpp3Dom) e.getConfiguration();
Xpp3Dom mojoConfiguration =
extractMojoConfiguration( executionConfiguration, mojoDescriptor );
mojoExecution.setConfiguration( mojoConfiguration );
} }
} }
} }
@ -362,7 +367,36 @@ public class DefaultLifecycleExecutor
return lifecyclePlan; return lifecyclePlan;
} }
/**
* Extracts the configuration for a single mojo from the specified execution configuration by discarding any
* non-applicable parameters. This is necessary because a plugin execution can have multiple goals with different
* parametes whose default configurations are all aggregated into the execution configuration. However, the
* underlying configurator will error out when trying to configure a mojo parameter that is specified in the
* configuration but not present in the mojo instance.
*
* @param executionConfiguration The configuration from the plugin execution, must not be {@code null}.
* @param mojoDescriptor The descriptor for the mojo being configured, must not be {@code null}.
* @return The configuration for the mojo, never {@code null}.
*/
private Xpp3Dom extractMojoConfiguration( Xpp3Dom executionConfiguration, MojoDescriptor mojoDescriptor )
{
Xpp3Dom mojoConfiguration = new Xpp3Dom( executionConfiguration );
Collection<String> mojoParameters = mojoDescriptor.getParameterMap().keySet();
for ( int i = mojoConfiguration.getChildCount() - 1; i >= 0; i-- )
{
String mojoParameter = mojoConfiguration.getChild( i ).getName();
if ( !mojoParameters.contains( mojoParameter ) )
{
mojoConfiguration.removeChild( i );
}
}
return mojoConfiguration;
}
// org.apache.maven.plugins:maven-remote-resources-plugin:1.0:process // org.apache.maven.plugins:maven-remote-resources-plugin:1.0:process
MojoDescriptor getMojoDescriptor( String task, MavenProject project, ArtifactRepository localRepository ) MojoDescriptor getMojoDescriptor( String task, MavenProject project, ArtifactRepository localRepository )
//MojoDescriptor getMojoDescriptor( String groupId, String artifactId, String version, String goal, MavenProject project, ArtifactRepository localRepository ) //MojoDescriptor getMojoDescriptor( String groupId, String artifactId, String version, String goal, MavenProject project, ArtifactRepository localRepository )
@ -490,7 +524,7 @@ public class DefaultLifecycleExecutor
{ {
if ( lifecycle.getId().equals( "default" ) ) if ( lifecycle.getId().equals( "default" ) )
{ {
return (List<String>) lifecycle.getPhases(); return lifecycle.getPhases();
} }
} }