rebuilt internal dependencies

diff --git a/bcel-builder/testsrc/Play.java b/bcel-builder/testsrc/Play.java
deleted file mode 100644 (file)
index 9fef2fa..0000000
--- a/bcel-builder/testsrc/Play.java
+++ /dev/null
@@ -1,84 +0,0 @@
-import java.io.File;
-import java.io.FileInputStream;
-
-import org.aspectj.apache.bcel.classfile.Attribute;
-import org.aspectj.apache.bcel.classfile.ClassParser;
-import org.aspectj.apache.bcel.classfile.Field;
-import org.aspectj.apache.bcel.classfile.JavaClass;
-import org.aspectj.apache.bcel.classfile.Method;
-import org.aspectj.apache.bcel.classfile.Unknown;
-import org.aspectj.apache.bcel.classfile.annotation.RuntimeAnnos;
-
-
-public class Play {
-       
-       public static void printBytes(byte[] bs) {
-               StringBuilder sb = new StringBuilder("Bytes:"+bs.length+"[");
-               for (int i=0;i<bs.length;i++) {
-                       if (i>0) sb.append(" ");
-                       sb.append(bs[i]);
-               }
-               sb.append("]");
-               System.out.println(sb);
-       }
-       
-       public static void main(String[] args) throws Exception {
-               if (args==null || args.length==0 ) {
-                       System.out.println("Specify a file");
-                       return;
-               }
-               if (!args[0].endsWith(".class")) {
-                       args[0] = args[0]+".class";
-               }
-               FileInputStream fis = new FileInputStream(new File(args[0]));
-               ClassParser cp = new ClassParser(fis,args[0]);
-               JavaClass jc = cp.parse();
-               Attribute[] attributes = jc.getAttributes();
-               printUsefulAttributes(attributes);
-               System.out.println("Fields");
-               Field[] fs = jc.getFields();
-               if (fs!=null) {
-                       for (Field f: fs) {
-                               System.out.println(f);
-                               printUsefulAttributes(f.getAttributes());
-                       }
-               }
-               System.out.println("Methods");
-               Method[] ms = jc.getMethods();
-               if (ms!=null) {
-                       for (Method m: ms) {
-                               System.out.println(m);
-                               printUsefulAttributes(m.getAttributes());
-                               System.out.println("Code attributes:");
-                               printUsefulAttributes(m.getCode().getAttributes());
-                       }
-               }
-//             Method[] ms = jc.getMethods();
-//             for (Method m: ms) {
-//                     System.out.println("==========");
-//                     System.out.println("Method: "+m.getName()+" modifiers=0x"+Integer.toHexString(m.getModifiers()));
-//                     Attribute[] as = m.getAttributes();
-//                     for (Attribute a: as) {
-//                             if (a.getName().toLowerCase().contains("synthetic")) {
-//                                     System.out.println("> "+a.getName());
-//                             }
-//                     }
-//             }
-       }
-
-       private static void printUsefulAttributes(Attribute[] attributes) throws Exception {
-               for (Attribute attribute: attributes) {
-                       String n = attribute.getName();
-                       if (n.equals("RuntimeInvisibleAnnotations") ||
-                               n.equals("RuntimeVisibleAnnotations")) {
-                               RuntimeAnnos ra = (RuntimeAnnos)attribute;
-                               // private byte[] annotation_data;
-                               java.lang.reflect.Field f = RuntimeAnnos.class.getDeclaredField("annotation_data");
-                               f.setAccessible(true);
-                               byte[] bs = (byte[])f.get(ra);
-//                             byte[] bs = unknown.getBytes();
-                               printBytes(bs);
-                       }
-               }
-       }
-}

