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

o Fixed processing of parameter aliases 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778197 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-05-24 17:39:34 +00:00
parent 88fc18ab6f
commit c8151318c2
1 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,6 +54,7 @@ import org.apache.maven.plugin.PluginManager;
import org.apache.maven.plugin.PluginNotFoundException; import org.apache.maven.plugin.PluginNotFoundException;
import org.apache.maven.plugin.PluginResolutionException; import org.apache.maven.plugin.PluginResolutionException;
import org.apache.maven.plugin.descriptor.MojoDescriptor; import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.Parameter;
import org.apache.maven.plugin.descriptor.PluginDescriptor; import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProject;
import org.apache.maven.repository.RepositorySystem; import org.apache.maven.repository.RepositorySystem;
@ -471,16 +472,49 @@ public class DefaultLifecycleExecutor
*/ */
private Xpp3Dom extractMojoConfiguration( Xpp3Dom executionConfiguration, MojoDescriptor mojoDescriptor ) private Xpp3Dom extractMojoConfiguration( Xpp3Dom executionConfiguration, MojoDescriptor mojoDescriptor )
{ {
Xpp3Dom mojoConfiguration = new Xpp3Dom( executionConfiguration ); Xpp3Dom mojoConfiguration = new Xpp3Dom( executionConfiguration.getName() );
Collection<String> mojoParameters = mojoDescriptor.getParameterMap().keySet(); Collection<String> mojoParameters = mojoDescriptor.getParameterMap().keySet();
for ( int i = mojoConfiguration.getChildCount() - 1; i >= 0; i-- ) Map<String, String> aliases = new HashMap<String, String>();
if ( mojoDescriptor.getParameters() != null )
{ {
String mojoParameter = mojoConfiguration.getChild( i ).getName(); for ( Parameter parameter : mojoDescriptor.getParameters() )
if ( !mojoParameters.contains( mojoParameter ) )
{ {
mojoConfiguration.removeChild( i ); String alias = parameter.getAlias();
if ( StringUtils.isNotEmpty( alias ) )
{
aliases.put( alias, parameter.getName() );
}
}
}
for ( int i = 0; i < executionConfiguration.getChildCount(); i++ )
{
Xpp3Dom executionDom = executionConfiguration.getChild( i );
String paramName = executionDom.getName();
if ( mojoParameters.contains( paramName ) )
{
Xpp3Dom mojoDom = new Xpp3Dom( executionDom );
mojoConfiguration.addChild( mojoDom );
}
else if ( aliases.containsKey( paramName ) )
{
Xpp3Dom mojoDom = new Xpp3Dom( aliases.get( paramName ) );
mojoDom.setValue( executionDom.getValue() );
for ( String attributeName : executionDom.getAttributeNames() )
{
mojoDom.setAttribute( attributeName, executionDom.getAttribute( attributeName ) );
}
for ( Xpp3Dom child : executionDom.getChildren() )
{
mojoDom.addChild( new Xpp3Dom( child ) );
}
mojoConfiguration.addChild( mojoDom );
} }
} }