You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2009/04/01 01:13:13 UTC
svn commit: r760723 - in /maven/components/branches/MNG-2766/maven-core/src:
main/java/org/apache/maven/lifecycle/ main/java/org/apache/maven/plugin/
test/java/org/apache/maven/plugin/
Author: jvanzyl
Date: Tue Mar 31 23:13:12 2009
New Revision: 760723
URL: http://svn.apache.org/viewvc?rev=760723&view=rev
Log:
o change signature to have the session first
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=760723&r1=760722&r2=760723&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java Tue Mar 31 23:13:12 2009
@@ -194,7 +194,7 @@
try
{
- pluginManager.executeMojo( project, mojoExecution, session );
+ pluginManager.executeMojo( session, mojoExecution );
}
catch ( MojoFailureException e )
{
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=760723&r1=760722&r2=760723&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Tue Mar 31 23:13:12 2009
@@ -353,7 +353,7 @@
// We should assume that We've already loaded the plugin in question.
- public void executeMojo( MojoExecution mojoExecution, MavenSession session )
+ public void executeMojo( MavenSession session, MojoExecution mojoExecution )
throws MojoFailureException, PluginExecutionException, PluginConfigurationException
{
MavenProject project = session.getCurrentProject();
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java?rev=760723&r1=760722&r2=760723&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java Tue Mar 31 23:13:12 2009
@@ -39,6 +39,6 @@
MojoDescriptor getMojoDescriptor( Plugin plugin, String goal, MavenSession session )
throws PluginLoaderException;
- void executeMojo( MojoExecution execution, MavenSession session )
+ void executeMojo( MavenSession session, MojoExecution execution )
throws MojoFailureException, PluginExecutionException, PluginConfigurationException;
}
\ No newline at end of file
Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java?rev=760723&r1=760722&r2=760723&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java Tue Mar 31 23:13:12 2009
@@ -87,7 +87,7 @@
MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor( plugin, goal, session );
assertPluginDescriptor( mojoDescriptor, "org.apache.maven.plugins", "maven-remote-resources-plugin", "1.1" );
MojoExecution mojoExecution = new MojoExecution( mojoDescriptor );
- pluginManager.executeMojo( mojoExecution, session );
+ pluginManager.executeMojo( session, mojoExecution );
}
public void testSurefirePlugin()
@@ -104,7 +104,7 @@
MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor( plugin, goal, session );
assertPluginDescriptor( mojoDescriptor, "org.apache.maven.plugins", "maven-surefire-plugin", "2.4.2" );
MojoExecution mojoExecution = new MojoExecution( mojoDescriptor );
- pluginManager.executeMojo( mojoExecution, session );
+ pluginManager.executeMojo( session, mojoExecution );
}
// -----------------------------------------------------------------------------------------------