diff --git a/bcel-builder/testsrc/org/aspectj/apache/bcel/util/Play.java b/bcel-builder/testsrc/org/aspectj/apache/bcel/util/Play.java
new file mode 100644 (file)
index 0000000..9fef2fa
--- /dev/null
+++ b/bcel-builder/testsrc/org/aspectj/apache/bcel/util/Play.java
@@ -0,0 +1,84 @@
+import java.io.File;
+import java.io.FileInputStream;
+
+import org.aspectj.apache.bcel.classfile.Attribute;
+import org.aspectj.apache.bcel.classfile.ClassParser;
+import org.aspectj.apache.bcel.classfile.Field;
+import org.aspectj.apache.bcel.classfile.JavaClass;
+import org.aspectj.apache.bcel.classfile.Method;
+import org.aspectj.apache.bcel.classfile.Unknown;
+import org.aspectj.apache.bcel.classfile.annotation.RuntimeAnnos;
+
+
+public class Play {
+       
+       public static void printBytes(byte[] bs) {
+               StringBuilder sb = new StringBuilder("Bytes:"+bs.length+"[");
+               for (int i=0;i<bs.length;i++) {
+                       if (i>0) sb.append(" ");
+                       sb.append(bs[i]);
+               }
+               sb.append("]");
+               System.out.println(sb);
+       }
+       
+       public static void main(String[] args) throws Exception {
+               if (args==null || args.length==0 ) {
+                       System.out.println("Specify a file");
+                       return;
+               }
+               if (!args[0].endsWith(".class")) {
+                       args[0] = args[0]+".class";
+               }
+               FileInputStream fis = new FileInputStream(new File(args[0]));
+               ClassParser cp = new ClassParser(fis,args[0]);
+               JavaClass jc = cp.parse();
+               Attribute[] attributes = jc.getAttributes();
+               printUsefulAttributes(attributes);
+               System.out.println("Fields");
+               Field[] fs = jc.getFields();
+               if (fs!=null) {
+                       for (Field f: fs) {
+                               System.out.println(f);
+                               printUsefulAttributes(f.getAttributes());
+                       }
+               }
+               System.out.println("Methods");
+               Method[] ms = jc.getMethods();
+               if (ms!=null) {
+                       for (Method m: ms) {
+                               System.out.println(m);
+                               printUsefulAttributes(m.getAttributes());
+                               System.out.println("Code attributes:");
+                               printUsefulAttributes(m.getCode().getAttributes());
+                       }
+               }
+//             Method[] ms = jc.getMethods();
+//             for (Method m: ms) {
+//                     System.out.println("==========");
+//                     System.out.println("Method: "+m.getName()+" modifiers=0x"+Integer.toHexString(m.getModifiers()));
+//                     Attribute[] as = m.getAttributes();
+//                     for (Attribute a: as) {
+//                             if (a.getName().toLowerCase().contains("synthetic")) {
+//                                     System.out.println("> "+a.getName());
+//                             }
+//                     }
+//             }
+       }
+
+       private static void printUsefulAttributes(Attribute[] attributes) throws Exception {
+               for (Attribute attribute: attributes) {
+                       String n = attribute.getName();
+                       if (n.equals("RuntimeInvisibleAnnotations") ||
+                               n.equals("RuntimeVisibleAnnotations")) {
+                               RuntimeAnnos ra = (RuntimeAnnos)attribute;
+                               // private byte[] annotation_data;
+                               java.lang.reflect.Field f = RuntimeAnnos.class.getDeclaredField("annotation_data");
+                               f.setAccessible(true);
+                               byte[] bs = (byte[])f.get(ra);
+//                             byte[] bs = unknown.getBytes();
+                               printBytes(bs);
+                       }
+               }
+       }
+}

diff --git a/lib/asm/asm-6.0_BETA.renamed.jar b/lib/asm/asm-6.0_BETA.renamed.jar
index 9fbae494bb6c44da566a1dbf5770c06e33083ab5..680ab773308383ab79031865b222df0ca81afb7f 100644 (file)
Binary files a/lib/asm/asm-6.0_BETA.renamed.jar and b/lib/asm/asm-6.0_BETA.renamed.jar differ

diff --git a/lib/asm/build.xml b/lib/asm/build.xml
index 07a5e986302ab50e5dfae710d7e9adfc6869c269..5f9693b56b93a84f6c07cb1922d250e47f05dde9 100644 (file)
--- a/lib/asm/build.xml
+++ b/lib/asm/build.xml
@@ -5,7 +5,7 @@
 
        <target name="package" description="Jarjar asm-5.0.4.jar and prefix package name with aj">
                <jarjar destfile="asm-6.0_BETA.renamed.jar">
-                 <zipfileset src="asm-6.0_BETA.jar"/>
+                 <zipfileset src="asm-6.0_BETA.jar" excludes="module-info.class"/>
                  <rule pattern="org.objectweb.asm.**" result="aj.org.objectweb.asm.@1"/>
                </jarjar>
        </target> 

diff --git a/lib/bcel/bcel-verifier.jar b/lib/bcel/bcel-verifier.jar
index 724cb9b991966397bdf35433752f9184e2dbc9ec..0153468a9a135796ae142640594b1b3069ae7c35 100644 (file)
Binary files a/lib/bcel/bcel-verifier.jar and b/lib/bcel/bcel-verifier.jar differ

diff --git a/lib/bcel/bcel.jar b/lib/bcel/bcel.jar
index 38ecbc51f4747a600b926aea51c9b4c0edec8ac8..acadafd3e956b8cb4d4f7cc149e19d747feeb4fb 100644 (file)
Binary files a/lib/bcel/bcel.jar and b/lib/bcel/bcel.jar differ

