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

remove old style req, resp mojo support 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168082 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-05-04 05:52:55 +00:00
parent 97550341d8
commit 118a53927d
1 changed files with 14 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
View File

@ -55,7 +55,6 @@ import org.codehaus.plexus.context.ContextException;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import org.codehaus.plexus.util.CollectionUtils;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.dag.CycleDetectedException;
import org.codehaus.plexus.util.xml.Xpp3Dom;
@ -320,8 +319,6 @@ public class DefaultPluginManager
public void executeMojo( MavenSession session, MojoDescriptor mojoDescriptor )
throws ArtifactResolutionException, PluginManagerException, MojoExecutionException
{
MojoExecutionRequest request = null;
if ( mojoDescriptor.getRequiresDependencyResolution() != null )
{
@ -364,14 +361,11 @@ public class DefaultPluginManager
plugin.setLog( session.getLog() );
// TODO: remove
boolean newMojoTechnique = checkMojoTechnique( plugin.getClass() );
String goalId = PluginDescriptor.getGoalIdFromFullGoal( goalName );
String goalId = mojoDescriptor.getGoal();
// TODO: can probable refactor these a little when only the new plugin technique is in place
Xpp3Dom dom = session.getProject().getGoalConfiguration( PluginDescriptor.getPluginArtifactIdFromGoal( goalName ),
goalId );
Xpp3Dom dom = session.getProject().getGoalConfiguration(
PluginDescriptor.getPluginArtifactIdFromGoal( goalName ), goalId );
PlexusConfiguration pomConfiguration;
if ( dom == null )
@ -398,23 +392,11 @@ public class DefaultPluginManager
try
{
if ( newMojoTechnique )
{
Map map = getPluginConfigurationFromExpressions( plugin, mojoDescriptor, mergedConfiguration,
getPluginConfigurationFromExpressions( plugin, mojoDescriptor, mergedConfiguration,
expressionEvaluator );
populatePluginFields( plugin, mojoDescriptor, mergedConfiguration, expressionEvaluator );
}
else
{
getLogger().warn( "WARNING: The mojo " + mojoDescriptor.getId() + " is using the OLD API" );
Map map = getPluginConfigurationFromExpressions( plugin, mojoDescriptor, mergedConfiguration,
expressionEvaluator );
request = createPluginRequest( pomConfiguration, map );
}
}
catch ( ExpressionEvaluationException e )
{
throw new MojoExecutionException( "Unable to configure plugin", e );
@ -427,15 +409,8 @@ public class DefaultPluginManager
dispatcher.dispatchStart( event, goalName );
try
{
if ( newMojoTechnique )
{
plugin.execute();
}
else
{
plugin.execute( request );
}
dispatcher.dispatchEnd( event, goalName );
}
@ -545,53 +520,10 @@ public class DefaultPluginManager
return dom;
}
/**
* @deprecated
*/
private static boolean checkMojoTechnique( Class aClass )
{
boolean newMojoTechnique = false;
try
{
aClass.getDeclaredMethod( "execute", new Class[0] );
newMojoTechnique = true;
}
catch ( NoSuchMethodException e )
{
// intentionally ignored
Class superclass = aClass.getSuperclass();
if ( superclass != AbstractMojo.class )
{
return checkMojoTechnique( superclass );
}
}
return newMojoTechnique;
}
// ----------------------------------------------------------------------
// Mojo Parameter Handling
// ----------------------------------------------------------------------
/**
* @param configuration
* @param map
* @return
* @deprecated
*/
private static MojoExecutionRequest createPluginRequest( PlexusConfiguration configuration, Map map )
{
Map parameters = new HashMap();
PlexusConfiguration[] children = configuration.getChildren();
for ( int i = 0; i < children.length; i++ )
{
PlexusConfiguration child = children[i];
parameters.put( child.getName(), child.getValue( null ) );
}
map = CollectionUtils.mergeMaps( map, parameters );
return new MojoExecutionRequest( map );
}
private void populatePluginFields( Mojo plugin, MojoDescriptor mojoDescriptor, PlexusConfiguration configuration,
ExpressionEvaluator expressionEvaluator )
throws PluginConfigurationException
@ -621,8 +553,7 @@ public class DefaultPluginManager
catch ( ComponentLookupException e )
{
throw new PluginConfigurationException(
"Unable to retrieve component configurator for plugin configuration",
e );
"Unable to retrieve component configurator for plugin configuration", e );
}
finally
{
@ -663,15 +594,13 @@ public class DefaultPluginManager
/**
* @deprecated [JC] in favor of what?
*/
private Map getPluginConfigurationFromExpressions( Mojo plugin, MojoDescriptor goal,
private void getPluginConfigurationFromExpressions( Mojo plugin, MojoDescriptor goal,
PlexusConfiguration mergedConfiguration,
ExpressionEvaluator expressionEvaluator )
throws ExpressionEvaluationException, PluginConfigurationException
{
List parameters = goal.getParameters();
Map map = new HashMap();
for ( int i = 0; i < parameters.size(); i++ )
{
Parameter parameter = (Parameter) parameters.get( i );
@ -785,9 +714,7 @@ public class DefaultPluginManager
createPluginParameterRequiredMessage( goal, parameter, expression ) );
}
map.put( key, value );
}
return map;
}
public static String createPluginParameterRequiredMessage( MojoDescriptor mojo, Parameter parameter,
@ -821,7 +748,8 @@ public class DefaultPluginManager
artifactFilter = new ExclusionSetFilter( new String[]{"maven-core", "maven-artifact", "maven-model",
"maven-settings", "maven-monitor", "maven-plugin-api",
"maven-plugin-descriptor", "plexus-container-default",
"maven-project", "plexus-container-artifact", "maven-reporting-api", "doxia-core",
"maven-project", "plexus-container-artifact",
"maven-reporting-api", "doxia-core",
"wagon-provider-api", "classworlds", "maven-plugin",
"plexus-marmalade-factory", "maven-script-marmalade",
"marmalade-core"} );