Changing string constant for classDir, since the package changed names (correctly...

diff --git a/org.aspectj.ajdt.core/scripts/makeparser.py b/org.aspectj.ajdt.core/scripts/makeparser.py
index 1b2af419125de86d4f5831f80dd6f14c5b0d9994..56ed3cf89489ef16143167d45d62f06a24904acf 100644 (file)
--- a/org.aspectj.ajdt.core/scripts/makeparser.py
+++ b/org.aspectj.ajdt.core/scripts/makeparser.py
@@ -3,7 +3,7 @@ eclipseWorkspace = "c:/eclipse/workspace"
 workingDir = "c:/apps/jikespg/jdt/tmp"
 
 jikespg = "c:/apps/jikespg/src/a.exe"
-makersc = "c:/jdk1.4/bin/java -classpath c:/eclipse/workspace/org.eclipse.jdt.core/bin;c:/apps/jikespg/jdt;c:/eclipse/workspace/bcweaver/bin UpdateParserFiles"
+makersc = "c:/jdk1.4/bin/java -classpath c:/eclipse/workspace/org.eclipse.jdt.core/bin;c:/apps/jikespg/jdt;c:/eclipse/workspace/weaver/bin UpdateParserFiles"
 
 # the rest of this should never change
 ajCompilerHomeRel = "org.aspectj.ajdt.core/src/"

diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/BuildArgParserTestCase.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/BuildArgParserTestCase.java
index e2d23f7a113c363d8d6d5359c2cb6b37e62bfad5..f55378088b6d9fbdd83843b14e031131c8fec3d3 100644 (file)
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/BuildArgParserTestCase.java
+++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/BuildArgParserTestCase.java
@@ -109,8 +109,8 @@ public class BuildArgParserTestCase extends TestCase {
        public void testAspectpath() throws InvalidInputException {
                final String SOURCE_JAR = "testdata/testclasses.jar";
                final String SOURCE_JARS = "testdata/testclasses.jar" + File.pathSeparator 
-                       + "../bcweaver/testdata/tracing.jar" + File.pathSeparator 
-                       + "../bcweaver/testdata/dummyAspect.jar";
+                       + "../weaver/testdata/tracing.jar" + File.pathSeparator 
+                       + "../weaver/testdata/dummyAspect.jar";
                AjBuildConfig config = parser.genBuildConfig(new String[] { 
                        "-aspectpath", SOURCE_JAR }, 
                        messageWriter);
@@ -126,8 +126,8 @@ public class BuildArgParserTestCase extends TestCase {
        public void testInJars() throws InvalidInputException {
                final String SOURCE_JAR = "testdata/testclasses.jar";
                final String SOURCE_JARS = "testdata/testclasses.jar" + File.pathSeparator 
-                       + "../bcweaver/testdata/tracing.jar" + File.pathSeparator 
-                       + "../bcweaver/testdata/dummyAspect.jar";
+                       + "../weaver/testdata/tracing.jar" + File.pathSeparator 
+                       + "../weaver/testdata/dummyAspect.jar";
                AjBuildConfig config = parser.genBuildConfig(new String[] { 
                        "-injars", SOURCE_JAR }, 
                        messageWriter);

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 7c232aa9601e59ffb7e2b10c5061d0ce2386ba8f..9f463c15c50b1a84d569e7d58541d9931cd19229 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
@@ -32,7 +32,7 @@ public class BcweaverJarMaker {
        public static void makeJar0() throws IOException {
                List args = new ArrayList();
                args.add("-outjar");
-               args.add("../bcweaver/testdata/tracing.jar");
+               args.add("../weaver/testdata/tracing.jar");
 
                args.add("-classpath");
                args.add("../runtime/bin");
@@ -46,7 +46,7 @@ public class BcweaverJarMaker {
        public static void makeJar1() throws IOException {
                List args = new ArrayList();
                args.add("-outjar");
-               args.add("../bcweaver/testdata/megatrace.jar");
+               args.add("../weaver/testdata/megatrace.jar");
 
                args.add("-classpath");
                args.add("../runtime/bin");
@@ -61,7 +61,7 @@ public class BcweaverJarMaker {
        public static void makeJar1a() throws IOException {
                List args = new ArrayList();
                args.add("-outjar");
-               args.add("../bcweaver/testdata/megatraceNoweave.jar");
+               args.add("../weaver/testdata/megatraceNoweave.jar");
 
                args.add("-noweave");
 
@@ -78,7 +78,7 @@ public class BcweaverJarMaker {
        public static void makeJar2() throws IOException {
                List args = new ArrayList();
                args.add("-outjar");
-               args.add("../bcweaver/testdata/dummyAspect.jar");
+               args.add("../weaver/testdata/dummyAspect.jar");
 
                args.add("-classpath");
                args.add("../runtime/bin");

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 d93baa03698d9dc087b4ef5028bcee5c5d8f3180..6b0cc37856577de8341e551a45b29d9e2fed4e5e 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
@@ -46,7 +46,7 @@ public class WorkingTestMain {
 //             args.add("testdata/testclasses.jar");
                
                //args.add("-aspectpath");
-               //args.add("../bcweaver/testdata/megatrace.jar");
+               //args.add("../weaver/testdata/megatrace.jar");
                
                //args.add("testdata/src1/AroundA1.java");
                args.add("../tests/new/StrictFPAdvice.java");

diff --git a/util/testsrc/org/aspectj/util/LangUtilTest.java b/util/testsrc/org/aspectj/util/LangUtilTest.java
index 98aab88ba3ca694dba575cdb05a22d2e668ae392..22a55f2959b530df5f6d4c2281e7bf38014c88f6 100644 (file)
--- a/util/testsrc/org/aspectj/util/LangUtilTest.java
+++ b/util/testsrc/org/aspectj/util/LangUtilTest.java
@@ -233,9 +233,9 @@ public class LangUtilTest extends TestCase {
         
         stackBuffer = new StringBuffer("java.lang.RuntimeException: unimplemented"
            + "\n at org.aspectj.ajdt.internal.core.builder.EclipseUnwovenClassFile.writeWovenBytes(EclipseUnwovenClassFile.java:59)"
-           + "\n at org.aspectj.bcweaver.bcel.BcelWeaver.dump(BcelWeaver.java:271)"
-           + "\n at org.aspectj.bcweaver.bcel.BcelWeaver.weave(BcelWeaver.java:233)"
-           + "\n at org.aspectj.bcweaver.bcel.BcelWeaver.weave(BcelWeaver.java:198)"
+           + "\n at org.aspectj.weaver.bcel.BcelWeaver.dump(BcelWeaver.java:271)"
+           + "\n at org.aspectj.weaver.bcel.BcelWeaver.weave(BcelWeaver.java:233)"
+           + "\n at org.aspectj.weaver.bcel.BcelWeaver.weave(BcelWeaver.java:198)"
            + "\n at org.aspectj.ajdt.internal.core.builder.AjBuildManager.weaveAndGenerateClassFiles(AjBuildanager.java:230)"
            + "\n at org.aspectj.ajdt.internal.core.builder.AjBuildManager.batchBuild(AjBuildManager.java:50)"
            + "\n at org.aspectj.ajdt.ajc.AjdtCommand.runCommand(AjdtCommand.java:42)"

diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/UtilityTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/UtilityTestCase.java
index a188567111dc8fc228f77a1fef18b3b212b33484..cc8100fd502f37857a234b95698caefc17132e33 100644 (file)
--- a/weaver/testsrc/org/aspectj/weaver/bcel/UtilityTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/UtilityTestCase.java
@@ -25,7 +25,7 @@ public class UtilityTestCase extends TestCase {
     }
 
     public void disassembleTest(String name) throws IOException {
-        BcelWorld world = new BcelWorld("../bcweaver/bin");
+        BcelWorld world = new BcelWorld("../weaver/bin");
         
         LazyClassGen clazz = new LazyClassGen((BcelObjectType) world.resolve(name));
         clazz.print();