From c3472c7ced31834873429a8688607e0460432686 Mon Sep 17 00:00:00 2001 From: ehilsdal Date: Mon, 16 Dec 2002 21:17:56 +0000 Subject: [PATCH] Changing string constant for classDir, since the package changed names (correctly) to "weaver" --- org.aspectj.ajdt.core/scripts/makeparser.py | 2 +- .../org/aspectj/ajdt/ajc/BuildArgParserTestCase.java | 8 ++++---- .../ajdt/internal/compiler/batch/BcweaverJarMaker.java | 8 ++++---- .../ajdt/internal/compiler/batch/WorkingTestMain.java | 2 +- util/testsrc/org/aspectj/util/LangUtilTest.java | 6 +++--- .../testsrc/org/aspectj/weaver/bcel/UtilityTestCase.java | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/org.aspectj.ajdt.core/scripts/makeparser.py b/org.aspectj.ajdt.core/scripts/makeparser.py index 1b2af4191..56ed3cf89 100644 --- 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 e2d23f7a1..f55378088 100644 --- 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 7c232aa96..9f463c15c 100644 --- 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 d93baa036..6b0cc3785 100644 --- 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 98aab88ba..22a55f295 100644 --- 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 a18856711..cc8100fd5 100644 --- 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(); -- 2.39.5