diff --git a/lib/build/build.jar b/lib/build/build.jar
index 8a6f93714091c382e12f9d003d54cb9ee6343d5a..a203ada4c12960e3da675d12d4cdd431f98c3382 100644 (file)
Binary files a/lib/build/build.jar and b/lib/build/build.jar differ

diff --git a/lib/test/aspectjrt.jar b/lib/test/aspectjrt.jar
index ef06aa7fde25abce3204973886a00967b36c86f9..f0c7d5f7cb4ba08673c11920c483873d1d2d0277 100644 (file)
Binary files a/lib/test/aspectjrt.jar and b/lib/test/aspectjrt.jar differ

diff --git a/tests/bugs190/modules/aaa/com/foo1/C1.java b/tests/bugs190/modules/aaa/com/foo1/C1.java
new file mode 100644 (file)
index 0000000..eb08784
--- /dev/null
+++ b/tests/bugs190/modules/aaa/com/foo1/C1.java
@@ -0,0 +1,3 @@
+package com.foo1;
+
+public class C1 {}

diff --git a/tests/bugs190/modules/aaa/module-info.java b/tests/bugs190/modules/aaa/module-info.java
new file mode 100644 (file)
index 0000000..b6bd694
--- /dev/null
+++ b/tests/bugs190/modules/aaa/module-info.java
@@ -0,0 +1,3 @@
+module e.f.g {
+  exports com.foo1;
+}

diff --git a/tests/bugs190/modules/bbb/aaa/bbb/A.java b/tests/bugs190/modules/bbb/aaa/bbb/A.java
new file mode 100644 (file)
index 0000000..09935dc
--- /dev/null
+++ b/tests/bugs190/modules/bbb/aaa/bbb/A.java
@@ -0,0 +1,7 @@
+package aaa.bbb;
+
+public class A {
+  public static void main(String []argv) {
+         System.out.println("A running");
+  }
+}

diff --git a/tests/bugs190/modules/bbb/module-info.java b/tests/bugs190/modules/bbb/module-info.java
new file mode 100644 (file)
index 0000000..60e9fdc
--- /dev/null
+++ b/tests/bugs190/modules/bbb/module-info.java
@@ -0,0 +1,3 @@
+module my.module {
+  exports aaa.bbb;
+}

diff --git a/tests/bugs190/modules/ccc/InvokeA.java b/tests/bugs190/modules/ccc/InvokeA.java
new file mode 100644 (file)
index 0000000..5c07384
--- /dev/null
+++ b/tests/bugs190/modules/ccc/InvokeA.java
@@ -0,0 +1,6 @@
+import aaa.bbb.A;
+public class InvokeA {
+       public static void main(String[] argv) {
+               A.main(argv);
+       }
+}

diff --git a/tests/bugs190/modules/ccc/aaa/bbb/A.java b/tests/bugs190/modules/ccc/aaa/bbb/A.java
new file mode 100644 (file)
index 0000000..09935dc
--- /dev/null
+++ b/tests/bugs190/modules/ccc/aaa/bbb/A.java
@@ -0,0 +1,7 @@
+package aaa.bbb;
+
+public class A {
+  public static void main(String []argv) {
+         System.out.println("A running");
+  }
+}

diff --git a/tests/bugs190/modules/ccc/module-info.java b/tests/bugs190/modules/ccc/module-info.java
new file mode 100644 (file)
index 0000000..60e9fdc
--- /dev/null
+++ b/tests/bugs190/modules/ccc/module-info.java
@@ -0,0 +1,3 @@
+module my.module {
+  exports aaa.bbb;
+}

diff --git a/tests/bugs190/modules/ddd/InvokeA.java b/tests/bugs190/modules/ddd/InvokeA.java
new file mode 100644 (file)
index 0000000..5c07384
--- /dev/null
+++ b/tests/bugs190/modules/ddd/InvokeA.java
@@ -0,0 +1,6 @@
+import aaa.bbb.A;
+public class InvokeA {
+       public static void main(String[] argv) {
+               A.main(argv);
+       }
+}

diff --git a/tests/bugs190/modules/ddd/aaa/bbb/A.java b/tests/bugs190/modules/ddd/aaa/bbb/A.java
new file mode 100644 (file)
index 0000000..09935dc
--- /dev/null
+++ b/tests/bugs190/modules/ddd/aaa/bbb/A.java
@@ -0,0 +1,7 @@
+package aaa.bbb;
+
+public class A {
+  public static void main(String []argv) {
+         System.out.println("A running");
+  }
+}

diff --git a/tests/bugs190/modules/ddd/module-info.java b/tests/bugs190/modules/ddd/module-info.java
new file mode 100644 (file)
index 0000000..57dd045
--- /dev/null
+++ b/tests/bugs190/modules/ddd/module-info.java
@@ -0,0 +1,2 @@
+module my.module {
+}

