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

o reduce the foot print of the plugin manager, the interaction between the lifecycle executor and plugin manager is far too intimate 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@751459 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2009-03-08 16:25:35 +00:00
parent 29a95ef261
commit 3ef5e97f42
4 changed files with 2 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1654,45 +1654,6 @@ public class DefaultPluginManager
return plugin; return plugin;
} }
// Plugin Context
public Collection<MojoExecution> getMojoExecutionsForGoal( String goal )
throws Exception
{
List<MojoExecution> mojoExecutions = new ArrayList<MojoExecution>();
for ( PluginDescriptor descriptor : pluginCollector.getPluginDescriptors() )
{
MojoDescriptor mojoDescriptor = descriptor.getMojo( goal );
if ( mojoDescriptor != null )
{
MojoExecution mojoExecution = new MojoExecution( mojoDescriptor );
mojoExecution.setConfiguration( Xpp3DomBuilder.build( new StringReader( mojoDescriptor.getMojoConfiguration().toString() ) ) );
mojoExecutions.add( mojoExecution );
}
}
return mojoExecutions;
}
public Object getMojoParameterFor( MojoExecution mojoExecution, String xPath )
throws Exception
{
Xpp3Dom mojoDescriptorConfiguration = Xpp3DomBuilder.build( new StringReader( mojoExecution.getMojoDescriptor().getMojoConfiguration().toString() ) );
Xpp3Dom mergedConfig = Xpp3Dom.mergeXpp3Dom( mojoExecution.getConfiguration(), mojoDescriptorConfiguration );
return JXPathContext.newContext( mergedConfig ).getValue( xPath );
}
public void executeMojo( MojoExecution mojoExecution, MavenSession session )
throws Exception
{
executeMojo( session.getCurrentProject(), mojoExecution, session );
}
// Version Manager
public String resolvePluginVersion( String groupId, String artifactId, MavenProject project, MavenSession session ) public String resolvePluginVersion( String groupId, String artifactId, MavenProject project, MavenSession session )
throws PluginVersionResolutionException, InvalidPluginException, PluginVersionNotFoundException throws PluginVersionResolutionException, InvalidPluginException, PluginVersionNotFoundException
{ {

9
maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
View File

@ -44,15 +44,6 @@ public interface PluginManager
Plugin findPluginForPrefix( String prefix, MavenProject project, MavenSession session ) Plugin findPluginForPrefix( String prefix, MavenProject project, MavenSession session )
throws PluginLoaderException; throws PluginLoaderException;
Collection<MojoExecution> getMojoExecutionsForGoal( String goal )
throws Exception;
Object getMojoParameterFor( MojoExecution mojoExecution, String xPath )
throws Exception;
void executeMojo( MojoExecution mojoExecution, MavenSession session )
throws Exception;
PluginDescriptor loadPlugin( Plugin plugin, MavenProject project, MavenSession session ) PluginDescriptor loadPlugin( Plugin plugin, MavenProject project, MavenSession session )
throws PluginLoaderException; throws PluginLoaderException;

18
maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
View File

@ -169,24 +169,6 @@ public class MavenEmbedder
return request; return request;
} }
public Collection<MojoExecution> getMojoExecutionsForGoal(String goal)
throws Exception
{
return pluginManager.getMojoExecutionsForGoal( goal );
}
public Object getMojoParameterFor(MojoExecution mojoExecution, String xPath)
throws Exception
{
return pluginManager.getMojoParameterFor( mojoExecution, xPath);
}
public void executeMojo(MojoExecution mojoExecution, MavenSession mavenSession )
throws Exception
{
pluginManager.executeMojo( mojoExecution, mavenSession );
}
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
// Accessors // Accessors
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------

2
maven-repository-mercury/src/test/java/org/apache/maven/repository/mercury/MercuryRepositorySystemTest.java
View File

@ -40,3 +40,5 @@ public class MercuryRepositorySystemTest
_mrs = getContainer().lookup( RepositorySystem.class, "mercury" ); _mrs = getContainer().lookup( RepositorySystem.class, "mercury" );
} }
} }