brett 2004/03/24 21:13:05
Modified: src/java/org/apache/maven/plugin Tag: MAVEN-1_0-BRANCH
PluginManager.java
Log:
PR: MAVEN-1206
when downloading plugin, immediately recognise goals
Revision Changes Path
No revision
No revision
1.70.4.26 +9 -2 maven/src/java/org/apache/maven/plugin/PluginManager.java
Index: PluginManager.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/plugin/PluginManager.java,v
retrieving revision 1.70.4.25
retrieving revision 1.70.4.26
diff -u -r1.70.4.25 -r1.70.4.26
--- PluginManager.java 22 Mar 2004 02:25:04 -0000 1.70.4.25
+++ PluginManager.java 25 Mar 2004 05:13:05 -0000 1.70.4.26
@@ -133,6 +133,9 @@
/** Goal to Plugins mapper. */
private final GoalToJellyScriptHousingMapper mapper = new
GoalToJellyScriptHousingMapper();
+ /** Current plugins mapper (transient - includes maven.xml, etc). **/
+ private GoalToJellyScriptHousingMapper transientMapper = null;
+
/** Plugins to be popped afterwards. */
private Set delayedPops = new HashSet();
@@ -412,7 +415,7 @@
AntProjectBuilder.build( project, baseContext );
// TODO: shouldn't this be a stack too? Then session attribute not needed
- GoalToJellyScriptHousingMapper transientMapper = new
GoalToJellyScriptHousingMapper();
+ transientMapper = new GoalToJellyScriptHousingMapper();
// Create the Jelly session
Session session = new JellySession( baseContext.getXMLOutput() );
@@ -702,6 +705,10 @@
JellyScriptHousing housing = loadPlugin( unpackedPluginDir );
housing.parse( cacheManager );
housing.parse( mapper );
+ if ( transientMapper != null )
+ {
+ housing.parse( transientMapper );
+ }
cacheManager.saveCache( unpackedPluginsDir );
}
else
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
