From ae555005ab4de145107089eb7cdcacc3479a160b Mon Sep 17 00:00:00 2001
From: jvanzyl <jvanzyl@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 31 Jan 2004 05:53:40 +0000
Subject: [PATCH] *** empty log message ***

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@114645 13f79535-47bb-0310-9956-ffa450edef68
---
 surefire/plugin.jelly                         |   9 +-
 surefire/project.xml                          |  20 ---
 .../maven/test/IsolatedClassLoader.class      | Bin 864 -> 0 bytes
 .../maven/test/IsolatedClassLoader.java       |  59 --------
 .../apache/maven/test/TestRunnerBooter.class  | Bin 3431 -> 0 bytes
 .../apache/maven/test/TestRunnerBooter.java   | 130 ------------------
 6 files changed, 5 insertions(+), 213 deletions(-)
 delete mode 100644 surefire/src/main/org/apache/maven/test/IsolatedClassLoader.class
 delete mode 100644 surefire/src/main/org/apache/maven/test/IsolatedClassLoader.java
 delete mode 100644 surefire/src/main/org/apache/maven/test/TestRunnerBooter.class
 delete mode 100644 surefire/src/main/org/apache/maven/test/TestRunnerBooter.java

diff --git a/surefire/plugin.jelly b/surefire/plugin.jelly
index 35396f4f..8dc11c81 100644
--- a/surefire/plugin.jelly
+++ b/surefire/plugin.jelly
@@ -27,6 +27,8 @@
     <j:if test="${unitTestSourcesPresent == 'true'}">
 
       <javac
+        srcdir="${pom.testCompileSourceRoots}"
+        classpath="${pom.dependencyClasspath}:${maven.build.dest}:${plugin.getDependencyPath('junit')}"
         destdir="${maven.test.dest}"
         excludes="**/package.html"
         debug="${maven.compile.debug}"
@@ -35,15 +37,14 @@
         <j:if test="${context.getVariable('maven.test.source') != null}">
           <setProperty name="source" value="${maven.test.source}" />
         </j:if>
+        <!--
         <classpath>
           <pathelement path="${maven.test.dest}"/>
           <pathelement path="${maven.build.dest}"/>
-          <path refid="maven.dependency.classpath"/>
+          <pathelement path="${pom.dependencyClasspath}"/>
           <pathelement path="${plugin.getDependencyPath('junit')}"/>
         </classpath>
-        <src>
-          <path refid="maven.test.compile.src.set"/>
-        </src>
+        -->
         <j:if test="${context.getVariable('maven.compile.compilerargs') != null}">
           <compilerarg line="${maven.compile.compilerargs}" />
         </j:if>
diff --git a/surefire/project.xml b/surefire/project.xml
index 07691cb4..e6bd3a36 100644
--- a/surefire/project.xml
+++ b/surefire/project.xml
@@ -18,30 +18,10 @@
   <developers>
   </developers>
   <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-    </dependency>
-    <dependency>
-      <groupId>maven</groupId>
-      <artifactId>test-runner</artifactId>
-      <version>1.4</version>
-    </dependency>
-    <dependency>
-      <groupId>maven</groupId>
-      <artifactId>maven-model</artifactId>
-      <version>2.0-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>maven</groupId>
       <artifactId>maven-project</artifactId>
       <version>2.0-SNAPSHOT</version>
     </dependency>
-    <dependency>
-      <groupId>plexus</groupId>
-      <artifactId>plexus</artifactId>
-      <version>0.14-SNAPSHOT</version>
-    </dependency>
   </dependencies>
 </project>
