brett 2003/10/30 04:19:37
Modified: src/java/org/apache/maven/plugin Tag: MAVEN_RC2_UNSTABLE
JellyPlugin.java PluginManager.java
Log:
PR: MAVEN-760
Put back parent classloader after overzealous cleanup.
Side effects are required to properly setup dependencies.
Revision Changes Path
No revision
No revision
1.3.2.2 +12 -3 maven/src/java/org/apache/maven/plugin/Attic/JellyPlugin.java
Index: JellyPlugin.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/plugin/Attic/JellyPlugin.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- JellyPlugin.java 30 Oct 2003 11:46:30 -0000 1.3.2.1
+++ JellyPlugin.java 30 Oct 2003 12:19:36 -0000 1.3.2.2
@@ -56,6 +56,7 @@
* ====================================================================
*/
+import com.werken.forehead.ForeheadClassLoader;
import org.apache.commons.jelly.Script;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -108,6 +109,9 @@
/** compiled script */
private Script compiledScript;
+ /** classloader for the plugin. @todo just lazy at the moment, refactor */
+ private ForeheadClassLoader parentClassLoader;
+
/**
* Constructor.
* @param pluginFile the JAR file to read the plugin from.
@@ -172,8 +176,8 @@
project = MavenUtils.getProject( getDescriptor(), null, false );
project.verifyDependencies();
-// parentClassLoader.addURL(directory.toURL());
-// PluginManager.processDependencies(project, parentClassLoader);
+ parentClassLoader.addURL(directory.toURL());
+ PluginManager.processDependencies(project, parentClassLoader);
}
/**
@@ -271,5 +275,10 @@
public void setUnpackDirectory(File file)
{
unpackDirectory = file;
+ }
+
+ public void setParentClassLoader(ForeheadClassLoader loader)
+ {
+ parentClassLoader = loader;
}
}
1.70.2.2 +2 -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.2.1
retrieving revision 1.70.2.2
diff -u -r1.70.2.1 -r1.70.2.2
--- PluginManager.java 30 Oct 2003 11:46:30 -0000 1.70.2.1
+++ PluginManager.java 30 Oct 2003 12:19:36 -0000 1.70.2.2
@@ -286,7 +286,7 @@
// TODO [RC2] - remove debugging
System.err.println( "loading plugin " + plugin.getId() );
plugin.setUnpackDirectory( getUnpackedPluginsDir() );
-// plugin.setParentClassLoader( mavenRootClassLoader );
+ plugin.setParentClassLoader( mavenRootClassLoader );
plugin.load();
if ( plugin.hasScript() )
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