diff --git a/tests/bugs190/modules/eee/Azpect.java b/tests/bugs190/modules/eee/Azpect.java
new file mode 100644 (file)
index 0000000..5dd4aa3
--- /dev/null
+++ b/tests/bugs190/modules/eee/Azpect.java
@@ -0,0 +1,7 @@
+package aspects;
+
+public aspect Azpect {
+       before(): execution(* main(..)) {
+               System.out.println("Azpect running");
+       }
+}

diff --git a/tests/bugs190/modules/eee/aaa/bbb/A.java b/tests/bugs190/modules/eee/aaa/bbb/A.java
new file mode 100644 (file)
index 0000000..09935dc
--- /dev/null
+++ b/tests/bugs190/modules/eee/aaa/bbb/A.java
@@ -0,0 +1,7 @@
+package aaa.bbb;
+
+public class A {
+  public static void main(String []argv) {
+         System.out.println("A running");
+  }
+}

diff --git a/tests/bugs190/modules/eee/module-info.java b/tests/bugs190/modules/eee/module-info.java
new file mode 100644 (file)
index 0000000..60e9fdc
--- /dev/null
+++ b/tests/bugs190/modules/eee/module-info.java
@@ -0,0 +1,3 @@
+module my.module {
+  exports aaa.bbb;
+}

diff --git a/tests/bugs190/modules/fff/aspects.jar b/tests/bugs190/modules/fff/aspects.jar
new file mode 100644 (file)
index 0000000..246cab5
Binary files /dev/null and b/tests/bugs190/modules/fff/aspects.jar differ

diff --git a/tests/bugs190/modules/fff/demo.jar b/tests/bugs190/modules/fff/demo.jar
new file mode 100644 (file)
index 0000000..f00e033
Binary files /dev/null and b/tests/bugs190/modules/fff/demo.jar differ

diff --git a/tests/bugs190/modules/fff/extra/AnotherAzpect.java b/tests/bugs190/modules/fff/extra/AnotherAzpect.java
new file mode 100644 (file)
index 0000000..16b8c16
--- /dev/null
+++ b/tests/bugs190/modules/fff/extra/AnotherAzpect.java
@@ -0,0 +1,7 @@
+package extra;
+
+public aspect AnotherAzpect {
+               before(): execution(* *(..)) && !within(*Azpect) {
+                                       System.out.println("AnotherAzpect running");
+                                               }
+}

diff --git a/tests/bugs190/modules/fff/module-info.java b/tests/bugs190/modules/fff/module-info.java
new file mode 100644 (file)
index 0000000..6f03752
--- /dev/null
+++ b/tests/bugs190/modules/fff/module-info.java
@@ -0,0 +1,4 @@
+module demo {
+       exports pkg;
+       requires org.aspectj.runtime;
+}

diff --git a/tests/bugs190/modules/fff/newdemo.jar b/tests/bugs190/modules/fff/newdemo.jar
new file mode 100644 (file)
index 0000000..c32ca37
Binary files /dev/null and b/tests/bugs190/modules/fff/newdemo.jar differ

diff --git a/tests/bugs190/modules/fff/otherpkg/Azpect.java b/tests/bugs190/modules/fff/otherpkg/Azpect.java
new file mode 100644 (file)
index 0000000..af53fdf
--- /dev/null
+++ b/tests/bugs190/modules/fff/otherpkg/Azpect.java
@@ -0,0 +1,7 @@
+package otherpkg;
+
+public aspect Azpect {
+       before(): execution(* *(..)) && !within(Azpect) {
+               System.out.println("Azpect running");
+       }
+}

diff --git a/tests/bugs190/modules/fff/pkg/Demo.java b/tests/bugs190/modules/fff/pkg/Demo.java
new file mode 100644 (file)
index 0000000..6945950
--- /dev/null
+++ b/tests/bugs190/modules/fff/pkg/Demo.java
@@ -0,0 +1,6 @@
+package pkg;
+public class Demo {
+       public static void main(String[] argv) {
+               System.out.println("Demo running");
+       }
+}

diff --git a/tests/bugs190/modules/module1/a/b/c/Code.class b/tests/bugs190/modules/module1/a/b/c/Code.class
deleted file mode 100644 (file)
index 5d5e514..0000000
Binary files a/tests/bugs190/modules/module1/a/b/c/Code.class and /dev/null differ

diff --git a/tests/bugs190/modules/module1/module-info.class b/tests/bugs190/modules/module1/module-info.class
deleted file mode 100644 (file)
index 0088bd1..0000000
Binary files a/tests/bugs190/modules/module1/module-info.class and /dev/null differ