brett 2004/02/29 17:39:43
Modified: src/java/org/apache/maven/plugin Tag: MAVEN-1_0-BRANCH
PluginManager.java
Log:
prevent dual verification of dependencies for maven.xml
Revision Changes Path
No revision
No revision
1.70.4.20 +7 -6 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.19
retrieving revision 1.70.4.20
diff -u -r1.70.4.19 -r1.70.4.20
--- PluginManager.java 26 Feb 2004 16:11:26 -0000 1.70.4.19
+++ PluginManager.java 1 Mar 2004 01:39:42 -0000 1.70.4.20
@@ -522,6 +522,7 @@
if ( defaultGoalName != null )
{
+ log.debug( "Using defailt goal: " + defaultGoalName );
goals.add( defaultGoalName );
}
}
@@ -837,19 +838,19 @@
private Script loadScript(JellyScriptHousing jellyScriptHousing)
throws Exception
{
+ // TODO: should differentiate between plugins and script housings
// TODO [1.0]: this currently duplicates createJellyScriptHousing for
others - it is the lazy version
ForeheadClassLoader pluginClassLoader = (ForeheadClassLoader)
jellyScriptHousing.getProject().getContext().getClassLoader();
// We will add the plugin classes to the plugin class loader.
if ( jellyScriptHousing.getPluginDirectory() != null )
{
+ // not needed for maven.xml
+ jellyScriptHousing.getProject().verifyDependencies();
+ // TODO: does this line belong in here or out?
+ processDependencies(jellyScriptHousing.getProject(), pluginClassLoader);
pluginClassLoader.addURL(
jellyScriptHousing.getPluginDirectory().toURL() );
}
-
- // TODO: can probably put this in the if - not needed for maven.xml
- // TODO: should differentiate between plugins and script housings
- jellyScriptHousing.getProject().verifyDependencies();
- processDependencies(jellyScriptHousing.getProject(), pluginClassLoader);
MavenJellyContext context = jellyScriptHousing.getProject().getContext();
URL oldRoot = context.getRootURL();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
