More aspectjrt.jar finder fixes

diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BcweaverJarMaker.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BcweaverJarMaker.java
index 9d509d9e2f7f62da07a9481a70a040e2fe2fbc2f..5d3666169a0d328343ccd01b882d4e304286a130 100644 (file)
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BcweaverJarMaker.java
+++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BcweaverJarMaker.java
@@ -15,9 +15,9 @@ package org.aspectj.ajdt.internal.compiler.batch;
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
-import java.util.ArrayList;
 
 import org.aspectj.ajdt.ajc.AjdtAjcTests;
+import org.aspectj.tools.ajc.AjcTests;
 
 public class BcweaverJarMaker {
 
@@ -50,8 +50,7 @@ public class BcweaverJarMaker {
                args.add("../weaver/testdata/tracing.jar");
 
                args.add("-classpath");
-               args.add("../runtime/bin" + File.pathSeparator + 
-                       System.getProperty("aspectjrt.path"));
+               args.add(AjcTests.aspectjrtClasspath());
                
                args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/Trace.java");
                args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/MyTrace.java");
@@ -65,8 +64,7 @@ public class BcweaverJarMaker {
                args.add("../weaver/testdata/megatrace.jar");
 
                args.add("-classpath");
-               args.add("../runtime/bin" + File.pathSeparator + 
-                       System.getProperty("aspectjrt.path"));
+        args.add(AjcTests.aspectjrtClasspath());
                
                args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/trace/MegaTrace.java");
                args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/trace/ExecTrace.java");
@@ -81,8 +79,7 @@ public class BcweaverJarMaker {
                args.add("../weaver/testdata/megatrace0easy.jar");
 
                args.add("-classpath");
-               args.add("../runtime/bin" + File.pathSeparator + 
-                       System.getProperty("aspectjrt.path"));
+        args.add(AjcTests.aspectjrtClasspath());
                
                args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/trace/MegaTrace.java");
                args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/trace/ObviousTraceNothing.java");
@@ -96,8 +93,7 @@ public class BcweaverJarMaker {
                args.add("../weaver/testdata/megatrace0hard.jar");
 
                args.add("-classpath");
-               args.add("../runtime/bin" + File.pathSeparator + 
-                       System.getProperty("aspectjrt.path"));
+        args.add(AjcTests.aspectjrtClasspath());
                
                args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/trace/MegaTrace.java");
                args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/trace/HardTraceNothing.java");
@@ -114,8 +110,7 @@ public class BcweaverJarMaker {
                args.add("-noweave");
 
                args.add("-classpath");
-               args.add("../runtime/bin" + File.pathSeparator + 
-                       System.getProperty("aspectjrt.path"));
+        args.add(AjcTests.aspectjrtClasspath());
                
                args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/trace/MegaTrace.java");
                args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/trace/ExecTrace.java");
@@ -130,8 +125,7 @@ public class BcweaverJarMaker {
                args.add("../weaver/testdata/dummyAspect.jar");
 
                args.add("-classpath");
-               args.add("../runtime/bin" + File.pathSeparator + 
-                       System.getProperty("aspectjrt.path"));
+        args.add(AjcTests.aspectjrtClasspath());
                
                args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/DummyAspect.java");
                

diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BinaryFormsTestCase.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BinaryFormsTestCase.java
index ed5dca880f5266364f7bdf24f2d9c76890b14f5b..d0d3f57d2d642993487fa928caa72982d0f22741 100644 (file)
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BinaryFormsTestCase.java
+++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BinaryFormsTestCase.java
@@ -19,6 +19,7 @@ import java.util.List;
 
 import org.aspectj.ajdt.ajc.AjdtAjcTests;
 import org.aspectj.testing.util.TestUtil;
+import org.aspectj.tools.ajc.AjcTests;
 
 
 public class BinaryFormsTestCase extends CommandTestCase {
@@ -34,8 +35,7 @@ public class BinaryFormsTestCase extends CommandTestCase {
                args.add("out/lib.jar");
 
                args.add("-classpath");
-               args.add("../runtime/bin" 
-                       + File.pathSeparator + System.getProperty("aspectjrt.path"));
+        args.add(AjcTests.aspectjrtClasspath());
                
                args.add("-d");
                args.add("out");
@@ -50,8 +50,7 @@ public class BinaryFormsTestCase extends CommandTestCase {
                args.add("out/lib.jar");
 
                args.add("-classpath");
-               args.add("../runtime/bin" 
-                       + File.pathSeparator + System.getProperty("aspectjrt.path"));
+        args.add(AjcTests.aspectjrtClasspath());
                
                args.add("-d");
                args.add("out");
@@ -69,8 +68,7 @@ public class BinaryFormsTestCase extends CommandTestCase {
                args.add("out/lib.jar");
 
                args.add("-classpath");
-               args.add("../runtime/bin" 
-                       + File.pathSeparator + System.getProperty("aspectjrt.path"));
+        args.add(AjcTests.aspectjrtClasspath());
                
                args.add("-d");
                args.add("out");
@@ -87,8 +85,7 @@ public class BinaryFormsTestCase extends CommandTestCase {
                args.add("out/lib.jar");
 
                args.add("-classpath");
-               args.add("../runtime/bin" 
-                       + File.pathSeparator + System.getProperty("aspectjrt.path"));
+        args.add(AjcTests.aspectjrtClasspath());
                
                args.add("-d");
                args.add("out");
@@ -100,8 +97,7 @@ public class BinaryFormsTestCase extends CommandTestCase {
 
                args = new ArrayList();
                args.add("-classpath");
-               args.add("../runtime/bin" + File.pathSeparator + "out/lib.jar"
-                       + File.pathSeparator + System.getProperty("aspectjrt.path"));
+        args.add(AjcTests.aspectjrtClasspath());
                
                args.add("-d");
                args.add("out");
@@ -112,8 +108,7 @@ public class BinaryFormsTestCase extends CommandTestCase {
                
                args = new ArrayList();
                args.add("-classpath");
-               args.add("../runtime/bin" + File.pathSeparator + "out/lib.jar" + 
-                       File.pathSeparator + System.getProperty("aspectjrt.path"));
+        args.add(AjcTests.aspectjrtClasspath() + File.pathSeparator + "out/lib.jar");
                args.add("-Xlint:error");
                
                args.add("-d");

diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/CommandTestCase.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/CommandTestCase.java
index dbf0706b91b590f8858b1b83fcddd66b6fdaeae6..51438dce987cf07747a10dc72126d7ba7a302512 100644 (file)
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/CommandTestCase.java
+++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/CommandTestCase.java
@@ -19,6 +19,7 @@ import org.aspectj.bridge.IMessage;
 import org.aspectj.bridge.IMessageHandler;
 import org.aspectj.bridge.IMessageHolder;
 import org.aspectj.bridge.MessageHandler;
+import org.aspectj.tools.ajc.AjcTests;
 import org.aspectj.weaver.bcel.LazyClassGen;
 
 import java.io.File;
@@ -166,9 +167,7 @@ public abstract class CommandTestCase extends TestCase {
 
        /** get the location of the org.aspectj.lang & runtime classes */
        protected static String getRuntimeClasspath() {
-               return "../runtime/bin" + File.pathSeparator + "../aspectj5rt/bin" + File.pathSeparator + 
-                          System.getProperty("aspectjrt.path");
-               
+        return AjcTests.aspectjrtClasspath();          
        }
 
 }

diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/WorkingTestMain.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/WorkingTestMain.java
index 8cf39d3f8c4e69d409bf2b7c0f00f7b20d45bdf5..c16266c47a299c007af78b661ffe64a91a414505 100644 (file)
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/WorkingTestMain.java
+++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/WorkingTestMain.java
@@ -15,9 +15,9 @@ package org.aspectj.ajdt.internal.compiler.batch;
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
-import java.util.List;
 
 import org.aspectj.testing.util.TestUtil;
+import org.aspectj.tools.ajc.AjcTests;
 
 public class WorkingTestMain {
 
@@ -41,7 +41,8 @@ public class WorkingTestMain {
                args.add("out");
                
                args.add("-classpath");
-               args.add("../runtime/bin;" + System.getProperty("aspectjrt.path") +\r                    ";../lib/junit/junit.jar;../testing-client/bin");
+        args.add(AjcTests.aspectjrtClasspath() + File.pathSeparator
+                + "../testing-client/bin");
                //args.add("../runtime/bin;../lib/junit/junit.jar");
                
 //             args.add("-injars");
@@ -77,7 +78,7 @@ public class WorkingTestMain {
                args.add("out");
                
                args.add("-classpath");
-               args.add("../runtime/bin" + File.pathSeparator + System.getProperty("aspectjrt.path"));
+               args.add(AjcTests.aspectjrtClasspath());
                
                for (int i=0; i < argfiles.length; i++) {
                        args.add("@" + examplesDir + argfiles[i]);