fixes for annotation type pattern bugs uncovered in 150 tests

23 files changed, 31 insertions, 22 deletions

diff --git a/tests/bugs/StringToString/helloworld.jar b/tests/bugs/StringToString/helloworld.jar
index 28c795faa..06fd1c15d 100644
--- a/tests/bugs/StringToString/helloworld.jar
+++ b/tests/bugs/StringToString/helloworld.jar
diff --git a/tests/bugs/serialVersionUID/injar.jar b/tests/bugs/serialVersionUID/injar.jar
index 91e89e700..75a50e57e 100644
--- a/tests/bugs/serialVersionUID/injar.jar
+++ b/tests/bugs/serialVersionUID/injar.jar
diff --git a/tests/java5/annotations/ajdkExamples/AnnotationsInSignaturePatterns.aj b/tests/java5/annotations/ajdkExamples/AnnotationsInSignaturePatterns.aj
index 066eaef84..86bfbe415 100644
--- a/tests/java5/annotations/ajdkExamples/AnnotationsInSignaturePatterns.aj
+++ b/tests/java5/annotations/ajdkExamples/AnnotationsInSignaturePatterns.aj
@@ -1,4 +1,4 @@
-import org.xyz.*;
+import org.xyz.*; import anns.*;
 //import org.abc.*;
 import java.util.List;
 
diff --git a/tests/java5/annotations/ajdkExamples/AnnotationsInTypePatterns.aj b/tests/java5/annotations/ajdkExamples/AnnotationsInTypePatterns.aj
index 2348bce73..37469f5e7 100644
--- a/tests/java5/annotations/ajdkExamples/AnnotationsInTypePatterns.aj
+++ b/tests/java5/annotations/ajdkExamples/AnnotationsInTypePatterns.aj
@@ -1,4 +1,4 @@
-import org.xyz.*;
+import org.xyz.*; import anns.*;
 import org.abc.*;
 import java.lang.annotation.Inherited;
 
diff --git a/tests/java5/annotations/ajdkExamples/Cachable.java b/tests/java5/annotations/ajdkExamples/Cachable.java
deleted file mode 100644
index 9cff589ce..000000000
--- a/tests/java5/annotations/ajdkExamples/Cachable.java
+++ /dev/null
@@ -1 +0,0 @@
-public @interface Cachable {}
\ No newline at end of file
diff --git a/tests/java5/annotations/ajdkExamples/Immutable.java b/tests/java5/annotations/ajdkExamples/Immutable.java
deleted file mode 100644
index 6a81edf5c..000000000
--- a/tests/java5/annotations/ajdkExamples/Immutable.java
+++ /dev/null
@@ -1 +0,0 @@
-public @interface Immutable {}
\ No newline at end of file
diff --git a/tests/java5/annotations/ajdkExamples/Persisted.java b/tests/java5/annotations/ajdkExamples/Persisted.java
deleted file mode 100644
index 28eb9a4ae..000000000
--- a/tests/java5/annotations/ajdkExamples/Persisted.java
+++ /dev/null
@@ -1 +0,0 @@
-public @interface Persisted {}
\ No newline at end of file
diff --git a/tests/java5/annotations/ajdkExamples/SensitiveData.java b/tests/java5/annotations/ajdkExamples/SensitiveData.java
deleted file mode 100644
index 71a64d4de..000000000
--- a/tests/java5/annotations/ajdkExamples/SensitiveData.java
+++ /dev/null
@@ -1 +0,0 @@
-public @interface SensitiveData {}
\ No newline at end of file
diff --git a/tests/java5/annotations/ajdkExamples/Transaction.java b/tests/java5/annotations/ajdkExamples/Transaction.java
deleted file mode 100644
index e41e0dd98..000000000
--- a/tests/java5/annotations/ajdkExamples/Transaction.java
+++ /dev/null
@@ -1 +0,0 @@
-public @interface Transaction {}
\ No newline at end of file
diff --git a/tests/java5/annotations/ajdkExamples/anns/Cachable.java b/tests/java5/annotations/ajdkExamples/anns/Cachable.java
new file mode 100644
index 000000000..9e83a32de
--- /dev/null
+++ b/tests/java5/annotations/ajdkExamples/anns/Cachable.java
@@ -0,0 +1,2 @@
+package anns;
+public @interface Cachable {}
\ No newline at end of file
diff --git a/tests/java5/annotations/ajdkExamples/anns/Immutable.java b/tests/java5/annotations/ajdkExamples/anns/Immutable.java
new file mode 100644
index 000000000..ce513836f
--- /dev/null
+++ b/tests/java5/annotations/ajdkExamples/anns/Immutable.java
@@ -0,0 +1,2 @@
+package anns;
+public @interface Immutable {}
\ No newline at end of file
diff --git a/tests/java5/annotations/ajdkExamples/NonPersistent.java b/tests/java5/annotations/ajdkExamples/anns/NonPersistent.java
index 6510066c1..88fea3793 100644
--- a/tests/java5/annotations/ajdkExamples/NonPersistent.java
+++ b/tests/java5/annotations/ajdkExamples/anns/NonPersistent.java
@@ -1,3 +1,4 @@
+package anns;
 import java.lang.annotation.Inherited;
 
 @Inherited
