dion 2003/07/30 19:28:06
Modified: src/java/org/apache/maven/jelly/tags/werkz
MavenAttainGoalListener.java
Log:
Add back non '-plugin' plugins additions.
Note: maven test fails even though bootstrap works ok, with OR without this code.
Revision Changes Path
1.5 +15 -2
maven/src/java/org/apache/maven/jelly/tags/werkz/MavenAttainGoalListener.java
Index: MavenAttainGoalListener.java
===================================================================
RCS file:
/home/cvs/maven/src/java/org/apache/maven/jelly/tags/werkz/MavenAttainGoalListener.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MavenAttainGoalListener.java 30 Jul 2003 05:40:15 -0000 1.4
+++ MavenAttainGoalListener.java 31 Jul 2003 02:28:06 -0000 1.5
@@ -153,7 +153,20 @@
plugins.put( pluginId, plugin.getProjectProperties() );
pluginContexts.put( pluginId, pluginContext );
}
- // FIXME: for plugins without '-plugin', we use their full name
+ else
+ {
+ // For plugins without '-plugin', we use their full name
+ if ( plugins.get( pluginId ) == null )
+ {
+ System.err.println("Adding non '-plugin', '" + pluginId + "' to
contexts");
+ plugins.put( pluginId, plugin.getProjectProperties() );
+ pluginContexts.put( pluginId, pluginContext );
+ }
+ // else it was already added and could be a clashing project
+ // like the 'touchstone' project in src/test/touchstone-build which
clashes
+ // with the 'maven-touchstone-plugin' plugin
+
+ }
// Put all the plugin properties into this plugin context.
pluginContext.setVariable( "plugins", plugins );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
