246125: the SPLIT

diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/Ajc.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/Ajc.java
index 7330108d719ea0726d1ad07cae6c630c0ae3e185..7ef5aa98e23b9f74bbd304d8848a51157c321609 100644 (file)
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/Ajc.java
+++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/Ajc.java
@@ -50,12 +50,12 @@ public class Ajc {
 
        private static final String SANDBOX_NAME = "ajcSandbox";
 
+       // ALSO SEE ANTSPEC AND AJCTESTCASE
        private static final String TESTER_PATH = ".." + File.separator + "testing-client" + File.separator + "bin"
                        + File.pathSeparator + ".." + File.separator + "runtime" + File.separator + "bin" + File.pathSeparator + ".."
                        + File.separator + "aspectj5rt" + File.separator + "bin" + File.pathSeparator + ".." + File.separator + "lib"
                        + File.separator + "junit" + File.separator + "junit.jar" + File.pathSeparator + ".." + File.separator + "bridge"
-                       + File.separator + "bin" + File.pathSeparator + ".." + File.separator + "loadtime" + File.separator
-                       + "bin"
+                       + File.separator + "bin" + File.pathSeparator + ".." + File.separator + "loadtime" + File.separator + "bin"
                        + File.pathSeparator
                        + ".."
                        + File.separator
@@ -68,16 +68,24 @@ public class Ajc {
                        + "weaver5"
                        + File.separator
                        + "bin"
+                       + File.pathSeparator
+                       + ".."
+                       + File.separator
+                       + "org.aspectj.matcher"
+                       + File.separator
+                       + "bin"
 
                        // When the build machine executes the tests, it is using code built into jars rather than code build into
                        // bin directories. This means for the necessary types to be found we have to put these jars on the classpath:
                        + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars" + File.separator + "bridge.jar"
-                       + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars" + File.separator + "util.jar"
-                       + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars" + File.separator + "loadtime.jar"
-                       + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars" + File.separator + "weaver.jar"
-                       + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars" + File.separator + "weaver5.jar"
-                       + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars" + File.separator + "asm.jar"
-                       + File.pathSeparator + ".." + File.separator + "lib" + File.separator + "test" + File.separator + "testing-client.jar"
+                       + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars" + File.separator
+                       + "org.aspectj.matcher.jar" + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars"
+                       + File.separator + "util.jar" + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars"
+                       + File.separator + "loadtime.jar" + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars"
+                       + File.separator + "weaver.jar" + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars"
+                       + File.separator + "weaver5.jar" + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars"
+                       + File.separator + "asm.jar" + File.pathSeparator + ".." + File.separator + "lib" + File.separator + "test"
+                       + File.separator + "testing-client.jar"
                        // hmmm, this next one should perhaps point to an aj-build jar...
                        + File.pathSeparator + ".." + File.separator + "lib" + File.separator + "test" + File.separator + "aspectjrt.jar";
 

diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCase.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCase.java
index 1a8da29741aa36d0a3535fc4ec7de9cb99adc5e0..d6575870acd1766e8539d381c529695400da3e96 100644 (file)
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCase.java
+++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCase.java
@@ -59,6 +59,7 @@ public class AjcTestCase extends TestCase {
         */
        protected Ajc ajc;
 
+       // see Ajc and AntSpec
        public static final String DEFAULT_CLASSPATH_ENTRIES = File.pathSeparator + ".." + File.separator + "bridge" + File.separator
                        + "bin" + File.pathSeparator + ".." + File.separator + "util" + File.separator + "bin" + File.pathSeparator + ".."
                        + File.separator + "loadtime" + File.separator + "bin" + File.pathSeparator + ".." + File.separator + "weaver"
@@ -66,8 +67,9 @@ public class AjcTestCase extends TestCase {
                        + File.pathSeparator + ".." + File.separator + "asm" + File.separator + "bin" + File.pathSeparator + ".."
                        + File.separator + "testing-client" + File.separator + "bin" + File.pathSeparator + ".." + File.separator + "runtime"
                        + File.separator + "bin" + File.pathSeparator + ".." + File.separator + "aspectj5rt" + File.separator + "bin"
-                       + File.pathSeparator + ".." + File.separator + "lib" + File.separator + "junit" + File.separator + "junit.jar"
-                       + File.pathSeparator + ".." + File.separator + "lib"
+                       + File.pathSeparator + ".." + File.separator + "org.aspectj.matcher" + File.separator + "bin" + File.pathSeparator
+                       + ".." + File.separator + "lib" + File.separator + "junit" + File.separator + "junit.jar" + File.pathSeparator + ".."
+                       + File.separator + "lib"
                        + File.separator
                        + "bcel"
                        + File.separator