diff --git a/tests/java5/annotations/ajdkExamples/anns/Persisted.java b/tests/java5/annotations/ajdkExamples/anns/Persisted.java
new file mode 100644
index 000000000..6ddf03086
--- /dev/null
+++ b/tests/java5/annotations/ajdkExamples/anns/Persisted.java
@@ -0,0 +1,2 @@
+package anns;
+public @interface Persisted {}
\ No newline at end of file
diff --git a/tests/java5/annotations/ajdkExamples/anns/SensitiveData.java b/tests/java5/annotations/ajdkExamples/anns/SensitiveData.java
new file mode 100644
index 000000000..3919a9177
--- /dev/null
+++ b/tests/java5/annotations/ajdkExamples/anns/SensitiveData.java
@@ -0,0 +1,2 @@
+package anns;
+public @interface SensitiveData {}
\ No newline at end of file
diff --git a/tests/java5/annotations/ajdkExamples/anns/Transaction.java b/tests/java5/annotations/ajdkExamples/anns/Transaction.java
new file mode 100644
index 000000000..37124cbef
--- /dev/null
+++ b/tests/java5/annotations/ajdkExamples/anns/Transaction.java
@@ -0,0 +1,2 @@
+package anns;
+public @interface Transaction {}
\ No newline at end of file
diff --git a/tests/java5/annotations/ajdkExamples/org/abc/Types.java b/tests/java5/annotations/ajdkExamples/org/abc/Types.java
index b0ed7f8e0..ba8b20140 100644
--- a/tests/java5/annotations/ajdkExamples/org/abc/Types.java
+++ b/tests/java5/annotations/ajdkExamples/org/abc/Types.java
@@ -1,4 +1,4 @@
-
+package org.abc; import anns.*;
 class E {}
 
 @Immutable
diff --git a/tests/java5/annotations/ajdkExamples/org/xyz/OrgXYZAnnotation.java b/tests/java5/annotations/ajdkExamples/org/xyz/OrgXYZAnnotation.java
index 963617cbb..04f5e4a2d 100644
--- a/tests/java5/annotations/ajdkExamples/org/xyz/OrgXYZAnnotation.java
+++ b/tests/java5/annotations/ajdkExamples/org/xyz/OrgXYZAnnotation.java
@@ -1 +1,2 @@
+package org.xyz;
 public @interface OrgXYZAnnotation {}
\ No newline at end of file
diff --git a/tests/java5/annotations/ajdkExamples/org/xyz/SignatureTypes.java b/tests/java5/annotations/ajdkExamples/org/xyz/SignatureTypes.java
index d37157439..ae94e447c 100644
--- a/tests/java5/annotations/ajdkExamples/org/xyz/SignatureTypes.java
+++ b/tests/java5/annotations/ajdkExamples/org/xyz/SignatureTypes.java
@@ -1,3 +1,4 @@
+package org.xyz; import anns.*;
 import java.util.List;
 import java.util.ArrayList;
 
diff --git a/tests/java5/annotations/ajdkExamples/org/xyz/Types.java b/tests/java5/annotations/ajdkExamples/org/xyz/Types.java
index 4d0339328..769f02bfc 100644
--- a/tests/java5/annotations/ajdkExamples/org/xyz/Types.java
+++ b/tests/java5/annotations/ajdkExamples/org/xyz/Types.java
@@ -1,4 +1,4 @@
-
+package org.xyz; import anns.*;
 @Immutable
 class C {}
 
diff --git a/tests/new/options11/aspectlib1.jar b/tests/new/options11/aspectlib1.jar
index 9a66d122d..680a8f76d 100644
--- a/tests/new/options11/aspectlib1.jar
+++ b/tests/new/options11/aspectlib1.jar
diff --git a/tests/new/options11/aspectlib2.jar b/tests/new/options11/aspectlib2.jar
index fd8451d86..cab875dee 100644
--- a/tests/new/options11/aspectlib2.jar
+++ b/tests/new/options11/aspectlib2.jar
diff --git a/tests/new/options11/injar.jar b/tests/new/options11/injar.jar
index fe0827863..429473b8e 100644
--- a/tests/new/options11/injar.jar
+++ b/tests/new/options11/injar.jar
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index 1cda2c53f..4ef1703da 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -1052,7 +1052,7 @@
     </ajc-test>
 
     <ajc-test dir="java5/annotations/ajdkExamples" title="ajdk: annotation type pattern matching">
-        <compile files="AnnotationsInTypePatterns.aj,org/xyz/OrgXYZAnnotation.java,org/xyz/Types.java,org/abc/Types.java,Immutable.java,NonPersistent.java" options="-1.5">
+        <compile files="AnnotationsInTypePatterns.aj,org/xyz/OrgXYZAnnotation.java,org/xyz/Types.java,org/abc/Types.java,anns/Immutable.java,anns/NonPersistent.java" options="-1.5">
             <message kind="warning" line="23" text="(@Immutable *)"/>
             <message kind="warning" line="32" text="(@Immutable *)"/>
             <message kind="warning" line="3" text="(@Immutable *)"/>
