dion 2003/07/29 21:41:05
Modified: src/java/org/apache/maven/jelly/tags/werkz
MavenAttainGoalListener.java
Log:
Allow for plugins without -plugin
Revision Changes Path
1.3 +4 -5
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MavenAttainGoalListener.java 28 Jul 2003 23:55:14 -0000 1.2
+++ MavenAttainGoalListener.java 30 Jul 2003 04:41:05 -0000 1.3
@@ -142,7 +142,6 @@
Project plugin = (Project) pluginContext.getVariable( "plugin" );
String pluginId = Project.standardToLegacyId( plugin.getId() );
- // FIXME: Plugins shouldn't have to have "-plugin" in their id
if ( pluginId.indexOf( "-plugin" ) > 0 )
{
// We start with names like maven-java-plugin, but that's annoying to
@@ -151,10 +150,10 @@
// 'java' out of maven-java-plugin.
pluginId = pluginId.substring( 6 );
pluginId = pluginId.substring( 0, pluginId.lastIndexOf( "-" ) );
-
- plugins.put( pluginId, plugin.getProjectProperties() );
- pluginContexts.put( pluginId, pluginContext );
}
+ // for plugins without '-plugin', we use their full name
+ plugins.put( pluginId, plugin.getProjectProperties() );
+ pluginContexts.put( pluginId, pluginContext );
// 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]
