cleanup code from previous tests.

git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/main-maven3-support@36806 71c3de6d-444a-0410-be80-ed276b4c234a

maven-agent/pom.xml

@@ -101,18 +101,13 @@ THE SOFTWARE.
       <version>1.1</version>      
     </dependency>
      -->
-    <dependency>
-      <groupId>org.apache.ant</groupId>
-      <artifactId>ant</artifactId>
-      <version>1.8.0</version>
-    </dependency>    
     
     <!-- test dependencies -->
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
       <version>2.0.9</version>
-      <scope>test</scope>
+      <scope>provided</scope>
       <exclusions>
         <exclusion>
           <groupId>classworlds</groupId>

maven-agent/src/main/java/hudson/maven/agent/Main.java

@@ -46,6 +46,7 @@ import java.util.Set;
 import org.apache.tools.ant.AntClassLoader;
 import org.codehaus.classworlds.ClassWorldAdapter;
 import org.codehaus.plexus.classworlds.ClassWorld;
+import org.codehaus.plexus.classworlds.ClassWorldListener;
 import org.codehaus.plexus.classworlds.launcher.ConfigurationException;
 import org.codehaus.plexus.classworlds.launcher.Launcher;
 import org.codehaus.plexus.classworlds.realm.ClassRealm;
@@ -118,7 +119,7 @@ public class Main {
         
         // load the default realms
         launcher = new Launcher();
-        launcher.setSystemClassLoader(Main.class.getClassLoader());
+        //launcher.setSystemClassLoader(Main.class.getClassLoader());
         
         configureLauncher( m2Home, remotingJar, interceptorJar, interceptorOverrideJar, is206OrLater );
         
@@ -133,8 +134,7 @@ public class Main {
         // create a realm for loading remoting subsystem.
         // this needs to be able to see maven.
         
-        System.out.print( "Main classLoader " + Main.class.getClassLoader() );
-        //test en changeant le parent en plexus.core.maven ?
+        System.out.println( "Main classLoader " + Main.class.getClassLoader() );
         ClassRealm remoting = launcher.getWorld().newRealm( "hudson-remoting", launcher.getWorld().getClassRealm( "plexus.core" ) );
         remoting.importFrom( "plexus.core.maven", "org.apache.maven" );
         //remoting.setParentClassLoader( launcher.getWorld().getClassRealm( "plexus.core.maven" ) );
@@ -278,23 +278,12 @@ public class Main {
         Set builtinRealms = new HashSet(world.getRealms());
         URLClassLoader orig = (URLClassLoader) Thread.currentThread().getContextClassLoader();
         System.out.println("orig " + orig.toString());
-        Enumeration urls = orig.findResources( "META-INF/plexus/components.xml" );
-        while(urls.hasMoreElements())
-        {
-            System.out.println(" url " + urls.nextElement());
-        }        
+      
         
         try {
             launcher.setAppMain( "org.apache.maven.cli.MavenCli", "plexus.core.maven" );
             ClassRealm newCl = launcher.getMainRealm();
-            System.out.println("urls " + Arrays.asList( newCl.getURLs() ) );
-            urls = newCl.findResources( "META-INF/plexus/components.xml" );
-            while(urls.hasMoreElements())
-            {
-                System.out.println(" url " + urls.nextElement());
-            }
-            System.out.println("launcher cl " + newCl.toString());
-            //Thread.currentThread().setContextClassLoader( newCl );
+            Thread.currentThread().setContextClassLoader( newCl );
             Method mainMethod = launcher.getMainClass().getMethod( "main", new Class[]{String[].class, org.codehaus.classworlds.ClassWorld.class} );
             //launcher.launch(args);
             

maven-plugin/src/main/java/hudson/maven/MavenBuilder.java

@@ -135,7 +135,6 @@ public abstract class MavenBuilder extends AbstractMavenBuilder implements Deleg
             System.out.println("MavenBuilder in call " + Thread.currentThread().getContextClassLoader());
             futures = new ArrayList<Future<?>>();
             Adapter a = new Adapter(this);
-            // FIXME are we using maven 2 or 3
             callSetListenerWithReflectOnInterceptors( a );
             
             /*

maven-plugin/src/main/java/hudson/maven/MavenComputerListener.java

@@ -38,8 +38,10 @@ import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
 
+import org.apache.tools.ant.AntClassLoader;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.Zip;
+import org.codehaus.plexus.classworlds.ClassWorld;
 import org.jvnet.hudson.maven3.agent.Maven3Main;
 import org.jvnet.hudson.maven3.launcher.Maven3Launcher;
 
@@ -58,6 +60,8 @@ public class MavenComputerListener extends ComputerListener {
         copyJar(logger, root, Maven3Launcher.class, "maven3-listener");
         copyJar(logger, root, PluginManagerInterceptor.class, "maven-interceptor");
         copyJar(logger, root, Maven21Interceptor.class, "maven2.1-interceptor");
+        copyJar(logger, root, ClassWorld.class, "plexus-classworld");
+        copyJar(logger, root, AntClassLoader.class, "maven-plugin-ant");
     }
 
     /**

maven-plugin/src/main/java/hudson/maven/MavenProcessFactory.java

@@ -70,6 +70,8 @@ import java.nio.charset.UnsupportedCharsetException;
 import java.util.Arrays;
 import java.util.logging.Logger;
 
+import javax.inject.Inject;
+
 import org.apache.tools.ant.AntClassLoader;
 import org.codehaus.plexus.classworlds.ClassWorld;
 

pom.xml

@@ -283,7 +283,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-classworlds</artifactId>
-        <version>2.2.3</version>
+        <version>2.3</version>
       </dependency>
       <dependency>
         <groupId>org.apache.ant</groupId>