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

o collapse signature of the executeMojo 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@760719 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2009-03-31 23:04:43 +00:00
parent 46c8c09a91
commit a8d2eee331
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
maven-core/src/main/java/org/apache/maven/Maven.java
View File

@ -27,7 +27,6 @@ import org.apache.maven.execution.ReactorManager;
/** /**
* @author Jason van Zyl * @author Jason van Zyl
* @version $Id$
*/ */
public interface Maven public interface Maven
{ {

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

@ -353,9 +353,11 @@ public class DefaultPluginManager
// We should assume that We've already loaded the plugin in question. // We should assume that We've already loaded the plugin in question.
public void executeMojo( MavenProject project, MojoExecution mojoExecution, MavenSession session ) public void executeMojo( MojoExecution mojoExecution, MavenSession session )
throws MojoFailureException, PluginExecutionException, PluginConfigurationException throws MojoFailureException, PluginExecutionException, PluginConfigurationException
{ {
MavenProject project = session.getCurrentProject();
MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor(); MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();
if ( mojoDescriptor.isProjectRequired() && !session.isUsingPOMsFromFilesystem() ) if ( mojoDescriptor.isProjectRequired() && !session.isUsingPOMsFromFilesystem() )

3
maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDiscoverer.java
View File

@ -28,10 +28,11 @@ import org.codehaus.plexus.configuration.PlexusConfigurationException;
import java.io.Reader; import java.io.Reader;
//TODO: collapse this into the plugin manager
/** /**
* @author Jason van Zyl * @author Jason van Zyl
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a> * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
* @version $Id$
*/ */
@Component( role=ComponentDiscoverer.class) @Component( role=ComponentDiscoverer.class)
public class MavenPluginDiscoverer public class MavenPluginDiscoverer

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

@ -39,7 +39,6 @@ public interface PluginManager
MojoDescriptor getMojoDescriptor( Plugin plugin, String goal, MavenSession session ) MojoDescriptor getMojoDescriptor( Plugin plugin, String goal, MavenSession session )
throws PluginLoaderException; throws PluginLoaderException;
//!!jvz The current project is contained in the session void executeMojo( MojoExecution execution, MavenSession session )
void executeMojo( MavenProject project, MojoExecution execution, MavenSession session )
throws MojoFailureException, PluginExecutionException, PluginConfigurationException; throws MojoFailureException, PluginExecutionException, PluginConfigurationException;
} }

4
maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
View File

@ -87,7 +87,7 @@ public class PluginManagerTest
MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor( plugin, goal, session ); MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor( plugin, goal, session );
assertPluginDescriptor( mojoDescriptor, "org.apache.maven.plugins", "maven-remote-resources-plugin", "1.1" ); assertPluginDescriptor( mojoDescriptor, "org.apache.maven.plugins", "maven-remote-resources-plugin", "1.1" );
MojoExecution mojoExecution = new MojoExecution( mojoDescriptor ); MojoExecution mojoExecution = new MojoExecution( mojoDescriptor );
pluginManager.executeMojo( session.getCurrentProject(), mojoExecution, session ); pluginManager.executeMojo( mojoExecution, session );
} }
public void testSurefirePlugin() public void testSurefirePlugin()
@ -104,7 +104,7 @@ public class PluginManagerTest
MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor( plugin, goal, session ); MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor( plugin, goal, session );
assertPluginDescriptor( mojoDescriptor, "org.apache.maven.plugins", "maven-surefire-plugin", "2.4.2" ); assertPluginDescriptor( mojoDescriptor, "org.apache.maven.plugins", "maven-surefire-plugin", "2.4.2" );
MojoExecution mojoExecution = new MojoExecution( mojoDescriptor ); MojoExecution mojoExecution = new MojoExecution( mojoDescriptor );
pluginManager.executeMojo( session.getCurrentProject(), mojoExecution, session ); pluginManager.executeMojo( mojoExecution, session );
} }
// ----------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------