@@ -1064,8 +1064,8 @@
             <message kind="warning" line="5" text="(!@Immutable *)"/>
             <message kind="warning" line="6" text="(!@Immutable *)"/>
             <message kind="warning" line="2" text="(!@Immutable *)"/>
-            <message kind="warning" line="1" text="(!@Immutable *)"/>
-            <message kind="warning" line="4" text="(!@Immutable *)"/>
+            <message kind="warning" line="2" text="(!@Immutable *)"/>
+            <message kind="warning" line="5" text="(!@Immutable *)"/>
             <message kind="warning" line="3" text="@Immutable (org.xyz.* || org.abc.*)"/>
             <message kind="warning" line="5" text="@Immutable (org.xyz.* || org.abc.*)"/>
             <message kind="warning" line="8" text="@Immutable (org.xyz.* || org.abc.*)"/>
@@ -1076,22 +1076,23 @@
             <message kind="warning" line="8" text="@(Immutable || NonPersistent) org.xyz..*"/>
             <message kind="warning" line="8" text="@Immutable @NonPersistent org.xyz..*"/>
             <message kind="warning" line="6" text="@(@Inherited *) org.xyz..*"/>
+            <message kind="warning" line="8" text="@(@Inherited *) org.xyz..*"/>            
         </compile>
     </ajc-test>
 
     <ajc-test dir="java5/annotations/ajdkExamples" title="ajdk: annotations in sig patterns">
-        <compile files="AnnotationsInSignaturePatterns.aj,Cachable.java,SensitiveData.java,Persisted.java,Classified.java,Immutable.java,Secure.java,Catastrophic.java,Oneway.java,Transaction.java,org/xyz/SignatureTypes.java" options="-1.5">
+        <compile files="AnnotationsInSignaturePatterns.aj,anns/Cachable.java,anns/SensitiveData.java,anns/Persisted.java,Classified.java,anns/Immutable.java,Secure.java,Catastrophic.java,Oneway.java,anns/Transaction.java,org/xyz/SignatureTypes.java" options="-1.5">
             <message kind="warning" line="32" text="@SensitiveData * *"/>
-            <message kind="warning" line="6" text="@SensitiveData * *"/>
-            <message kind="warning" line="12" text="@SensitiveData * *"/>
-            <message kind="warning" line="6" text="@SensitiveData List org.xyz..*.*"/>
-            <message kind="warning" line="10" text="(@SensitiveData *) org.xyz..*.*"/>
-            <message kind="warning" line="12" text="(@SensitiveData *) org.xyz..*.*"/>
+            <message kind="warning" line="7" text="@SensitiveData * *"/>
+            <message kind="warning" line="13" text="@SensitiveData * *"/>
+            <message kind="warning" line="7" text="@SensitiveData List org.xyz..*.*"/>
+            <message kind="warning" line="11" text="(@SensitiveData *) org.xyz..*.*"/>
+            <message kind="warning" line="13" text="(@SensitiveData *) org.xyz..*.*"/>
             <message kind="warning" line="50" text="@Foo (@Goo *) (@Hoo *).*"/>
             <message kind="warning" line="38" text="@Persisted @Classified * *"/>
             
             <message kind="warning" line="44" text="@Oneway * *(..)"/>
-            <message kind="warning" line="17" text="@Transaction * (@Persisted org.xyz..*).*(..)"/>
+            <message kind="warning" line="18" text="@Transaction * (@Persisted org.xyz..*).*(..)"/>
             <message kind="warning" line="52" text="* *.*(@Immutable *,..)"/>
             <message kind="warning" line="53" text="* *.*(@Immutable *,..)"/>
             <message kind="warning" line="54" text="* *.*(@Immutable *,..)"/>
@@ -1099,10 +1100,10 @@
             <message kind="warning" line="62" text="within(@Secure *)"/>
             <message kind="warning" line="63" text="within(@Secure *)"/>
             <message kind="warning" line="66" text="staticinitialization(@Persisted *)"/>
-            <message kind="warning" line="16" text="staticinitialization(@Persisted *)"/>
+            <message kind="warning" line="17" text="staticinitialization(@Persisted *)"/>
             <message kind="warning" line="56" text="call(@Oneway * *(..))"/>
-            <message kind="warning" line="27" text="execution(public (@Immutable *) org.xyz..*.*(..))"/>
-            <message kind="warning" line="25" text="set(@Cachable * *)"/>
+            <message kind="warning" line="28" text="execution(public (@Immutable *) org.xyz..*.*(..))"/>
+            <message kind="warning" line="26" text="set(@Cachable * *)"/>
             <message kind="warning" line="80" text="handler(!@Catastrophic *)"/>
             
         </compile>