jvanzyl 2002/07/15 19:40:03
Modified: src/java/org/apache/maven/app PluginManager.java
Log:
o Change the plugin manager to add the whole plugin directory structure
to the classpath.
Revision Changes Path
1.11 +3 -25
jakarta-turbine-maven/src/java/org/apache/maven/app/PluginManager.java
Index: PluginManager.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/app/PluginManager.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PluginManager.java 14 Jul 2002 18:01:38 -0000 1.10
+++ PluginManager.java 16 Jul 2002 02:40:03 -0000 1.11
@@ -221,29 +221,9 @@
// Thread.currentThread().setContextClassLoader(cl);
log.debug("plugin: " + name + " -> " + getPluginDir(name));
+
Forehead.getInstance().getClassLoader("root.maven").addURL(getPluginDir(name).toURL());
- // Let the classloader know where the classes provided by
- // the plugin live. We could probably make a classes dir
- // or actually put the classes in a JAR.
- // The jar will be package up so that inside the plugin jar there
- // will be a jar named <name>.jar so that might be, say,
- // jxr-1.0.jar which contains java classes for the plugin.
- File pluginJar = new File(getPluginDir(name), name + ".jar");
-
- if (pluginJar.exists())
- {
- log.debug("Adding " + pluginJar + " to root.maven");
-
Forehead.getInstance().getClassLoader("root.maven").addURL(pluginJar.toURL());
- }
-
- // Now for each plugin we have to let the classloader know about
- // the JARs that this plugin needs.
- File p = new File(getPluginDir(name),name);
-
- // Most plugins aren't real plugins yet.
- if (p.exists())
- {
-
+ /*
Project pluginProject = MavenUtils.getProject(p);
for (Iterator i = pluginProject.getDependencies().iterator(); i.hasNext();)
@@ -255,9 +235,7 @@
// Add the dependency to the specified classloader
// if it isn't present already.
}
-
- }
-
+ */
// For each plugin we create a new MavenJellyContext so that we
// can push in commonly named elements like ${plugin.dir} without
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
