jvanzyl 2004/02/11 17:59:00
Modified: maven-core bootstrap.plugins bootstrap.sh project.xml
maven-core/src/bin classworlds.conf
maven-core/src/java/org/apache/maven plexus.xml
maven-core/src/java/org/apache/maven/plugin
DefaultPluginManagerManager.java PluginManager.java
maven-core/src/java/org/apache/maven/plugin/plexus
PlexusPluginManager.java
Log:
Revision Changes Path
1.2 +1 -0 maven-components/maven-core/bootstrap.plugins
Index: bootstrap.plugins
===================================================================
RCS file: /home/cvs/maven-components/maven-core/bootstrap.plugins,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bootstrap.plugins 6 Feb 2004 23:27:40 -0000 1.1
+++ bootstrap.plugins 12 Feb 2004 01:59:00 -0000 1.2
@@ -1,2 +1,3 @@
maven-compiler-plugin
maven-jar-plugin
+maven-surefire-plugin
1.2 +3 -1 maven-components/maven-core/bootstrap.sh
Index: bootstrap.sh
===================================================================
RCS file: /home/cvs/maven-components/maven-core/bootstrap.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bootstrap.sh 6 Feb 2004 23:27:40 -0000 1.1
+++ bootstrap.sh 12 Feb 2004 01:59:00 -0000 1.2
@@ -28,6 +28,8 @@
# Build the plugins
+repoLocal=`cat bootstrap.repo`
+
for plugin in `cat bootstrap.plugins`
do
@@ -38,7 +40,7 @@
mboot --dir ../maven-plugins/${plugin}
cp ../maven-plugins/${plugin}/target/${plugin}*.jar ${DIST}/plugins/plexus
-
+
done
echo "MAVEN_HOME = ${MAVEN_HOME}"
1.2 +7 -0 maven-components/maven-core/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 6 Feb 2004 23:27:41 -0000 1.1
+++ project.xml 12 Feb 2004 01:59:00 -0000 1.2
@@ -89,10 +89,17 @@
<version>0.4</version>
</dependency>
+ <!-- This will eventually be removed -->
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-compiler</artifactId>
<version>1.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>surefire</groupId>
+ <artifactId>surefire-booter</artifactId>
+ <version>1.0</version>
</dependency>
</dependencies>
1.2 +0 -3 maven-components/maven-core/src/bin/classworlds.conf
Index: classworlds.conf
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/bin/classworlds.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- classworlds.conf 6 Feb 2004 23:27:41 -0000 1.1
+++ classworlds.conf 12 Feb 2004 01:59:00 -0000 1.2
@@ -2,7 +2,4 @@
[root]
load ${tools.jar}
-#load ${maven.home}/lib/ant-1.5.3-1.jar
-#load ${maven.home}/lib/endorsed/xml-apis-1.0.b2.jar
-#load ${maven.home}/lib/endorsed/xerces-2.4.0.jar
load ${maven.home}/lib/*.jar
1.2 +12 -13 maven-components/maven-core/src/java/org/apache/maven/plexus.xml
Index: plexus.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/java/org/apache/maven/plexus.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plexus.xml 6 Feb 2004 23:27:43 -0000 1.1
+++ plexus.xml 12 Feb 2004 01:59:00 -0000 1.2
@@ -1,11 +1,5 @@
<configuration>
- <!--
- <load-on-start>
- <service role="org.apache.maven.Maven"/>
- </load-on-start>
- -->
-
<resources>
<jar-repository>${maven.home}/plugins/plexus</jar-repository>
</resources>
@@ -58,7 +52,13 @@
<role>org.apache.maven.plugin.jelly.AntProjectBuilder</role>
<implementation>org.apache.maven.plugin.jelly.DefaultAntProjectBuilder</implementation>
</component>
- <!-- Plugin Manager Manager -->
+
+ <!--
+ |
+ | Plugin Manager Manager
+ |
+ -->
+
<component>
<role>org.apache.maven.plugin.PluginManagerManager</role>
<implementation>org.apache.maven.plugin.DefaultPluginManagerManager</implementation>
@@ -80,12 +80,11 @@
</configuration>
</component>
- <!-- Plugin Managers -->
- <component>
- <role>org.apache.maven.plugin.PluginManager</role>
- <role-hint>java</role-hint>
-
<implementation>org.apache.maven.plugin.java.JavaPluginManager</implementation>
- </component>
+ <!--
+ |
+ | Plugin Managers
+ |
+ -->
<component>
<role>org.apache.maven.plugin.PluginManager</role>
1.2 +6 -4
maven-components/maven-core/src/java/org/apache/maven/plugin/DefaultPluginManagerManager.java
Index: DefaultPluginManagerManager.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/java/org/apache/maven/plugin/DefaultPluginManagerManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultPluginManagerManager.java 6 Feb 2004 23:27:43 -0000 1.1
+++ DefaultPluginManagerManager.java 12 Feb 2004 01:59:00 -0000 1.2
@@ -70,9 +70,6 @@
import java.util.List;
import java.util.Map;
-//!!! Plugins being dependent on the Maven POM, we have to move toward using
-// the plexus component descriptor.
-
public class DefaultPluginManagerManager
extends AbstractLogEnabled
implements PluginManagerManager, Contextualizable, Initializable
@@ -107,7 +104,12 @@
pluginManager = (PluginManager) pluginManagers.get( "plexus" );
- pluginManager.attainGoals( project, goalNames );
+ for ( Iterator i = goalNames.iterator(); i.hasNext(); )
+ {
+ String goal = (String) i.next();
+
+ pluginManager.attainGoal( project, goal );
+ }
}
public void contextualize( Context context )
1.2 +2 -2
maven-components/maven-core/src/java/org/apache/maven/plugin/PluginManager.java
Index: PluginManager.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/java/org/apache/maven/plugin/PluginManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PluginManager.java 6 Feb 2004 23:27:43 -0000 1.1
+++ PluginManager.java 12 Feb 2004 01:59:00 -0000 1.2
@@ -17,7 +17,7 @@
{
static String ROLE = PluginManager.class.getName();
- void attainGoals( MavenProject project, List goals )
+ void attainGoal( MavenProject project, String goal )
throws GoalException, Exception;
List getGoals();
1.2 +18 -6
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PlexusPluginManager.java 6 Feb 2004 23:27:43 -0000 1.1
+++ PlexusPluginManager.java 12 Feb 2004 01:59:00 -0000 1.2
@@ -7,6 +7,7 @@
import java.util.List;
import java.util.Map;
+import java.util.HashMap;
/**
*
@@ -20,14 +21,25 @@
{
private Map plugins;
- public void attainGoals( MavenProject project, List goals )
- throws GoalException, Exception
+ private Map goalToPluginMap;
+
+ public PlexusPluginManager()
{
- System.out.println( "plugins = " + plugins );
+ goalToPluginMap = new HashMap();
+
+ goalToPluginMap.put( "compile", "compiler" );
+
+ goalToPluginMap.put( "jar", "jar" );
- Plugin plugin = (Plugin) plugins.get( "compiler" );
+ goalToPluginMap.put( "test", "surefire" );
+ }
+
+ public void attainGoal( MavenProject project, String goal )
+ throws GoalException, Exception
+ {
+ String roleHint = (String) goalToPluginMap.get( goal );
- System.out.println( "plugin = " + plugin );
+ Plugin plugin = (Plugin) plugins.get( roleHint );
plugin.execute( project );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