diff --git a/surefire/src/main/org/apache/maven/test/IsolatedClassLoader.class b/surefire/src/main/org/apache/maven/test/IsolatedClassLoader.class
deleted file mode 100644
index ed2c88759befcafa9100be7bf8b3272b52618be8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 864
zcmZuw&2JJx9DM@|Ted4LS_JAxOKUAGZPzx&L@{0(o0tHHqFy|0*%8;kF4<igz4-5V
z)kLi^QE!^~M;YHNs4aS#`F+0kn>RB*et!A_U<VBy6$A5FHgE}-b1-m4xmOKZD{5KQ
zQB}D$9qT%-31ml3DE(NV)Ozk5JNCfw`}Y38iK15ExH4?A<gVv?@jZcbt^Qa*+YekR
zu+Z{+*%=RyWcbiI8ZeS|T=&soOQ2AjVEHn(8EC4m+<<TiuE54LpKx{K(DVDv`Yb((
zjr%Wpauj=kAJORs<FF?WJVjN05CsD#mJ`Iuq&sSU0W&$ql-fid8#=C=*hI~QiE}2-
z<ARAgiY6=+1y*N{-3j7@VC=hpxJ@jnx_S`yZD-{4o=JP?982GhWfa^08H8G%p5c_3
zM5#SFtIh1Or>ZN-iZhc<QUXhT8Fybsu^gU(uGId~a0<rDdg}RZ;{CpZoQfp<sPbLR
z^Z5v*ltQ%9wDVZtx=3#~@qvPs{tO{bkg`4^{T|xeq^ZC)&k|6l92*u<WFu9cwyzO3
z#cbAUoFMbJ$4H_TWU$N;s4;y-_lkRl`<~VKfNWcIw!WjPY`y&&<vUtM>sargeS@hs
z#&c~}WVXL<y&<Ez-y-H{sk!#(11rdqVGir`HksdLMI9wH$h^&r&6jYKzvmWi;5II@
NLu0?fDA7)#{0pPAx>EoE

diff --git a/surefire/src/main/org/apache/maven/test/IsolatedClassLoader.java b/surefire/src/main/org/apache/maven/test/IsolatedClassLoader.java
deleted file mode 100644
index 085fddf6..00000000
--- a/surefire/src/main/org/apache/maven/test/IsolatedClassLoader.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.apache.maven.test;
-
-import java.net.URLClassLoader;
-import java.net.URL;
-
-/**
- *
- * 
- * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
- *
- * @version $Id: IsolatedClassLoader.java,v 1.1 2004/01/09 16:22:59 jvanzyl Exp $
- */
-public class IsolatedClassLoader
-    extends URLClassLoader
-{
-    private ClassLoader parent = ClassLoader.getSystemClassLoader();
-
-    public IsolatedClassLoader()
-    {
-        super( new URL[0], null );
-    }
-
-    public void addURL( URL url )
-    {
-        super.addURL( url );
-    }
-
-    public synchronized Class loadClass( String className )
-        throws ClassNotFoundException
-    {
-        Class c = findLoadedClass( className );
-
-        ClassNotFoundException ex = null;
-
-        if ( c == null )
-        {
-            try
-            {
-                c = findClass( className );
-            }
-            catch ( ClassNotFoundException e )
-            {
-                ex = e;
-
-                if ( parent != null )
-                {
-                    c = parent.loadClass( className );
-                }
-            }
-        }
-
-        if ( c == null )
-        {
-            throw ex;
-        }
-
-        return c;
-    }
-}
diff --git a/surefire/src/main/org/apache/maven/test/TestRunnerBooter.class b/surefire/src/main/org/apache/maven/test/TestRunnerBooter.class
deleted file mode 100644
index 506bc627deab49ce3357ed5e73d43139927d903c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3431
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

diff --git a/surefire/src/main/org/apache/maven/test/TestRunnerBooter.java b/surefire/src/main/org/apache/maven/test/TestRunnerBooter.java
deleted file mode 100644
index 21dc8093..00000000
--- a/surefire/src/main/org/apache/maven/test/TestRunnerBooter.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package org.apache.maven.test;
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.model.Dependency;
-import org.apache.maven.project.Project;
-import org.codehaus.plexus.util.DirectoryScanner;
-import org.codehaus.plexus.util.StringUtils;
-
-import java.io.File;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.util.Iterator;
-import java.util.List;
-
-public class TestRunnerBooter
-{
-    private Project project;
-
-    public void setProject( Project project )
-    {
-        this.project = project;
-    }
-
-    public void execute()
-        throws Exception
-    {
-        // maven.build.dest
-        // maven.test.dest
-
-        IsolatedClassLoader classLoader = new IsolatedClassLoader();
-
-        File basedir = project.getFile().getParentFile();
-
-        System.setProperty( "basedir", basedir.getPath() );
-
-        Thread.currentThread().setContextClassLoader( classLoader );
-
-        String mavenRepoLocal = project.getProperty( "maven.repo.local" );
-
-        classLoader.addURL( new File ( mavenRepoLocal, "junit/jars/junit-3.8.1.jar" ).toURL() );
-
-        classLoader.addURL( new File ( mavenRepoLocal, "maven/jars/surefire-runner-1.0.jar" ).toURL() );
-
-        classLoader.addURL( new File( basedir, "target/classes/" ).toURL() );
-
-        classLoader.addURL( new File( basedir, "target/test-classes/" ).toURL() );
-
-        processDependencies( project, classLoader );
-
-        String[] tests = collectTests( basedir,
-                                       project.getBuild().getUnitTest().getIncludes(),
-                                       project.getBuild().getUnitTest().getExcludes() );
-
-        Class testRunnerClass = classLoader.loadClass( "org.apache.maven.test.TestRunner" );
-
-        Object testRunner = testRunnerClass.newInstance();
-
-        Method m = testRunnerClass.getMethod( "runTestClasses", new Class[] {
-            ClassLoader.class,
-            String[].class
-        } );
-
-        m.invoke( testRunner, new Object[]{
-            classLoader,
-            tests
-        } );
-    }
-
-    // We need to deal with populating a plugin classloader with its requirements.
-    private void processDependencies( Project project, IsolatedClassLoader classLoader )
-        throws MalformedURLException
-    {
-        if ( project.getArtifacts() == null )
-        {
-            return;
-        }
-
-        for ( Iterator i = project.getArtifacts().iterator(); i.hasNext(); )
-        {
-            Artifact artifact = (Artifact) i.next();
-
-            Dependency dependency = artifact.getDependency();
-
-            // Only add compile type dependencies to classloader
-            if ( dependency.getType().equals( "jar" ) )
-            {
-                // We have the jar and the classloader to push it into so
-                // lets do it!
-                if ( artifact.exists() )
-                {
-                    classLoader.addURL( artifact.getFile().toURL() );
-                }
-            }
-        }
-    }
-
-    public String[] collectTests( File basedir, List includes, List excludes )
-        throws Exception
-    {
-        DirectoryScanner scanner = new DirectoryScanner();
-
-        scanner.setBasedir( new File( basedir, "target/test-classes" ) );
-
-        String[] incs = new String[includes.size()];
-
-        for ( int i = 0; i < incs.length; i++ )
-        {
-            incs[i] = StringUtils.replace( (String) includes.get( i ), "java", "class" );
-        }
-
-        scanner.setIncludes( incs );
-
-        String[] excls = new String[excludes.size() + 1];
-
-        for ( int i = 0; i < excls.length - 1; i++ )
-        {
-            excls[i] = StringUtils.replace( (String) excludes.get( i ), "java", "class" );
-        }
-
-        // Exclude inner classes
-
-        excls[excludes.size()] = "**/*$*";
-
-        scanner.setExcludes( excls );
-
-        scanner.scan();
-
-        return scanner.getIncludedFiles();
-    }
-}