jvanzyl 2004/02/12 11:28:53
Modified: maven-core/src/java/org/apache/maven/plugin
AbstractPluginManager.java Plugin.java
maven-core/src/java/org/apache/maven/plugin/plexus
PlexusPluginManager.java
Log:
o Plugins execution needs to be parameterizable
Revision Changes Path
1.2 +1 -12
maven-components/maven-core/src/java/org/apache/maven/plugin/AbstractPluginManager.java
Index: AbstractPluginManager.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/java/org/apache/maven/plugin/AbstractPluginManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractPluginManager.java 6 Feb 2004 23:27:43 -0000 1.1
+++ AbstractPluginManager.java 12 Feb 2004 19:28:53 -0000 1.2
@@ -173,17 +173,6 @@
}
}
- protected void loadPlugins( String names, MavenProject project )
- throws Exception
- {
- StringTokenizer tokens = new StringTokenizer( names, "," );
-
- while ( tokens.hasMoreTokens() )
- {
- loadPlugin( tokens.nextToken() );
- }
- }
-
protected File getPluginProcessedMarker( String pluginName )
{
return new File( new File( unpackedPluginsDir, pluginName ), ".processed" );
1.2 +4 -2
maven-components/maven-core/src/java/org/apache/maven/plugin/Plugin.java
Index: Plugin.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/java/org/apache/maven/plugin/Plugin.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Plugin.java 6 Feb 2004 23:27:43 -0000 1.1
+++ Plugin.java 12 Feb 2004 19:28:53 -0000 1.2
@@ -2,6 +2,8 @@
import org.apache.maven.project.MavenProject;
+import java.util.Map;
+
/**
*
*
@@ -11,6 +13,6 @@
*/
public interface Plugin
{
- void execute( MavenProject project )
+ void execute( MavenProject project, Map parameters )
throws Exception;
}
1.3 +10 -7
maven-components/maven-core/src/java/org/apache/maven/plugin/plexus/PlexusPluginManager.java
Index: PlexusPluginManager.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/java/org/apache/maven/plugin/plexus/PlexusPluginManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PlexusPluginManager.java 12 Feb 2004 01:59:00 -0000 1.2
+++ PlexusPluginManager.java 12 Feb 2004 19:28:53 -0000 1.3
@@ -5,9 +5,8 @@
import org.apache.maven.plugin.Plugin;
import org.apache.maven.project.MavenProject;
-import java.util.List;
-import java.util.Map;
import java.util.HashMap;
+import java.util.Map;
/**
*
@@ -41,16 +40,20 @@
Plugin plugin = (Plugin) plugins.get( roleHint );
- plugin.execute( project );
- }
+ // Now this brings up the question of where do the parameters come from?
- public String getId()
- {
- return "plexus";
+ Map parameters = new HashMap();
+
+ plugin.execute( project, parameters );
}
public void loadPlugin( String name )
throws Exception
{
+ }
+
+ public String getId()
+ {
+ return "plexus";
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
