Remove BCEL files from 'lib' module

Both bcel.jar and bcel-verifier.jar seem to be obsolete.

Possible next step: Remove bcel-builder/verifier-src.

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>

diff --git a/lib/bcel/bcel-src.zip b/lib/bcel/bcel-src.zip
deleted file mode 100644 (file)
index a6f847d..0000000
Binary files a/lib/bcel/bcel-src.zip and /dev/null differ

diff --git a/lib/bcel/bcel-verifier-src.zip b/lib/bcel/bcel-verifier-src.zip
deleted file mode 100644 (file)
index 916e947..0000000
Binary files a/lib/bcel/bcel-verifier-src.zip and /dev/null differ

diff --git a/lib/bcel/bcel-verifier.jar b/lib/bcel/bcel-verifier.jar
deleted file mode 100644 (file)
index 41471b1..0000000
Binary files a/lib/bcel/bcel-verifier.jar and /dev/null differ

diff --git a/lib/bcel/bcel.jar b/lib/bcel/bcel.jar
deleted file mode 100644 (file)
index d5cbf14..0000000
Binary files a/lib/bcel/bcel.jar and /dev/null differ

diff --git a/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java
index b76fe4ee01386a6da95921d99e225eb4748383d7..bc934815c278b855d6eb01f60914d77745dcaf12 100644 (file)
--- a/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java
@@ -104,8 +104,6 @@ public abstract class AjcTestCase extends TestCase {
        public static final String DEFAULT_CLASSPATH_ENTRIES =
                DEFAULT_FULL_LTW_CLASSPATH_ENTRIES
                        + Ajc.outputFolders("bridge", "util", "loadtime", "weaver", "asm", "runtime", "org.aspectj.matcher", "bcel-builder")
-                       + pathSeparator + ".." + separator + "lib" + separator + "bcel" + separator + "bcel.jar"
-                       + pathSeparator + ".." + separator + "lib" + separator + "bcel" + separator + "bcel-verifier.jar"
                        + pathSeparator + CLASSPATH_JDT_CORE
                        + pathSeparator + CLASSPATH_ASM
                        + pathSeparator + CLASSPATH_ASM_COMMONS

diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc150/ajc150.xml
index 6ce13fb0df09325c465ea7414ff898fef3c50001..138ca57ab482cdd5a869de594163aa59976b296d 100644 (file)
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -361,12 +361,12 @@
 
        <ajc-test dir="java5/reflection" title="pointcut parsing with ajc compiled pointcut references">
                <compile files="PointcutLibrary.aj,ReflectOnAjcCompiledPointcuts.java" options="-1.5"/>
-               <run class="ReflectOnAjcCompiledPointcuts" classpath="../lib/bcel/bcel.jar"/>
+               <run class="ReflectOnAjcCompiledPointcuts"/>
        </ajc-test>
 
        <ajc-test dir="java5/reflection" title="reflection on itds">
                <compile files="InterTypeDeclarations.aj,ReflectOnCodeStyleITDs.java" options="-1.5 -Xlint:ignore -makeAjReflectable"/>
-               <run class="ReflectOnCodeStyleITDs" classpath="../lib/bcel/bcel.jar">
+               <run class="ReflectOnCodeStyleITDs">
                  <stdout>
                        <line text="public C.new(int, int, int)"/>
                        <line text="C.new(int, int)"/>
@@ -400,7 +400,7 @@
 
        <ajc-test dir="java5/reflection" title="reflection on @DeclareParents">
                <compile files="AtAspectJDeclareParents.aj,ReflectOnAtAspectJDeclareParents.java" options="-1.5 -Xlint:ignore"/>
-               <run class="ReflectOnAtAspectJDeclareParents" classpath="../lib/bcel/bcel.jar">
+               <run class="ReflectOnAtAspectJDeclareParents">
                  <stdout>
                    <line text="declare parents : C implements I"/>
                        <line text="public int I.getX()"/>

diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc150/ataspectj/annotationgen.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc150/ataspectj/annotationgen.xml
index fd9d2c1119234ddaa662525036ceb7f5db883abe..0de24e3e0e47f720fea31296e79d112ebaa62e6e 100644 (file)
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc150/ataspectj/annotationgen.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/ajc150/ataspectj/annotationgen.xml
@@ -146,7 +146,7 @@
    <ajc-test dir="java5/ataspectj/annotationGen" title="runtime pointcut resolution referencing compiled pointcuts">
         <compile files="PCLib.aj,RuntimePointcuts.java" options="-1.5">
         </compile>
-        <run class="RuntimePointcuts" classpath=".,../lib/bcel/bcel.jar" ltw=""/>
+        <run class="RuntimePointcuts"/>
     </ajc-test>
 
    <ajc-test dir="java5/ataspectj/annotationGen" title="ann gen for decp">

diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc190/ajc190_from150.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc190/ajc190_from150.xml
index 79a9424478bc526bb3111559f412d403a8865ea5..d21ecf8e6e9f01f998672ec651f61c48e1d39b79 100644 (file)
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc190/ajc190_from150.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/ajc190/ajc190_from150.xml
@@ -361,12 +361,12 @@
 
        <ajc-test dir="java5/reflection" title="pointcut parsing with ajc compiled pointcut references">
                <compile files="PointcutLibrary.aj,ReflectOnAjcCompiledPointcuts.java" options="-1.9"/>
-               <run class="ReflectOnAjcCompiledPointcuts" classpath="../lib/bcel/bcel.jar"/>
+               <run class="ReflectOnAjcCompiledPointcuts"/>
        </ajc-test>
 
        <ajc-test dir="java5/reflection" title="reflection on itds">
                <compile files="InterTypeDeclarations.aj,ReflectOnCodeStyleITDs.java" options="-1.9 -Xlint:ignore -makeAjReflectable"/>
-               <run class="ReflectOnCodeStyleITDs" classpath="../lib/bcel/bcel.jar">
+               <run class="ReflectOnCodeStyleITDs">
                  <stdout>
                        <line text="public C.new(int, int, int)"/>
                        <line text="C.new(int, int)"/>
@@ -400,7 +400,7 @@
 
        <ajc-test dir="java5/reflection" title="reflection on @DeclareParents">
                <compile files="AtAspectJDeclareParents.aj,ReflectOnAtAspectJDeclareParents.java" options="-1.9 -Xlint:ignore"/>
-               <run class="ReflectOnAtAspectJDeclareParents" classpath="../lib/bcel/bcel.jar">
+               <run class="ReflectOnAtAspectJDeclareParents">
                  <stdout>
                    <line text="declare parents : C implements I"/>
                        <line text="public int I.getX()"/>

diff --git a/weaver/src/test/java/org/aspectj/weaver/bcel/ZipTestCase.java b/weaver/src/test/java/org/aspectj/weaver/bcel/ZipTestCase.java
index ccce12c41609a1252ab86165199bfa58bbef086a..dbdc35b460784753c57598b43a2f44b9e89c7080 100644 (file)
--- a/weaver/src/test/java/org/aspectj/weaver/bcel/ZipTestCase.java
+++ b/weaver/src/test/java/org/aspectj/weaver/bcel/ZipTestCase.java
@@ -99,23 +99,27 @@ public class ZipTestCase extends TestCase {
 
        public void testBig() throws IOException {
                System.out.println("could take 4 seconds...");
-               zipTest("../lib/bcel/bcel.jar", null);
+               // Weave a big JAR file. This is unrelated to Ant, i.e. the JAR can be replaced by another one for this test.
+               zipTest("../lib/ant/lib/ant.jar", null);
        }
 
        public void testBigWithEasyNoTrace() throws IOException {
                System.out.println("could take 4 seconds...");
-               zipTest("../lib/bcel/bcel.jar", WeaverTestCase.TESTDATA_PATH + "/megatrace0easy.jar");
+               // Weave a big JAR file. This is unrelated to Ant, i.e. the JAR can be replaced by another one for this test.
+               zipTest("../lib/ant/lib/ant.jar", WeaverTestCase.TESTDATA_PATH + "/megatrace0easy.jar");
        }
 
        // this is something we test every now and again.
        public void xtestBigWithHardNoTrace() throws IOException {
                System.out.println("could take 24 seconds...");
-               zipTest("../lib/bcel/bcel.jar", WeaverTestCase.TESTDATA_PATH + "/megatrace0hard.jar");
+               // Weave a big JAR file. This is unrelated to Ant, i.e. the JAR can be replaced by another one for this test.
+               zipTest("../lib/ant/lib/ant.jar", WeaverTestCase.TESTDATA_PATH + "/megatrace0hard.jar");
        }
 
        public void xtestBigWithAspects() throws IOException {
                System.out.println("could take 40 seconds...");
-               zipTest("../lib/bcel/bcel.jar", WeaverTestCase.TESTDATA_PATH + "/megatrace.jar");
+               // Weave a big JAR file. This is unrelated to Ant, i.e. the JAR can be replaced by another one for this test.
+               zipTest("../lib/ant/lib/ant.jar", WeaverTestCase.TESTDATA_PATH + "/megatrace.jar");
        }
 
 }