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:04:44 UTC
svn commit: r760719 - in /maven/components/branches/MNG-2766/maven-core/src:
main/java/org/apache/maven/ main/java/org/apache/maven/plugin/
test/java/org/apache/maven/plugin/
Author: jvanzyl
Date: Tue Mar 31 23:04:43 2009
New Revision: 760719
URL: http://svn.apache.org/viewvc?rev=760719&view=rev
Log:
o collapse signature of the executeMojo
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/Maven.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/MavenPluginDiscoverer.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/Maven.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/Maven.java?rev=760719&r1=760718&r2=760719&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/Maven.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/Maven.java Tue Mar 31 23:04:43 2009
@@ -27,7 +27,6 @@
/**
* @author Jason van Zyl
- * @version $Id$
*/
public interface Maven
{
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=760719&r1=760718&r2=760719&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:04:43 2009
@@ -353,9 +353,11 @@
// 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
{
+ MavenProject project = session.getCurrentProject();
+
MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();
if ( mojoDescriptor.isProjectRequired() && !session.isUsingPOMsFromFilesystem() )
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDiscoverer.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDiscoverer.java?rev=760719&r1=760718&r2=760719&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDiscoverer.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDiscoverer.java Tue Mar 31 23:04:43 2009
@@ -28,10 +28,11 @@
import java.io.Reader;
+//TODO: collapse this into the plugin manager
+
/**
* @author Jason van Zyl
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
- * @version $Id$
*/
@Component( role=ComponentDiscoverer.class)
public class MavenPluginDiscoverer
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=760719&r1=760718&r2=760719&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:04:43 2009
@@ -39,7 +39,6 @@
MojoDescriptor getMojoDescriptor( Plugin plugin, String goal, MavenSession session )
throws PluginLoaderException;
- //!!jvz The current project is contained in the session
- void executeMojo( MavenProject project, MojoExecution execution, MavenSession session )
+ void executeMojo( MojoExecution execution, MavenSession session )
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=760719&r1=760718&r2=760719&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:04:43 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( session.getCurrentProject(), mojoExecution, session );
+ pluginManager.executeMojo( mojoExecution, session );
}
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( session.getCurrentProject(), mojoExecution, session );
+ pluginManager.executeMojo( mojoExecution, session );
}
// -----------------------------------------------------------------------------------------------