jvanzyl 2004/02/14 17:28:33
Modified: maven-core/src/java/org/apache/maven/plugin
DefaultPluginManagerManager.java
PluginDescriptor.java
Log:
o glean goal prereqs from teh goal descriptor in the plugin.xml descriptor.
Revision Changes Path
1.5 +13 -10
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultPluginManagerManager.java 15 Feb 2004 01:16:44 -0000 1.4
+++ DefaultPluginManagerManager.java 15 Feb 2004 01:28:33 -0000 1.5
@@ -106,7 +106,7 @@
protected String mavenLocalHome;
- DAG dag = new DAG();
+ protected DAG dag = new DAG();
protected XStream xstream;
@@ -125,14 +125,9 @@
xstream.alias( "parameter", PluginDescriptor.Parameter.class );
- goalMap = new HashMap();
-
- // compile, test, test:compile
- dag.addEdge( "jar", "test" );
-
- dag.addEdge( "test", "test:compile" );
+ xstream.alias( "prereq", String.class );
- dag.addEdge( "test:compile", "compile" );
+ goalMap = new HashMap();
}
public void attainGoals( MavenProject project, List goalNames )
@@ -205,6 +200,14 @@
{
PluginDescriptor.Goal g = (PluginDescriptor.Goal) j.next();
+ if ( g.getPrereqs() != null )
+ {
+ for ( Iterator k = g.getPrereqs().iterator(); k.hasNext(); )
+ {
+ dag.addEdge( g.getName(), (String) k.next() );
+ }
+ }
+
goalMap.put( g.getName(), g );
}
}
@@ -235,7 +238,7 @@
ByteArrayOutputStream os = new ByteArrayOutputStream();
- while( is.available() > 0 )
+ while ( is.available() > 0 )
{
read = is.read( buffer, 0, buffer.length );
@@ -265,7 +268,7 @@
private Map collectParameters( String goal, MavenProject project )
throws ParameterCollectionException
{
- List goalParameters = ((PluginDescriptor.Goal) goalMap.get( goal
)).getParameters();
+ List goalParameters = ( (PluginDescriptor.Goal) goalMap.get( goal )
).getParameters();
Map parameters = new HashMap();
1.2 +7 -0
maven-components/maven-core/src/java/org/apache/maven/plugin/PluginDescriptor.java
Index: PluginDescriptor.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/java/org/apache/maven/plugin/PluginDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PluginDescriptor.java 15 Feb 2004 01:16:44 -0000 1.1
+++ PluginDescriptor.java 15 Feb 2004 01:28:33 -0000 1.2
@@ -24,6 +24,8 @@
private List parameters;
+ private List prereqs;
+
public String getName()
{
return name;
@@ -32,6 +34,11 @@
public List getParameters()
{
return parameters;
+ }
+
+ public List getPrereqs()
+ {
+ return prereqs;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
