dion 2003/08/10 23:16:11 Modified: src/java/org/apache/maven Tag: MAVEN_RC1_STABLE MavenUtils.java src/java/org/apache/maven/plugin Tag: MAVEN_RC1_STABLE PluginManager.java Log: Start of MAVEN-536 Revision Changes Path No revision No revision 1.94.2.2 +1 -19 maven/src/java/org/apache/maven/MavenUtils.java Index: MavenUtils.java =================================================================== RCS file: /home/cvs/maven/src/java/org/apache/maven/MavenUtils.java,v retrieving revision 1.94.2.1 retrieving revision 1.94.2.2 diff -u -r1.94.2.1 -r1.94.2.2 --- MavenUtils.java 7 Aug 2003 16:56:39 -0000 1.94.2.1 +++ MavenUtils.java 11 Aug 2003 06:16:11 -0000 1.94.2.2 @@ -56,7 +56,6 @@ * ==================================================================== */ -import com.werken.forehead.ForeheadClassLoader; import org.apache.commons.betwixt.XMLIntrospector; import org.apache.commons.betwixt.io.BeanReader; import org.apache.commons.betwixt.io.BeanWriter; @@ -79,7 +78,6 @@ import org.apache.maven.jelly.MavenJellyContext; import org.apache.maven.project.BaseObject; import org.apache.maven.project.Project; -import org.apache.maven.repository.Artifact; import org.apache.maven.util.StringInputStream; import org.apache.tools.ant.DirectoryScanner; import org.xml.sax.XMLReader; @@ -247,22 +245,6 @@ // Fully initialize the project. project.initialize(); - - // This may definitely break plugins. - ClassLoader cl = project.getContext().getClassLoader(); - - if ( cl instanceof ForeheadClassLoader ) - { - for ( Iterator i = project.getArtifacts().iterator(); i.hasNext(); ) - { - Artifact artifact = (Artifact) i.next(); - ( (ForeheadClassLoader) cl ).addURL( artifact.getFile().toURL() ); - } - } - - // Explicity set the classloader used to find resources. As we just - // poked all the dependencies into the classloader. - project.getContext().setClassLoader( cl ); return project; } No revision No revision 1.45.2.3 +5 -3 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.45.2.2 retrieving revision 1.45.2.3 diff -u -r1.45.2.2 -r1.45.2.3 --- PluginManager.java 11 Aug 2003 03:49:32 -0000 1.45.2.2 +++ PluginManager.java 11 Aug 2003 06:16:11 -0000 1.45.2.3 @@ -256,7 +256,7 @@ cacheManager.loadCache(); File[] files = getPluginsDir().listFiles(); - if( log.isInfoEnabled() ) + if( log.isDebugEnabled() ) { log.debug( "Unpacking plugins from directory --> " + getPluginsDir().getAbsolutePath() ); @@ -365,6 +365,7 @@ // Before attempting to attain the goals verify the project // if desired. project.verifyDependencies(); + project.processDependencies(); // If this project has a parent then we will load it's maven.xml // file into this project so any goals the parent specifies in @@ -707,8 +708,9 @@ "plugin has been processed."); } + // place dependencies on the right classloaders pluginProject.processDependencies(); - + // We need to create a separate context for the plugin.jelly script to // run against because we need our values of "plugin" and "plugin.dir" // to have distinct values. Everything else can be taken from the
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]