From 65203fe6d322fdea276a0d6d2943cb6fa39aa9d1 Mon Sep 17 00:00:00 2001
From: Andy Clement <aclement@pivotal.io>
Date: Thu, 31 Jan 2019 11:59:49 -0800
Subject: [PATCH] mavenizing tests - done

---
 tests/pom.xml                                 |   20 +
 .../java/org/aspectj/systemtest/AllTests.java |   19 +-
 .../systemtest/ajc10x/ajc10x-tests.xml        | 2013 ------
 .../org/aspectj/systemtest/ajc10x/ajc10x.xml  |    9 -
 .../aspectj/systemtest/ajc11/ajc11-tests.xml  |  850 ---
 .../org/aspectj/systemtest/ajc11/ajc11.xml    |   10 -
 .../systemtest/ajc120/Ajc120Tests.java        |    3 +-
 .../systemtest/ajc120/ajc120-tests.xml        |  482 --
 .../org/aspectj/systemtest/ajc120/ajc120.xml  |   11 -
 .../systemtest/ajc121/Ajc121Tests.java        |    4 -
 .../systemtest/ajc121/ajc121-tests.xml        |  494 --
 .../org/aspectj/systemtest/ajc121/ajc121.xml  |   12 -
 .../systemtest/ajc150/Annotations.java        |    2 +-
 .../org/aspectj/systemtest/ajc150/ajc150.xml  | 6308 -----------------
 .../ajc150/ataspectj/annotationgen.xml        |  187 -
 .../ajc150/ataspectj/coverage/coverage.xml    |  320 -
 .../systemtest/ajc150/ataspectj/ltw.xml       |  349 -
 .../systemtest/ajc150/ataspectj/misuse.xml    |  146 -
 .../systemtest/ajc150/ataspectj/syntax.xml    |  202 -
 .../systemtest/ajc150/ltw/LTWTests.java       |    2 +-
 .../systemtest/ajc150/ltw/ltw-tests.xml       |  670 --
 .../org/aspectj/systemtest/ajc150/ltw/ltw.xml |   11 -
 .../org/aspectj/systemtest/ajc151/ajc151.xml  |  414 --
 .../aspectj/systemtest/ajc151/ataround.xml    |  379 -
 .../systemtest/ajc151/newarray_joinpoint.xml  |  165 -
 .../systemtest/ajc151/serialversionuid.xml    |   51 -
 .../org/aspectj/systemtest/ajc152/ajc152.xml  |  777 --
 .../systemtest/ajc152/synchronization.xml     |  650 --
 .../org/aspectj/systemtest/ajc153/ajc153.xml  |  886 ---
 .../ajc153/jdtlikehandleprovider.xml          |  256 -
 .../aspectj/systemtest/ajc153/pipelining.xml  |   72 -
 .../org/aspectj/systemtest/ajc154/ajc154.xml  |  491 --
 .../org/aspectj/systemtest/ajc160/ajc160.xml  |  187 -
 .../ajc160/annotationValueMatching.xml        |  148 -
 .../systemtest/ajc160/newfeatures-tests.xml   |   37 -
 .../ajc160/parameterAnnotations.xml           |  149 -
 .../systemtest/ajc160/sanity-tests.xml        |   76 -
 .../org/aspectj/systemtest/ajc161/ajc161.xml  |  321 -
 .../ajc161/annotationFieldBinding.xml         |  127 -
 .../aspectj/systemtest/ajc1610/ajc1610.xml    |   76 -
 .../systemtest/ajc1610/newfeatures-tests.xml  |  113 -
 .../aspectj/systemtest/ajc1611/ajc1611.xml    |  172 -
 .../systemtest/ajc1611/newfeatures-tests.xml  |  139 -
 .../aspectj/systemtest/ajc1612/ajc1612.xml    |  755 --
 .../org/aspectj/systemtest/ajc162/ajc162.xml  |  336 -
 .../org/aspectj/systemtest/ajc163/ajc163.xml  |  354 -
 .../org/aspectj/systemtest/ajc164/ajc164.xml  |  278 -
 .../systemtest/ajc164/declareMixin.xml        |  173 -
 .../aspectj/systemtest/ajc164/joinpointid.xml |   19 -
 .../org/aspectj/systemtest/ajc165/ajc165.xml  |  117 -
 .../org/aspectj/systemtest/ajc165/world.xml   |    5 -
 .../org/aspectj/systemtest/ajc166/ajc166.xml  |  147 -
 .../org/aspectj/systemtest/ajc167/ajc167.xml  |  143 -
 .../aspectj/systemtest/ajc167/intertype.xml   |   41 -
 .../aspectj/systemtest/ajc167/overweaving.xml |  198 -
 .../org/aspectj/systemtest/ajc169/ajc169.xml  |  413 --
 .../aspectj/systemtest/ajc169/intertype.xml   |  249 -
 .../systemtest/ajc169/transparentweaving.xml  |   68 -
 .../systemtest/ajc170/Ajc170Tests.java        |    2 +-
 .../org/aspectj/systemtest/ajc170/ajc170.xml  |  398 --
 .../org/aspectj/systemtest/ajc170/indy.xml    |   59 -
 .../org/aspectj/systemtest/ajc171/ajc171.xml  |  116 -
 .../systemtest/ajc171/newfeatures-tests.xml   |   41 -
 .../org/aspectj/systemtest/ajc172/ajc172.xml  |  204 -
 .../org/aspectj/systemtest/ajc173/ajc173.xml  |   90 -
 .../org/aspectj/systemtest/ajc174/ajc174.xml  |  212 -
 .../org/aspectj/systemtest/ajc175/ajc175.xml  |   19 -
 .../org/aspectj/systemtest/ajc180/ajc180.xml  |   55 -
 .../org/aspectj/systemtest/ajc181/ajc181.xml  |   34 -
 .../aspectj/systemtest/ajc1810/ajc1810.xml    |  110 -
 .../aspectj/systemtest/ajc1811/ajc1811.xml    |   46 -
 .../org/aspectj/systemtest/ajc182/tests.xml   |   18 -
 .../org/aspectj/systemtest/ajc183/ajc183.xml  |  182 -
 .../org/aspectj/systemtest/ajc184/ajc184.xml  |  198 -
 .../org/aspectj/systemtest/ajc185/ajc185.xml  |   34 -
 .../org/aspectj/systemtest/ajc186/ajc186.xml  |   25 -
 .../org/aspectj/systemtest/ajc187/ajc187.xml  |   67 -
 .../org/aspectj/systemtest/ajc188/ajc188.xml  |   44 -
 .../aspectj/systemtest/ajc189/ajc189.out.xml  |    0
 .../org/aspectj/systemtest/ajc189/ajc189.xml  |  102 -
 .../systemtest/ajc190/Annotations.java        |    2 +-
 .../org/aspectj/systemtest/ajc190/ajc190.xml  |  216 -
 .../systemtest/ajc190/ajc190_from150.xml      | 6290 ----------------
 .../aspectj/systemtest/ajc190/features190.xml |  172 -
 .../systemtest/ajc190/sanity-tests-19.xml     |   70 -
 .../org/aspectj/systemtest/ajc191/ajc191.xml  |   36 -
 .../systemtest/ajc191/sanity-tests-10.xml     |   70 -
 .../org/aspectj/systemtest/ajc192/ajc192.xml  |  140 -
 .../systemtest/ajc192/sanity-tests-11.xml     |   69 -
 .../org/aspectj/systemtest/ajc193/ajc193.xml  |  326 -
 .../org/aspectj/systemtest/apt/apt-spec.xml   |  101 -
 .../aspectpath/aspectpath-tests.xml           |  192 -
 .../systemtest/aspectpath/aspectpath.xml      |   12 -
 .../aspectj/systemtest/bringup/bringup.xml    |   14 -
 .../org/aspectj/systemtest/design/design.xml  |   11 -
 .../aspectj/systemtest/design/designtest.xml  |  106 -
 .../incremental/incremental-junit-tests.xml   |  409 --
 .../incremental/incremental-tests.xml         |  185 -
 .../systemtest/incremental/incremental.xml    |   10 -
 .../model/incremental-model-tests.xml         |   98 -
 .../incremental/model/incremental-model.xml   |   10 -
 .../tools/AjdeInteractionTestbed.java         |    3 +-
 .../systemtest/inpath/inpath-tests.xml        |  297 -
 .../org/aspectj/systemtest/inpath/inpath.xml  |   11 -
 .../systemtest/java14/java14-tests.xml        |  153 -
 .../org/aspectj/systemtest/java14/java14.xml  |   11 -
 .../knownfailures/knownfailures.xml           |   13 -
 .../knownLimitations-tests.xml                |  297 -
 .../knownlimitations/knownLimitations.xml     |   11 -
 .../org/aspectj/systemtest/model/model.xml    |  115 -
 .../systemtest/options/options-tests.xml      |   37 -
 .../aspectj/systemtest/options/options.xml    |   10 -
 .../systemtest/pre10x/pre10x-tests.xml        |  638 --
 .../org/aspectj/systemtest/pre10x/pre10x.xml  |   10 -
 .../systemtest/purejava/pureJava-tests.xml    | 1894 -----
 .../aspectj/systemtest/purejava/pureJava.xml  |   10 -
 .../serialVerUID/serialVerUID-tests.xml       |  169 -
 .../systemtest/serialVerUID/serialVerUID.xml  |   10 -
 .../aspectj/systemtest/tracing/tracing.xml    |   99 -
 .../aspectj/systemtest/xlint/xlint-tests.xml  |  267 -
 .../org/aspectj/systemtest/xlint/xlint.xml    |   10 -
 .../java/org/aspectj/testing/Harness.java     |   78 +-
 .../test/java/org/aspectj/testing/Utils.java  |   84 +-
 .../systemtest/ajc10x/ajc10x-tests.xml        | 2013 ------
 .../org/aspectj/systemtest/ajc10x/ajc10x.xml  | 2016 +++++-
 .../aspectj/systemtest/ajc11/ajc11-tests.xml  |  850 ---
 .../org/aspectj/systemtest/ajc11/ajc11.xml    |  853 ++-
 .../systemtest/ajc120/ajc120-tests.xml        |  482 --
 .../org/aspectj/systemtest/ajc120/ajc120.xml  |  484 +-
 .../systemtest/ajc121/ajc121-tests.xml        |  494 --
 .../org/aspectj/systemtest/ajc121/ajc121.xml  |  498 +-
 .../systemtest/ajc150/ltw/ltw-tests.xml       |  670 --
 .../org/aspectj/systemtest/ajc150/ltw/ltw.xml |  674 +-
 .../aspectpath/aspectpath-tests.xml           |  192 -
 .../systemtest/aspectpath/aspectpath.xml      |  198 +-
 .../systemtest/base/baseTests-tests.xml       |  266 -
 .../org/aspectj/systemtest/base/baseTests.xml |  272 +-
 .../org/aspectj/systemtest/design/design.xml  |  113 +-
 .../aspectj/systemtest/design/designtest.xml  |  106 -
 .../model/incremental-model-tests.xml         |   98 -
 .../incremental/model/incremental-model.xml   |  102 +-
 .../systemtest/inpath/inpath-tests.xml        |  297 -
 .../org/aspectj/systemtest/inpath/inpath.xml  |  301 +-
 .../systemtest/java14/java14-tests.xml        |  153 -
 .../org/aspectj/systemtest/java14/java14.xml  |  158 +-
 .../systemtest/options/options-tests.xml      |   37 -
 .../aspectj/systemtest/options/options.xml    |   40 +-
 .../systemtest/pre10x/pre10x-tests.xml        |  638 --
 .../org/aspectj/systemtest/pre10x/pre10x.xml  |  641 +-
 .../serialVerUID/serialVerUID-tests.xml       |  169 -
 .../systemtest/serialVerUID/serialVerUID.xml  |  174 +-
 .../aspectj/systemtest/xlint/xlint-tests.xml  |  267 -
 .../org/aspectj/systemtest/xlint/xlint.xml    |  270 +-
 153 files changed, 6832 insertions(+), 42622 deletions(-)
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc10x/ajc10x-tests.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc10x/ajc10x.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc11/ajc11-tests.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc11/ajc11.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc120/ajc120-tests.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc120/ajc120.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc121/ajc121-tests.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc121/ajc121.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc150/ajc150.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/annotationgen.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/coverage/coverage.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/ltw.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/misuse.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/syntax.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/ltw-tests.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/ltw.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc151/ajc151.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc151/ataround.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc151/newarray_joinpoint.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc151/serialversionuid.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc152/ajc152.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc152/synchronization.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc153/ajc153.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc153/jdtlikehandleprovider.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc153/pipelining.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc154/ajc154.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc160/ajc160.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc160/annotationValueMatching.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc160/newfeatures-tests.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc160/parameterAnnotations.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc160/sanity-tests.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc161/ajc161.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc161/annotationFieldBinding.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc1610/ajc1610.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc1610/newfeatures-tests.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc1611/ajc1611.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc1611/newfeatures-tests.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc1612/ajc1612.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc162/ajc162.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc163/ajc163.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc164/ajc164.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc164/declareMixin.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc164/joinpointid.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc165/ajc165.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc165/world.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc166/ajc166.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc167/ajc167.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc167/intertype.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc167/overweaving.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc169/ajc169.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc169/intertype.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc169/transparentweaving.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc170/ajc170.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc170/indy.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc171/ajc171.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc171/newfeatures-tests.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc172/ajc172.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc173/ajc173.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc174/ajc174.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc175/ajc175.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc180/ajc180.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc181/ajc181.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc1810/ajc1810.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc1811/ajc1811.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc182/tests.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc183/ajc183.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc184/ajc184.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc185/ajc185.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc186/ajc186.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc187/ajc187.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc188/ajc188.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc189/ajc189.out.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc189/ajc189.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc190/ajc190.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc190/ajc190_from150.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc190/features190.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc190/sanity-tests-19.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc191/ajc191.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc191/sanity-tests-10.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc192/ajc192.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc192/sanity-tests-11.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc193/ajc193.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/apt/apt-spec.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/aspectpath/aspectpath-tests.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/aspectpath/aspectpath.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/bringup/bringup.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/design/design.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/design/designtest.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/incremental/incremental-junit-tests.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/incremental/incremental-tests.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/incremental/incremental.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/incremental/model/incremental-model-tests.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/incremental/model/incremental-model.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/inpath/inpath-tests.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/inpath/inpath.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/java14/java14-tests.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/java14/java14.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/knownfailures/knownfailures.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/knownlimitations/knownLimitations-tests.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/knownlimitations/knownLimitations.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/model/model.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/options/options-tests.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/options/options.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/pre10x/pre10x-tests.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/pre10x/pre10x.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/purejava/pureJava-tests.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/purejava/pureJava.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/serialVerUID/serialVerUID-tests.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/serialVerUID/serialVerUID.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/tracing/tracing.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/xlint/xlint-tests.xml
 delete mode 100644 tests/src/test/java/org/aspectj/systemtest/xlint/xlint.xml
 delete mode 100644 tests/src/test/resources/org/aspectj/systemtest/ajc11/ajc11-tests.xml
 delete mode 100644 tests/src/test/resources/org/aspectj/systemtest/ajc120/ajc120-tests.xml
 delete mode 100644 tests/src/test/resources/org/aspectj/systemtest/ajc121/ajc121-tests.xml
 delete mode 100644 tests/src/test/resources/org/aspectj/systemtest/aspectpath/aspectpath-tests.xml
 delete mode 100644 tests/src/test/resources/org/aspectj/systemtest/base/baseTests-tests.xml
 delete mode 100644 tests/src/test/resources/org/aspectj/systemtest/design/designtest.xml
 delete mode 100644 tests/src/test/resources/org/aspectj/systemtest/incremental/model/incremental-model-tests.xml
 delete mode 100644 tests/src/test/resources/org/aspectj/systemtest/inpath/inpath-tests.xml
 delete mode 100644 tests/src/test/resources/org/aspectj/systemtest/java14/java14-tests.xml
 delete mode 100644 tests/src/test/resources/org/aspectj/systemtest/options/options-tests.xml
 delete mode 100644 tests/src/test/resources/org/aspectj/systemtest/pre10x/pre10x-tests.xml
 delete mode 100644 tests/src/test/resources/org/aspectj/systemtest/serialVerUID/serialVerUID-tests.xml
 delete mode 100644 tests/src/test/resources/org/aspectj/systemtest/xlint/xlint-tests.xml

diff --git a/tests/pom.xml b/tests/pom.xml
index fac49b171..51273cdfd 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -50,6 +50,18 @@
       <artifactId>org.aspectj.ajdt.core</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>org.aspectj.ajdt.core</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>ajde.core</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+    </dependency>
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>bcel-builder</artifactId>
@@ -83,5 +95,13 @@
       <version>${project.version}</version>
       <type>test-jar</type>
     </dependency>
+    <dependency>
+      <groupId>commons</groupId>
+      <artifactId>commons</artifactId>
+      <version>1.0</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/../lib/commons/commons.jar</systemPath>
+    </dependency>
   </dependencies>
+
 </project>
diff --git a/tests/src/test/java/org/aspectj/systemtest/AllTests.java b/tests/src/test/java/org/aspectj/systemtest/AllTests.java
index a4aec7d68..2ce16495f 100644
--- a/tests/src/test/java/org/aspectj/systemtest/AllTests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/AllTests.java
@@ -1,9 +1,12 @@
-/*
- * Created on 03-Aug-2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
+/* *******************************************************************
+ * Copyright (c) 2004-2019 Contributors
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://www.eclipse.org/legal/epl-v10.html 
+ * 
+ * ******************************************************************/
 package org.aspectj.systemtest;
 
 import junit.framework.Test;
@@ -28,7 +31,9 @@ import org.aspectj.systemtest.tracing.TracingTests;
 import org.aspectj.systemtest.xlint.XLintTests;
 
 /**
- * @author colyer
+ * @author Andy Clement
+ * @author Adrian Colyer
+ * @author IBM
  */
 public class AllTests {
 
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc10x/ajc10x-tests.xml b/tests/src/test/java/org/aspectj/systemtest/ajc10x/ajc10x-tests.xml
deleted file mode 100644
index 56ee8f6e4..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc10x/ajc10x-tests.xml
+++ /dev/null
@@ -1,2013 +0,0 @@
-<!-- AspectJ v1.0.x Tests -->
-
-
-    <ajc-test dir="new"
-      title="properly make choice between cast and parenthesis in parser"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="JoinPointFields.java"/>
-        <run class="JoinPointFields"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="96"
-      title="field from implemented interface not found in advice"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="FieldFromImplementsNotFound.java"/>
-        <run class="FieldFromImplementsNotFound"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="make sure advice affects introduced methods and constructors"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AdviceOnIntroduced.java"/>
-        <run class="AdviceOnIntroduced"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="new around construct"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AroundAdvice.java"/>
-        <run class="AroundAdvice"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="65" title="aspect redefines a parameter"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AspectRedefinesParam.java"/>
-        <run class="AspectRedefinesParam"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="introducing extends and implements"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="HierarchyIntroductions.java"/>
-        <run class="HierarchyIntroductions"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="104" title="(related) aspect on interface"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AspectOnInterface.java"/>
-        <run class="AspectOnInterface"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="106" title="advice and package visibility"
-      keywords="from-resolved_10x">
-        <compile
-          files="packagevisibility/PackagesAndAdvice.java,packagevisibility/testPackage/Class1.java,packagevisibility/testPackage/Class2.java"
-          options="-Xlint:ignore"/>
-        <run class="packagevisibility.PackagesAndAdvice"/>
-    </ajc-test>
-    
-    <ajc-test dir="new" pr="106" title="advice and package visibility"
-      keywords="from-resolved_10x">
-        <compile
-          files="packagevisibility/PackagesAndAdviceCf.java,packagevisibility/testPackage/Class1.java,packagevisibility/testPackage/Class2.java"
-          options="-Xlint:error">
-        <message kind="error" line="29"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" title="advice on implied empty constructor"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AdviceOnEmptyConstructor.java"/>
-        <run class="AdviceOnEmptyConstructor"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="advice on * *(..) not mapping to initializers"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="InitializerAdvice.java"/>
-        <run class="InitializerAdvice"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="three type declarations in the scope of an advice"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="TypeDeclInAdvice.java"/>
-        <run class="TypeDeclInAdvice"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="129"
-      title="introduction fails on class with an inner class that extends or implements something"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="IntroductionFailsWithInnerClass.java"/>
-        <run class="IntroductionFailsWithInnerClass"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="126"
-      title="checks that methods are introduced on the topmost class implemented"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="TopmostImplements.java"/>
-        <run class="TopmostImplements"/>
-    </ajc-test>
-
-    <ajc-test dir="new/arndAdvRet" pr="140"
-      title="a couple different returns from around advice"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="member finally advice paired with signature advice"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="TryErrors.java"/>
-        <run class="TryErrors"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="aspect of eachobject(instanceof(Interface))"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AspectOfInterface.java"/>
-        <run class="AspectOfInterface"/>
-    </ajc-test>
-
-    <ajc-test dir="new/finalMemInit" pr="162"
-      title="final member initialization broken with JDK before 1.1.8"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="new/packageNameClash" pr="205"
-      title="same package and var name clash in preprocessed code when aspectOf is used"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="otherpkg/Driver.java,pkg/Aspect1.java,pkg/Class1.java"/>
-        <run class="otherpkg.Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="new/adviceOnStaticMeth" pr="221"
-      title="and PR#201 advice on static methods fails javac compile with this"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="non-static advice on inner class defined inside of method body"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="MethodInner.java"/>
-        <run class="MethodInner"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="simple single-threaded eachcflow test (includes aspectOf)"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Client.java"/>
-        <run class="Client"/>
-    </ajc-test>
-
-    <ajc-test dir="new/scopeTypingBug" pr="191"
-      title="bad type resolution when var reassigned in same scope"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="242"
-      title="generating the right throws clause for call-site advice (and around)"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="ComputedThrows.java"/>
-        <run class="ComputedThrows"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="246"
-      title="advice on calls to static methods using several syntax"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="StaticCalls.java"/>
-        <run class="StaticCalls"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="248"
-      title=", PR#249, PR#250 advice on constructor sites"
-      keywords="from-resolved_10x">
-        <compile files="NewSiteAdvice.java" options="-1.4 -Xlint:ignore"/>
-        <run class="NewSiteAdvice"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="test after throwing advice in several ways"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AfterThrowing.java"/>
-        <run class="AfterThrowing"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="fancy name patterns for method names"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="WildNames.java"/>
-        <run class="WildNames"/>
-    </ajc-test>
-
-    <ajc-test dir="design/calls" title="calls: calls(...)"
-      keywords="from-resolved_10x">
-        <compile files="Simple.java" options="-Xlint:ignore -1.4"/>
-        <run class="Simple"/>
-    </ajc-test>
-
-    <ajc-test dir="new/extraThrows" pr="259"
-      title="throws Exception clause is unnecessarily added to Driver.main method"
-      keywords="from-resolved_10x">
-        <compile files="Driver.java" options="-Xlint:ignore -1.4"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="new/thisUsedInMain" pr="262"
-      title="javac fails when this is referenced in the static main method"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="new/badCast" pr="275"
-      title="and 276 cast error generated by ajc when type not in signature"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="285"
-      title="calls to methods to which we don't have source"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="ExternalCalls.java"/>
-        <run class="ExternalCalls"/>
-    </ajc-test>
-
-    <ajc-test dir="new/beforeNotRun" pr="265" title="more aspect inheritance"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="310"
-      title="around and calls with both calling and called this params"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AroundAndCalls.java"/>
-        <run class="AroundAndCalls"/>
-    </ajc-test>
-
-    <ajc-test dir="new/pointcutParameter" pr="290"
-      title="compiler crashes with eachobject and named pointcuts with parameters"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="new/unqualifiedPointcutName" pr="304"
-      title="lookup rules for unqualified pointcut names"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="321"
-      title="eachcflow only instantiated if the aspect has some advice in it"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="CFlowNoAdvice.java"/>
-        <run class="CFlowNoAdvice"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="309"
-      title="(DESIGN QUESTION) aspect of eachJVM advising its own initializer"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="EachJVMOnSelf.java"/>
-        <run class="EachJVMOnSelf"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="302"
-      title="after returning advice on calls to constructors"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AfterConstructorCalls.java"/>
-        <run class="AfterConstructorCalls"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Does annotating 'new' with a type work as desired?"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="ConstructorSignatures.java"/>
-        <run class="ConstructorSignatures"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Referring to inner classes as {super}.{inner} confused ajc."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="InnerClassNaming.java"/>
-        <run class="InnerClassNaming"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Advice on advice" keywords="from-resolved_10x">
-        <compile options="-1.4" files="AdviceOnAdvice.java"/>
-        <run class="AdviceOnAdvice"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Introductions on other introductions"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="IntroOnIntro.java"/>
-        <run class="IntroOnIntro"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Putting advice on array constructors."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Orleans.java"/>
-        <run class="Orleans"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="call points within block inner classes are doubled"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="DoubledCalls.java"/>
-        <run class="DoubledCalls"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Gets and sets with other advice"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Counting3.java"/>
-        <run class="Counting3"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Compiler can compile correct strictfp modifiers"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="StrictFpCompile.java"/>
-        <run class="StrictFpCompile"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="basic test of callsto pointcuts"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="CallsTo.java"/>
-        <run class="CallsTo"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="package wildcards in packages"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="pack/PackageWildcards.java"/>
-        <run class="pack.PackageWildcards"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="around advice on calls and receptions with lots of context"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AroundCalls.java"/>
-        <run class="AroundCalls"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="208"
-      title="! modifier and char in pointcut (no longer an error)"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="NotCharInPointcut.java"/>
-        <run class="NotCharInPointcut"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="308"
-      title="right number of aspect instances per cflow"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="CFlowObjects.java"/>
-        <run class="CFlowObjects"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="310" title="many this's into around advice on calls"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AroundCallsArgs.java"/>
-        <run class="AroundCallsArgs"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Ensures introduction methods can have advice placed on them"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Dominates.java"/>
-        <run class="Dominates"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="355"
-      title="No boolean appearing in the 'if' clause for around advice with eachJVM()"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="PR355.java"/>
-        <run class="PR355"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Order of super introductions."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="OrderOfExtendsPlusAndImplementsPlus.java"/>
-        <run class="OrderOfExtendsPlusAndImplementsPlus"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Ensuring backdoor methods are produced."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="BackdoorMethods.java"/>
-        <run class="BackdoorMethods"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="no duplicate advice methods in abstract aspects"
-      keywords="from-resolved_10x">
-        <compile
-          files="GeneratingDuplicateNamedAdviceMethodsInAbstractAspects.java"/>
-        <run class="GeneratingDuplicateNamedAdviceMethodsInAbstractAspects"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="no duplicate advice methods in abstract aspects extended"
-      keywords="from-resolved_10x">
-        <compile
-          files="GeneratingDuplicateNamedAdviceMethodsInAbstractAspectsWithExtendedAspect.java"/>
-        <run class="GeneratingDuplicateNamedAdviceMethodsInAbstractAspectsWithExtendedAspect"
-        />
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Putting after-constructor advice on the wrong types implementing the same interface."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AfterAdviceOnConstructorsOnTheWrongType.java"/>
-        <run class="AfterAdviceOnConstructorsOnTheWrongType"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Instantiating non-static inner classes in advice."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="NonstaticInnerClassesInAspects.java"/>
-        <run class="NonstaticInnerClassesInAspects"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="316" title="Referring to pointcut in of clauses"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="ReferringToPointcutsInAspect_PR316.java"/>
-        <run class="ReferringToPointcutsInAspect_PR316"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="191"
-      title="Confused referring to instance variables and locals"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="ScopesAndFields_PR191.java"/>
-        <run class="ScopesAndFields_PR191"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Parsing C+ expressions without parens in super introductions."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="ParsingSubtypesIntroductions.java"/>
-        <run class="ParsingSubtypesIntroductions"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Introducing methods on classes that implements inner-interfaces with +implements."
-      keywords="from-resolved_10x">
-        <compile files="IntroducingMethodsOnPlusImplementedInterfaces.java" options="-Xlint:ignore -1.4"/>
-        <run class="IntroducingMethodsOnPlusImplementedInterfaces"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="464"
-      title="Methods with the same name are generated when abstract aspects extend another abstract aspect."
-      keywords="from-resolved_10x">
-        <compile
-          files="AbstractAspectsExtendingAbstractAspectsGeneratesMethodsWithTheSameName_PR464.java"/>
-        <run class="AbstractAspectsExtendingAbstractAspectsGeneratesMethodsWithTheSameName_PR464"
-        />
-    </ajc-test>
-
-    <ajc-test dir="new" title="Making sure final variables stay final."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="RemovingFinals.java"/>
-        <run class="RemovingFinals"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Problem resolving meta-joinpoint names with around advice on methods called from around advice."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AroundAdviceOnMethodsCalledInAroundAdvice.java"/>
-        <run class="AroundAdviceOnMethodsCalledInAroundAdvice"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Make sure that names of lifted local classes are right when referenced in call-site advice"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="CallsAndLocalClasses.java"/>
-        <run class="CallsAndLocalClasses"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="matching for throws clause"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="ThrowsMatching.java"/>
-        <run class="ThrowsMatching"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="basic test of declare soft"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="DeclareSoft.java"/>
-        <run class="DeclareSoft"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="advice on calls to constructors of anonymous inners and access to context"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="NewAnonymous.java"/>
-        <run class="NewAnonymous"/>
-    </ajc-test>
-
-    <ajc-test dir="new/innerAspectAccess" pr="211"
-      title="inner aspects can't access outer pointcuts"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="implements and extends are introduced before methods and fields"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="IntroOrder.java"/>
-        <run class="IntroOrder"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="a static/inner aspect of a inner class of an aspect is pulled to the top level as static"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="StaticInnerAspect.java"/>
-        <run class="StaticInnerAspect"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Crashes with privileged aspect."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Privileged.java"/>
-        <run class="Privileged"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="join points exist in the execution of field initializers"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="FieldInitializerJoinPoints.java"/>
-        <run class="FieldInitializerJoinPoints"/>
-    </ajc-test>
-
-    <ajc-test dir="new/privilegedAspects" title="privileged aspects"
-      keywords="from-resolved_10x">
-        <compile
-          files="main/Main.java,fish/PrivateClass.java,fish/B.java,fowl/C.java,fowl/D.java"/>
-        <run class="main.Main"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="advice on field gets in privileged aspects"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AdviceOnPrivileged.java"/>
-        <run class="AdviceOnPrivileged"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Two anonymous classes in the same scope"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="TwoAnonymous.java"/>
-        <run class="TwoAnonymous"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="basic tests for initializer and staticinitializer PCDs"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="InitializerTest.java"/>
-        <run class="InitializerTest"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="98"
-      title="introduction of an initializer into a class"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="IntroductionOfInitializer.java"/>
-        <run class="IntroductionOfInitializer"/>
-    </ajc-test>
-
-    <ajc-test dir="new/access"
-      title="some method accessibility tests, particularly package-protected and inheritance"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Test1.java,pc/C.java,psub/SubC.java,psub/A.java"/>
-        <run class="Test1"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="fairly monotonous (and non-covering) tests for expanded dot patterns"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="ExpandedDotDotPattern.java"/>
-        <run class="ExpandedDotDotPattern"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="field patterns and subtyping"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="FieldPatterns.java"/>
-        <run class="FieldPatterns"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Checking formal matching as in Roeder's bug in 0.7b10"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="FormalMatching.java"/>
-        <run class="FormalMatching"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Introducing synchronized methods on interfaces."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="SynchronizedMethodsOnInterfaces.java"/>
-        <run class="SynchronizedMethodsOnInterfaces"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="The pointcut params (..,int..) is not recognizing (Object,int,Object)."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Params.java"/>
-        <run class="Params"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="calls advice on array objects causes error in code generation"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="CallsToArray.java"/>
-        <run class="CallsToArray"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="join points in field initializers aren't showing up."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="NonexistentFieldInitializers.java"/>
-        <run class="NonexistentFieldInitializers"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="318" title="Handlers problem"
-      keywords="from-resolved_10x">
-        <compile files="PR318.java" options="-Xlint:ignore -1.4"/>
-        <run class="PR318"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="work nicely with inner class method look-up rules and call-site advice"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="InnerMethods.java"/>
-        <run class="InnerMethods"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="strictfp modifier allowed on advice"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="StrictFPAdvice.java"/>
-        <run class="StrictFPAdvice"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="415"
-      title="No argthis was being created for calls advice."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="PR415.java"/>
-        <run class="PR415"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Ensuring no advice with instanceof(..) is run on static methods."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="StaticMethodsShouldNotReceiveInstanceofAdvice.java"/>
-        <run class="StaticMethodsShouldNotReceiveInstanceofAdvice"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Null pointer on gets advice showing the case causing the error"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="NullPointerOnGetsSimple.java"/>
-        <run class="NullPointerOnGetsSimple"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="try to make sure that dynamic JoinPoint objects aren't generated when used inside of if (false) { ... }"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="IfdefsAndAdvice.java"/>
-        <run class="IfdefsAndAdvice"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="within and withincode (doesn't all work due to local class name issues)"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="WithinInners.java"/>
-        <run class="WithinInners"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="around advice on calls within inner classes (including protected method calls)"
-      keywords="from-resolved_10x">
-        <compile files="AroundInnerCalls13.java" options="-1.3"/>
-        <run class="AroundInnerCalls13"/>
-    </ajc-test>
-
-	<ajc-test dir="new"
-      title="around advice on calls within inner classes (including protected method calls)"
-      keywords="from-resolved_10x">
-        <compile files="AroundInnerCalls.java" options="-1.4"/>
-        <run class="AroundInnerCalls"/>
-    </ajc-test>
-    
-    <ajc-test dir="new" title="Arguments to runNext should be final when needed"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Finals.java"/>
-        <run class="Finals"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Method introductions"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="MethodIntroductions.java"/>
-        <run class="MethodIntroductions"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Putting an introduced method on each interface"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="IntroducedMethodsOnEachInterface.java"/>
-        <run class="IntroducedMethodsOnEachInterface"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Extending interfaces"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="BindingInterfaces.java"/>
-        <run class="BindingInterfaces"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Introducing private methods on interfaces"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="IntroducingPrivateMethodsOnInterfaces.java"/>
-        <run class="IntroducingPrivateMethodsOnInterfaces"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Issuing errors for assigning variables thisJoinPoint -- not assigning thisJoinPoint."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="ThisJoinPointAssignments.java"/>
-        <run class="ThisJoinPointAssignments"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Static references inside of introduced bodies get bound correctly."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="StaticIntroducedReferences.java"/>
-        <run class="StaticIntroducedReferences"/>
-    </ajc-test>
-
-    <ajc-test dir="new/cflowObjectCreations" pr="307"
-      title="cflow and object creations [of eachcflow]"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="new/twofiles"
-      title="Doesn't import MightHaveAspect when compiling with more than 1 file. [eachobject]"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="TheObject.java,TheAspect.java"/>
-        <run class="TheObject"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="436"
-      title="test binding to formals in calls to constructors (binding to null) (eachobject !!! now misnamed)"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="BindingThisInsteadOfFormal.java"/>
-        <run class="BindingThisInsteadOfFormal"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="After advice isn't being woven into after throwing advice"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AfterThrowingNotWoven.java"/>
-        <run class="AfterThrowingNotWoven"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Throwing an EmptyStackException."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="EmptyStack.java"/>
-        <run class="EmptyStack"/>
-    </ajc-test>
-
-	<ajc-test dir="new/perThis"
-	    title="check that MightHaveAspect interface is created correctly for an aspect in deep package"
-	    keywords="from-resolved_10x">
-	      <compile options="-1.4" files="p/EachObjectTarget.java,the/deep/pkg/EachObjectInDeepPackage.java"/>
-	      <run class="p.EachObjectTarget"/>
-	</ajc-test>
-  
-    <ajc-test dir="new" title="Defines clfow$ajc0 more once. [eachcflow]"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Binkley.java"/>
-        <run class="Binkley"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Various calls, receptions, and callsto tests [callsto]"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="CallsReceptionsCallsto.java"/>
-        <run class="CallsReceptionsCallsto"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="320"
-      title="Was throwing exception, now just an error. [eachobject]"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="PR320.java"/>
-        <run class="PR320"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="different version of aspect inheritance, particularly empty pointcuts and abstract cflows [eachcflow]"
-      keywords="from-resolved_10x,fail-unimplemented">
-        <compile options="-1.4" files="AspectInheritance.java"/>
-        <run class="AspectInheritance"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="339"
-      title="set advice on member initing throwing exception [eachobject]"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="PR339.java"/>
-        <run class="PR339"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="417"
-      title="Testing class names with same name's with difference case as package. [eachobject]"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="test/TraceAspect.java,test/Test.java"/>
-        <run class="test.Test"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Null pointer on gets advice with coverage [painful]"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="NullPointerOnGets.java"/>
-        <run class="NullPointerOnGets"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Basic test for cflow pointcuts [eachcflow]"
-      keywords="from-resolved_10x">
-        <compile files="CFlowPoints.java" options="-Xlint:ignore -1.4"/>
-        <run class="CFlowPoints"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Crashing when looking up the type of array members."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="ArrayCasts.java"/>
-        <run class="ArrayCasts"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="PostfixExprs to various synthetic things are fixed correctly [eachobject]"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Fixes.java"/>
-        <run class="Fixes"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Dave Binkley's problem with eachcflowroot. [eachcflow]"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Binkley2.java"/>
-        <run class="Binkley2"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="105" title="advice on an inherited method"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AdviceOnInheritedMethod.java"/>
-        <run class="AdviceOnInheritedMethod"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="114"
-      title=", PR#115 checks the ordering of catch clauses"
-      keywords="from-resolved_10x">
-        <compile files="OrderOfCatches.java" options="-Xlint:ignore -1.4"/>
-        <run class="OrderOfCatches"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="various declared exception permutations"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="DeclaredExcs.java"/>
-        <run class="DeclaredExcs"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="ordering of advice kinds as well as cflow and dominates"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AdviceOrdering.java"/>
-        <run class="AdviceOrdering"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="241"
-      title="advice on default constructor for a class only referenced via reflection"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="OddConstructors.java"/>
-        <run class="OddConstructors"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="289"
-      title="calling and called this params in calls points"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="CallsParams.java"/>
-        <run class="CallsParams"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="322"
-      title="primitive parameters coercable to Object just like return values are"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="ObjectForInt.java"/>
-        <run class="ObjectForInt"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="join points in static/dynamic initializers aren't showing up."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="NonexistentInitializers.java"/>
-        <run class="NonexistentInitializers"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Gets and sets on a number of variables (field access ???)"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Gets.java"/>
-        <run class="Gets"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Joinpoints are showing up on intermediate call sites"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Counting1.java"/>
-        <run class="Counting1"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Reception based on strictfp modifier"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="StrictFpReceptions.java"/>
-        <run class="StrictFpReceptions"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="353"
-      title="Subclasses that do not redefine a method are not being handled correctly"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="PR353b.java"/>
-        <run class="PR353b"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="making sure that super calls are bound to the right methods"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="SupersAndInterfaces.java"/>
-        <run class="SupersAndInterfaces"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="317"
-      title="inheritance, around advice and abstract pointcuts [eachobject] (still)"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="OverridingPointcuts.java"/>
-        <run class="OverridingPointcuts"/>
-    </ajc-test>
-
-    <ajc-test dir="new/foemmel"
-      title="Priviledged aspect methods are missing for privates. [eachobject]"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="TheAspect.java,TheObject.java">
-        </compile>
-        <run class="TheObject"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="exceptions thrown and caught in advice, particularly try+proceed"
-      keywords="from-resolved_10x">
-        <compile files="TryAndProceed.java" options="-Xlint:ignore -1.4"/>
-        <run class="TryAndProceed"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Not and And operators in pointcuts not working"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="NotAndPointcut.java"/>
-        <run class="NotAndPointcut"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Member initializers should run before the current class constructor"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="MemberInitializationsAfterExplicitConstructorCalls.java"/>
-        <run class="MemberInitializationsAfterExplicitConstructorCalls"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Coverage tests for Member initializers should run before the current class constructor and after super"
-      keywords="from-resolved_10x">
-        <compile
-          files="MemberInitializationsAfterExplicitConstructorCallsCoverage.java"/>
-        <run class="MemberInitializationsAfterExplicitConstructorCallsCoverage"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="thisJoinPoint{Static} not visible in if() pcd of named pointcut"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="IfPCDExprJoinPointVisibleCE.java"/>
-        <run class="IfPCDExprJoinPointVisibleCE"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="pcd if() expression visibility at compile-time  (minimal operation)"
-      keywords="from-resolved_10x">
-        <compile files="IfPCDExprVisibility.java" options="-Xlint:ignore -1.4"/>
-        <run class="IfPCDExprVisibility"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="pcd if() NPE in compiler when unwinding assignment in pcd if(expr)"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="IfPCDExprAssignUnparseFailure.java"/>
-        <run class="IfPCDExprAssignUnparseFailure"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="pcd if() dup methods produced when pointcut after advice etc (javac)"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="IfPCDDupMethod.java"/>
-        <run class="IfPCDDupMethod"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="pcd if() variants: [anonymous, named] x [execution, call, callTyped, get, set, initializations] x [before, after, around]"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="IfPCDAdviceMethods.java"/>
-        <run class="IfPCDAdviceMethods"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="476" title="initialization order with this"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="InitializationOrder.java"/>
-        <run class="InitializationOrder"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="496"
-      title="!within and !this handling for callee-side call points"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="NotThis.java"/>
-        <run class="NotThis"/>
-    </ajc-test>
-
-    <ajc-test dir="new/innerInterfaces" pr="494"
-      title="private inner interfaces and bytecode visibility"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="p/Driver.java,p/InnerTest.java,other/Test.java"/>
-        <run class="p.Driver"/>
-    </ajc-test>
-
-	<!-- This has a complicated set of expected join points.
-	     This test should be borken up into more manageable chunks
-	     and more carefully analyzed for correctness in the future.
-	-->
-    <ajc-test dir="new" pr="490"
-      title="elaborated into testing of around on all join points"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AroundAll.java"/>
-        <run class="AroundAll"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="type name hygiene when code comes from aspects in different packages"
-      keywords="from-resolved_10x">
-        <compile options="-1.4"
-          files="typeNameConflicts/Driver.java,typeNameConflicts/p1/C.java,typeNameConflicts/aspects/A.java"/>
-        <run class="typeNameConflicts.Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="cflowbelow dependencies (from Chris Dutchyn)"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="CflowBelowTest.java"/>
-        <run class="CflowBelowTest"/>
-    </ajc-test>
-
-   <ajc-test dir="new" pr="493"
-      title="Compiler incorrectly flagging *1 (non-alphabetic start to signature pattern)"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="NonAlphaSignaturePatternCE.java"/>
-        <run class="NonAlphaSignaturePatternCE"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Unable to bind privately-introduced field name from introduced method in the same aspect"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="IntroducedFieldsNotBinding.java"/>
-        <run class="IntroducedFieldsNotBinding"/>
-    </ajc-test>
-
-    <ajc-test dir="new/anonInnerClass" pr="297"
-      title="anonymous inner class with aspect" keywords="from-resolved_10x">
-        <compile options="-1.4" files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="335"
-      title="Arguments are not being passed in to calls advice"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="PR335.java"/>
-        <run class="PR335"/>
-    </ajc-test>
-
-    <ajc-test dir="design/intro" title="interfaces as mixins with introduction"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Interfaces.java">
-        <message kind="error" text="can't override java.lang.String SubI.instanceField with java.lang.String SubC.instanceField visibility is reduced"/>
-        <message kind="error" text="can't override java.lang.String I.instanceField with java.lang.String C.instanceField visibility is reduced"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="design/intro" title="interfaces as mixins with introduction b"
-      keywords="from-resolved_10x">
-        <compile files="Interfaces.java" options="-Xset:itdVersion=1 -1.4"/>
-        <run class="Interfaces"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="functional modifiers work correctly with introduced members"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="IntroducedModifiers.java"/>
-        <run class="IntroducedModifiers"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="ExceptionInInitializerError accessing cflow in aspect initialization - before variants"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="CflowInitInAspectVariantsBefore.java"/>
-        <run class="CflowInitInAspectVariantsBefore"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="NoClassDefFoundError accessing cflow in aspect initialization - after variants"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="CflowInitInAspectVariantsAfter.java"/>
-        <run class="CflowInitInAspectVariantsAfter"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="InternalCompilerError in JpPlan when args alone"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="ArgsAlone.java"/>
-        <run class="ArgsAlone"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="527"
-      title="compile error using pcd if() with advice on introduced methods."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="PR527.java"/>
-        <run class="PR527"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="528"
-      title="compile errors boolean using cflow and unimplemented method using around advice on methods introduced by interface"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="PR528.java"/>
-        <run class="PR528"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="534" title="aspect as member of interface"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AspectInInterfaceCP.java"/>
-        <run class="AspectInInterfaceCP"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="535"
-      title="missing method name to synthetic invocation"
-      keywords="from-resolved_10x,new-messages-vary">
-        <compile options="-1.4" files="PR535.java"/>
-        <run class="PR535"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="536"
-      title="protected subclass impl of superclass method with default access and variants"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="RestrictingVisibilityCP.java"/>
-        <run class="RestrictingVisibilityCP"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="519" title="Exception planning advice"
-      keywords="from-resolved_10x">
-        <compile files="PR519.java" options="-Xlint:ignore -1.4"/>
-        <run class="PR519"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="521"
-      title="unreproduced bug with advice - probably UTR"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="PR520.java"/>
-        <run class="PR520"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="494"
-      title="introduced inner interfaces accessible inside aspect"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="IntroduceInnerInterfaceCP.java"/>
-        <run class="IntroduceInnerInterfaceCP"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="525"
-      title="validate (enclosing) join point and source locations"
-      keywords="from-resolved_10x">
-        <compile files="NegativeSourceLocation.java" options="-Xlint:ignore -1.4"/>
-        <run class="NegativeSourceLocation"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="544"
-      title="advice formals are just like method formals"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AdviceFormalsCp.java"/>
-        <run class="AdviceFormalsCp"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="544"
-      title="advice formals produce errors just like method formals"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AdviceFormalsCf.java">
-            <message kind="error" line="28"/>
-            <message kind="error" line="29"/>
-            <message kind="error" line="36"/>
-            <message kind="error" line="37"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="advice throws clauses must be compatible with joinpoints they apply to"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AdviceThrowsCp.java"/>
-        <run class="AdviceThrowsCp"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="570"
-      title="potential method conflicts with introductions and interfaces and PR#561"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="MethodConflictsCP.java"/>
-        <run class="MethodConflictsCP"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="570"
-      title="illegal method conflicts with introductions and interfaces and PR#561"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="MethodConflictsCF.java">
-            <message kind="error" line="8"/>
-            <message kind="error" line="20"/>
-            <message kind="error" line="28"/>
-        </compile>
-    </ajc-test>  
-
-    <ajc-test dir="new" title="AspectOf available for different aspect types"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AspectOf.java"/>
-        <run class="AspectOf"/>
-    </ajc-test>
-
-    <ajc-test dir="new/privilegedAspects" pr="35593"
-      title="access to all members of class and inner class from privileged aspect"
-      keywords="from-resolved_10x">
-        <compile options="-1.4"
-          files="driver/PrivilegedAspect.java,util/Util.java,pack/DefaultTarget.java,pack/PublicTarget.java"/>
-        <run class="driver.PrivilegedAspect"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="cflow alone with around produces compiler bcg StackOverflowError"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="CflowAlone.java"/>
-        <run class="CflowAlone"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="get/set join points run for complex assignment operators (+=, etc.) (working)"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AssignOps.java"/>
-        <run class="AssignOps"/>
-    </ajc-test>
-
-    <ajc-test dir="new/introTypeMissing"
-      title="this available in introduced field initializers"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="ThisInIntroFieldInit.java"/>
-        <run class="ThisInIntroFieldInit"/>
-    </ajc-test>
-
-    <ajc-test dir="new/introTypeMissing"
-      title="Introduced type unavailable to cast expressions in introduced methods"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Cast.java,TargetClass.java,Util.java"/>
-        <run class="Cast"/>
-    </ajc-test>
-
-    <ajc-test dir="new/introTypeMissing"
-      title="Introduced type unavailable to qualified new expressions in introduced methods"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Inner.java,TargetClass.java,Util.java"/>
-        <run class="Inner"/>
-    </ajc-test>
-
-    <ajc-test dir="new/introTypeMissing"
-      title="Introduced type unavailable to cast expressions in introduced field initializers"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="CastInFieldInit.java,TargetClass.java,Util.java"/>
-        <run class="CastInFieldInit"/>
-    </ajc-test>
-
-    <ajc-test dir="new/introTypeMissing"
-      title="Aspect type unavailable to qualified new expressions in body of introduced methods"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AspectInIntroducedMethod.java"/>
-        <run class="AspectInIntroducedMethod"/>
-    </ajc-test>
-
-
-    <ajc-test dir="new/introTypeMissing"
-      title="Introduced type unavailable to qualified new expressions in introduced field initializers"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="InnerInFieldInit.java,TargetClass.java,Util.java"/>
-        <run class="InnerInFieldInit"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="595"
-      title="variable slots and finally/catch causing verify errors"
-      keywords="from-resolved_10final,from-resolved_10x">
-        <compile options="-1.4" files="AfterFinally.java"/>
-        <run class="AfterFinally"/>
-    </ajc-test>
-
- 
-    <ajc-test dir="new" pr="590"
-      title="after advice on static method with pcd if() using result"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="PR590.java">
-            <message kind="error" line="20"/>
-            <message kind="error" line="23"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="590"
-      title="after advice on static method with pcd if() using result through pointcut"
-      keywords="from-resolved_10x">
-        <compile files="PR590a.java" options="-Xlint:ignore -1.4">
-            <message kind="error" line="29"/>
-            <message kind="error" line="31"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new/PR600" pr="600"
-      title="AbstractMethodError for introduced methods (order 1)"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Main.java,My_error.java,A.java,B.java,C.java"/>
-        <run class="Main"/>
-    </ajc-test>
-
-    <ajc-test dir="new/PR600" pr="600"
-      title="AbstractMethodError for introduced methods (order 2)"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Main.java,My_error.java,C.java,A.java,B.java"/>
-        <run class="Main"/>
-    </ajc-test>
-
-    <ajc-test dir="new/PR600" pr="600"
-      title="AbstractMethodError for introduced methods (order 3)"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="My_error.java,A.java,B.java,C.java,Main.java"/>
-        <run class="Main"/>
-    </ajc-test>
-
-    <ajc-test dir="new/PR600" pr="600"
-      title="AbstractMethodError for introduced methods (order 4)"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="A.java,B.java,C.java,Main.java,My_error.java"/>
-        <run class="Main"/>
-    </ajc-test>
-
-    <ajc-test dir="new/PR600" pr="600"
-      title="AbstractMethodError for introduced methods (order 5)"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="A.java,B.java,Main.java,C.java,My_error.java"/>
-        <run class="Main"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="declare error and abstract pointcuts"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AbstractDeclare.java">
-            <message kind="error" line="3"/>
-            <message kind="error" line="4"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new/runtime"
-      title="Exercise runtime classes (optionally in 1.1 VM)"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AllRuntime.java,TesterDriver.java"/>
-        <run class="TesterDriver"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="VerifyError after around advice falls off end of tryCatch"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="TryOffEnd.java">
-            <message kind="warning" line="13"/>
-            <message kind="warning" line="21"/>
-        </compile>
-        <run class="TryOffEnd"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="635" title="Named within pointcuts failing"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="NamedWithinPointcuts.java"/>
-        <run class="NamedWithinPointcuts"/>
-    </ajc-test>
-
-    <ajc-test dir="new/subaspects" pr="647"
-      title="aspect with private abstract pointcut" 
-   keywords="from-resolved_10x,fail-unimplemented">
-        <compile options="-1.4" files="PrivatePointcutCE.java">
-            <message kind="error" line="5"/>
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="new/subaspects" pr="647"
-      title="concrete aspect unable to access abstract package-private pointcut in parent for overriding"
-      keywords="from-resolved_10x"
-       comment="XXX getting error - confirm line numbers">
-        <compile options="-1.4" files="parent/ParentCE.java,child/ChildCE.java">
-            <message kind="error" file="child/ChildCE.java" line="32" text="pointcut 'parent.ParentCE.define()' is not visible"/>
-            <message kind="error" file="child/ChildCE.java" line="21"/>
-            <message kind="error" file="parent/ParentCE.java" line="10"/>
-            <message kind="error" file="parent/ParentCE.java" line="12"/>
-            <message kind="error" file="parent/ParentCE.java" line="22"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new/subaspects" pr="647"
-      title="inner, outer, and outside-package subaspects of an aspect with abstract protected-, public-, and default-access pointcuts"
-      keywords="from-resolved_10x">
-        <compile
-          files="parent/SubAspectVisibility.java,parent/ForeignChildHelper.java,child/ForeignChildAspect.java"/>
-        <run class="parent.SubAspectVisibility"/>
-    </ajc-test>
-
-    <ajc-test dir="new/subaspects" pr="647"
-      title="inner subaspects of an aspect with private pointcut"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="parent/PrivatePointcut.java"/>
-        <run class="parent.PrivatePointcut"/>
-    </ajc-test>
-
-    <ajc-test dir="new/subaspects" pr="647"
-      title="outer subaspects of an aspect with private pointcut"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="parent/PrivatePointcutOuterClass.java"/>
-        <run class="parent.PrivatePointcutOuterClass"/>
-    </ajc-test>
-
-    <ajc-test dir="new/subaspects" pr="647"
-      title="abstract aspect used statically should not cause instantiation of advice or pointcut"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AbstractAspectUsedStatically.java"/>
-        <run class="AbstractAspectUsedStatically"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="private inner interface accessible in scope when declared on outer class"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="DeclareAccess.java"/>
-        <run class="DeclareAccess"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="accessing protected superclass members in and outside CCC from body of method introduction"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="SuperInIntroduction.java"/>
-        <run class="SuperInIntroduction"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="accessing private superclass members from body of method introduction"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="SuperInIntroductionCE.java">
-            <message kind="error" line="25"/>
-            <message kind="error" line="26"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" title="simple test for around and casting"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AroundCasting.java"/>
-        <run class="AroundCasting"/>
-    </ajc-test>
-
-    <ajc-test dir="new/aroundinner" pr="620"
-      title="aroundInner 1 - around advice inner Thread subclass running proceed but not writing field"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="ThreadNoField.java,Common.java"/>
-        <run class="ThreadNoField"/>
-    </ajc-test>
-
-    <ajc-test dir="new/aroundinner" pr="620"
-      title="aroundInner 2 - around advice inner Runnable running proceed and writing method-final proxy"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Proxy.java,Common.java"/>
-        <run class="Proxy"/>
-    </ajc-test>
-
-    <ajc-test dir="new/aroundinner" pr="620"
-      title="aroundInner 3 - around advice inner class running proceed and writing field"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Minimal.java,Common.java"/>
-        <run class="Minimal"/>
-    </ajc-test>
-
-    <ajc-test dir="new/aroundinner" pr="620"
-      title="aroundInner 4 - around advice inner Thread subclass running proceed and writing field"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="ThreadSub.java,Common.java"/>
-        <run class="ThreadSub"/>
-    </ajc-test>
-
-    <ajc-test dir="new/aroundinner" pr="620"
-      title="aroundInner 5 - around advice inner Runnable (subinterface) running proceed and writing field introduced on subinterface"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="RunnableSub.java,Common.java"/>
-        <run class="RunnableSub"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="636"
-      title="Named local class closing over proceed invocation"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="LocalClassClosingOverProceed.java"/>
-        <run class="LocalClassClosingOverProceed"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="beautiful recursive computation of factorial with around is now supported"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="CircularAdvice.java"/>
-        <run class="CircularAdvice"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="632"
-      title="multi-dispatch not used for named pcd references"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="MultiDispatchCf.java">
-            <message kind="error" line="54"/>
-            <message kind="error" line="57"/>
-            <message kind="error" line="60"/>
-            <message kind="error" line="71"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="632"
-      title="multi-dispatch implemented through around + args"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="MultiDispatchCp.java"/>
-        <run class="MultiDispatchCp"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="unrecognized aspect should not net Cloneable and Serializable warnings"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="UnrecognizedAspectCE.java">
-            <message kind="error" line="3"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="unreachable code generated by around advice on the execution of void methods"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AroundVoid.java"/>
-        <run class="AroundVoid"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="654"
-      title="Overriding method implementations using introduction on interfaces"
-      keywords="from-resolved_10x,fail-unimplemented">
-        <compile files="IntroductionsOverriding.java" options="-Xlint:ignore -1.4" />
-        <run class="IntroductionsOverriding"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="654"
-      title="more coverage for around and concrete methods on interfaces"
-      keywords="from-resolved_10x">
-        <compile files="MultiAndAround.java" options="-Xlint:ignore -1.4"/>
-        <run class="MultiAndAround"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="invalid number and type of proceed arguments"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="InvalidProceedArgsCE.java">
-            <message kind="error" line="10"/>
-            <message kind="error" line="15"/>
-            <message kind="error" line="17"/>
-            <message kind="error" line="20"/>
-            <message kind="error" line="22"/>
-            <message kind="error" line="27"/>
-            <message kind="error" line="29"/>
-            <message kind="error" line="31"/>
-            <message kind="error" line="37"/>
-            <message kind="error" line="39"/>
-            <message kind="error" line="43"/>
-            <message kind="error" line="46"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="694" title="after returning advice order"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Cricket.java"/>
-        <run class="Cricket"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="694" title="after returning advice param"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AfterReturningParam.java"/>
-        <run class="AfterReturningParam"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="695"
-      title="! and declaring types with callee-side call join points"
-      keywords="from-resolved_10x">
-        <compile files="NotAndDeclaringTypes.java" options="-Xlint:ignore -1.4"/>
-        <run class="NotAndDeclaringTypes"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="479"
-      title=". Binding the wrong arguments in withincode(..)."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="BindingArgumentsInWithincode.java"/>
-        <run class="BindingArgumentsInWithincode"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="479"
-      title=". Matching arguments in cflow correctly."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="MatchingArgumentsInCflow.java"/>
-        <run class="MatchingArgumentsInCflow"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="480"
-      title=". Binding variables with numbers in their name with pertarget(..)'s."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="PerTargetAndVariablesWithNumbersInTheirNames.java"/>
-        <run class="PerTargetAndVariablesWithNumbersInTheirNames"/>
-    </ajc-test>
-
-
-    <ajc-test dir="new" pr="554"
-      title="second arg in formal on shared joinpoint with pcd if() causes verify error ??"
-      keywords="from-resolved_10rc3">
-        <compile options="-1.4" files="PR554.java"/>
-        <run class="PR554"/>
-    </ajc-test>
-
-    <ajc-test dir="new/privilegedAspects" pr="555"
-      title="access to private members from privileged aspect"
-      keywords="from-resolved_10rc3">
-        <compile
-          files="driver/PR555.java,util/Util.java,pack/DefaultTarget.java"/>
-        <run class="driver.PR555"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="555"
-      title="inner classes of privileged aspects cannot see target class private members"
-      keywords="from-resolved_10rc3">
-        <compile options="-1.4" files="InnerClassInPrivilegedAspect.java"/>
-        <run class="InnerClassInPrivilegedAspect"/>
-    </ajc-test>
-
-    <ajc-test dir="new/packageAccessPR556" pr="556"
-      title="aspects should get package access outside the file"
-      keywords="from-resolved_10rc3">
-        <compile files="base1/p/C1.java,base2/p/C2.java" options="-Xlint:ignore -1.4"/>
-        <run class="p.C1"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="559"
-      title="subclass advice not run for join points selected by superclass cflow-based pointcuts"
-      keywords="from-resolved_10rc3">
-        <compile options="-1.4" files="PR559.java"/>
-        <run class="PR559"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="559"
-      title="more issues with abstract aspects and cflow pointcuts"
-      keywords="from-resolved_10rc3,fail-unimplemented">
-        <compile options="-1.4" files="AbstractCflows.java"/>
-        <run class="AbstractCflows"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="560"
-      title="compile fails for aspect derived from percflow base aspect unless pointcut excludes base aspect and subaspects"
-      keywords="from-resolved_10rc3">
-        <compile options="-1.4" files="PR560.java"/>
-        <run class="PR560"/>
-    </ajc-test>
-
-
-    <ajc-test dir="new" pr="573"
-      title="pertarget stack overflow getting name of anonymous (Interface) class"
-      keywords="from-resolved_10rc3">
-        <compile options="-1.4" files="PR573.java"/>
-        <run class="PR573"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="573"
-      title="pertarget stack overflow getting name of anonymous (Object) class"
-      keywords="from-resolved_10rc3">
-        <compile options="-1.4" files="PR573_1.java"/>
-        <run class="PR573_1"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="573"
-      title="pertarget runtime stack overflow (getting name of anonymous (Object) class?)"
-      keywords="from-resolved_10rc3">
-        <compile options="-1.4" files="PR573_2.java"/>
-        <run class="PR573_2"/>
-    </ajc-test>
-
-     <ajc-test dir="new" pr="685"
-      title="subaspect method declaration on superaspect inner interface (names)"
-      keywords="from-resolved_104">
-        <compile options="-1.4" files="InnerInterfaceNames.java"/>
-        <run class="InnerInterfaceNames"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="685"
-      title="subaspect method declaration on superaspect inner interface (access)"
-      keywords="from-resolved_104">
-        <compile options="-1.4" files="InnerInterfaceAccess.java"/>
-        <run class="InnerInterfaceAccess"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="685"
-      title="subaspect method declaration on superaspect inner interface (types)"
-      keywords="from-resolved_104">
-        <compile options="-1.4" files="InnerInterfaceTypes.java,InnerInterfaceTypesHelper.java"/>
-        <run class="InnerInterfaceTypes"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="691" title="around AST type XXX"
-      keywords="from-resolved_104">
-        <compile options="-1.4" files="PR691.java"/>
-        <run class="PR691"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="687"
-      title="around all execution with double assignment in initializer (simple)"
-      keywords="from-resolved_104">
-        <compile options="-1.4" files="AroundDoubleAssignment.java"/>
-        <run class="AroundDoubleAssignment"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="687"
-      title="around all execution with double assignment in initializer (coverage)"
-      keywords="from-resolved_104">
-        <compile options="-1.4" files="AroundDoubleAssignmentC.java"/>
-        <run class="AroundDoubleAssignmentC"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="changing this in around's proceed reported by Rich Price"
-      keywords="from-resolved_104">
-        <compile files="AroundChangeThis.java" options="-1.4 -Xlint:ignore"/>
-        <run class="AroundChangeThis"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="548"
-      title="default package for aspect introductions is not the current package"
-      keywords="from-resolved_10rc3,from-resolved_104">
-        <compile
-          files="introductionPackage/two/C.java,introductionPackage/one/C.java,introductionPackage/one/Aspect.java,introductionPackage/one/TestAspect.java"/>
-        <run class="one.TestAspect"/>
-    </ajc-test>
-
-    <ajc-test dir="new/PR569" pr="569"
-      title="anon class written to wrong directory" 
-   keywords="from-resolved_104,from-resolved_104">
-        <compile options="-1.4" files="a/IntroAnon.java,a/MyInterface.java,b/Dest.java"/>
-        <run class="a.IntroAnon"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="603"
-      title="unqualified transitive pointcut references not resolved"
-      keywords="from-resolved_104">
-        <compile options="-1.4" files="PointcutQualification.java"/>
-        <run class="PointcutQualification"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="603"
-      title="unqualified transitive pointcut references not resolved - 2"
-      keywords="from-resolved_104">
-        <compile options="-1.4" files="PointcutQualification2.java"/>
-        <run class="PointcutQualification2"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="619"
-      title="direct use outside aspect of defined abstract pointcut"
-      keywords="from-resolved_104">
-        <compile options="-1.4" files="AbstractPointcutAccess.java"/>
-        <run class="AbstractPointcutAccess"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="619"
-      title="direct use outside aspect of undefined abstract pointcut"
-      keywords="from-resolved_104">
-        <compile options="-1.4" files="AbstractPointcutAccessCE.java">
-            <message kind="error" line="9"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="619"
-      title="indirect use outside aspect of undefined abstract pointcut"
-      keywords="from-resolved_104">
-        <compile options="-1.4" files="AbstractPointcutIndirectCE.java">
-            <message kind="error" line="9"/>
-            <message kind="error" line="5"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="658"
-      title="simple call join point tests for JoinPoint SourceLocation context"
-      keywords="from-resolved_104">
-        <compile options="-1.4" files="SourceLocationCall.java"/>
-        <run class="SourceLocationCall"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="661"
-      title="!target with second advice on casted call"
-      keywords="from-resolved_104">
-        <compile options="-1.4" files="CallNotTarget.java"/>
-        <run class="CallNotTarget"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="666" title="name binding in around cflow"
-      keywords="from-resolved_104">
-        <compile options="-1.4" files="AroundCall.java"/>
-        <run class="AroundCall"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="660" title="name binding in around cflow - 2"
-      keywords="from-resolved_104">
-        <compile options="-1.4" files="ArgsInCflow2.java"/>
-        <run class="ArgsInCflow2"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="677"
-      title="around name-binding in cflows using factorial"
-      keywords="from-resolved_104">
-        <compile options="-1.4" files="FactorialCflow.java"/>
-        <run class="FactorialCflow"/>
-    </ajc-test>
-
-     <ajc-test dir="new" title="replacing this or target in around advice"
-      keywords="from-resolved_104">
-        <compile options="-1.4" files="TargetObjectReplacement.java"/>
-        <run class="TargetObjectReplacement"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="after returning from initialization and after executing constructor"
-      keywords="from-resolved_104">
-        <compile options="-1.4" files="ConstructorExecInit.java"/>
-        <run class="ConstructorExecInit"/>
-    </ajc-test>
-    
-    <ajc-test dir="new"
-      title="after returning from initialization causes ExceptionInInitializer in aspect">
-        <compile options="-1.4" files="ConstructorExecInitFails.java"/>
-        <run class="ConstructorExecInitFails"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="659"
-      title="name binding in before cflow containing cflowbelow"
-      keywords="from-resolved_104">
-        <compile files="ArgsInCflow.java" options="!eclipse -1.4">
-            <message kind="error" line="29"/>
-            <message kind="error" line="32"/>
-        </compile>
-    </ajc-test>
-
-
-     <ajc-test dir="new/pr728" pr="728" title="file order in type searching"
-      keywords="from-resolved_105">
-        <compile options="-1.4" files="AnotherClass.java,Interface.java"/>
-        <run class="AnotherClass"/>
-    </ajc-test>
-
- 
-    <ajc-test dir="new" title="simple declare warning (NPE)"
-      keywords="from-resolved_105">
-        <compile options="-1.4" files="DeclareWarningMain.java">
-            <message kind="warning" line="4"/>
-        </compile>
-        <run class="DeclareWarningMain"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="755"
-      title="ajc dies on cflow into field init anon class see knownbugs.txt"
-      keywords="from-resolved_105">
-        <compile files="CflowOfFieldInitAnonMethods.java" options="!eclipse -1.4">
-        </compile>
-        <run class="CflowOfFieldInitAnonMethods" options="!eclipse"/>
-    </ajc-test>
-
- 
-    <ajc-test dir="new" pr="757" title="Incrementing interface-introduced field"
-      keywords="from-resolved_105">
-        <compile options="-1.4" files="IntroducedFieldInc.java"/>
-        <run class="IntroducedFieldInc"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="The dynamic type, not the static one, should be used in if pcds"
-      keywords="from-resolved_105">
-        <compile options="-1.4" files="StaticTypeInIf.java"/>
-        <run class="StaticTypeInIf"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="bad interaction with after returning, around and void methods (from Rich Price)"
-      keywords="from-resolved_105">
-        <compile options="-1.4" files="AfterReturningResult.java"/>
-        <run class="AfterReturningResult"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="type pattern matching for inner classes (from Ken Horn)"
-      keywords="from-resolved_105">
-        <compile options="-1.4" files="TypePat.java"/>
-        <run class="test.TypePat"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="771" title="static initializer member name"
-      keywords="from-resolved_105">
-        <compile options="-1.4" files="StaticInitName.java"/>
-        <run class="StaticInitName"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="770" title="cflow pcd syntax error"
-      keywords="from-resolved_105">
-        <compile options="-1.4" files="IllegalCflowCE.java">
-            <message kind="error" line="4"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="764"
-      title="binding args with indeterminate prefix and suffix"
-      keywords="from-resolved_105">
-        <compile options="-1.4" files="IndeterminateArgs.java"/>
-        <run class="IndeterminateArgs"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="764"
-      title="check arg types with indeterminate prefix and suffix"
-      keywords="from-resolved_105">
-        <compile options="-1.4" files="IndeterminateArgType.java"/>
-        <run class="IndeterminateArgType"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="764"
-      title="testing and binding args with single indeterminate prefix and suffix"
-      keywords="from-resolved_105">
-        <compile options="-1.4" files="IndeterminateArg.java"/>
-        <run class="IndeterminateArg"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="764"
-      title="binding handler args with indeterminate prefix and suffix"
-      keywords="from-resolved_105">
-        <compile options="-1.4" files="IndeterminateHandlerArg.java"/>
-        <run class="IndeterminateHandlerArg"/>
-    </ajc-test>
-
-
- 	<ajc-test dir="new/nolang" pr="762"
-	  title="Compiling java.lang.Object with ajc yields non-verifying bytecode"
-	  keywords="from-resolved_105"
-	   comment="XXX weak/bad test">
-	    <compile options="-1.4" files="java/lang/Object.java,java/lang/String.java">
-	    </compile>
-	</ajc-test>
-
-    <ajc-test dir="new"
-      title="method-local class defined in around return statement"
-      keywords="from-resolved_105">
-        <compile options="-1.4" files="MethodLocalAroundReturns.java"/>
-        <run class="MethodLocalAroundReturns"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="CE expected for assignment to arg in if pcd"
-      keywords="from-resolved_105">
-        <compile options="-1.4" files="IfPCDAssignmentCE.java">
-            <message kind="error" line="16"/>
-            <message kind="error" line="20"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" title="advising field get/sets when accessing via super"
-      keywords="from-resolved_105">
-        <compile options="-1.4" files="SuperField.java"/>
-        <run class="SuperField"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="accessing private members in outer types"
-      keywords="from-resolved_105">
-        <compile options="-1.4" files="FieldInnerAccess.java"/>
-        <run class="FieldInnerAccess"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="29934"
-      title="can't apply around advice to the execution of around advice"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="CflowCycles.java"/>
-        <run class="CflowCycles"/>
-    </ajc-test>
-    
-    <ajc-test dir="new"
-      title="incompatible advice throws clause are a compile-time error"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AdviceThrowsCf.java">
-            <message kind="error" line="13"/>
-            <message kind="error" line="28"/>
-            <message kind="error" line="47"/>
-            <message kind="error" line="48"/>
-            <message kind="error" line="50"/>
-            
-            <message kind="error" line="70"/>
-            <message kind="error" line="74"/>
-            <message kind="error" line="76"/>
-            <message kind="error" line="78"/>
-            
-            <message kind="error" line="85"/>
-        </compile>
-    </ajc-test>
-
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc10x/ajc10x.xml b/tests/src/test/java/org/aspectj/systemtest/ajc10x/ajc10x.xml
deleted file mode 100644
index 90198331d..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc10x/ajc10x.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[
-<!ENTITY tests SYSTEM "../tests/src/org/aspectj/systemtest/ajc10x/ajc10x-tests.xml">
-]>
-
-<!-- AspectJ v1.0.x Tests -->
-
-<suite>
-&tests;
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc11/ajc11-tests.xml b/tests/src/test/java/org/aspectj/systemtest/ajc11/ajc11-tests.xml
deleted file mode 100644
index 02b422bb8..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc11/ajc11-tests.xml
+++ /dev/null
@@ -1,850 +0,0 @@
-<!-- AspectJ v1.1.x Tests -->
-
-    <ajc-test dir="new" pr="853"
-      title="declare interface extends class">
-        <compile files="DeclareInterfaceExtendsClass.java">
-           <message kind="error" line="10"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="853"
-      title="declare interface implements class">
-        <compile files="DeclareInterfaceImplementsClass.java">
-           <message kind="error" line="10"/>
-        </compile>
-    </ajc-test>
-
-
-
-    <ajc-test dir="new" pr="823"
-      title="declaring a private method on an inner interface"
-      keywords="tofix">
-        <compile files="PrivateMethodOnInnerInterface.java"/>
-        <run class="PrivateMethodOnInnerInterface"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="829"
-      title="CE expected when declaring fields on arrays" keywords="tofix">
-        <compile files="ArrayFieldDeclarationCE.java">
-            <message kind="error" line="14"/>
-        </compile>
-    </ajc-test>
-
- 
-    <ajc-test dir="new" pr="883"
-      title="signature of handler join point">
-        <compile files="HandlerSignature.java"/>
-        <run class="HandlerSignature"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="885"
-      title="source locations within expressions">
-        <compile files="SourceLocationWithinExpr.java"/>
-        <run class="SourceLocationWithinExpr"/>
-    </ajc-test>
-    
-    
- 
-    <ajc-test dir="new" pr="888"
-      title="crashes given method in declared method">
-        <compile files="DeclareMethodCE.java">
-          <message kind="error" line="8"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="889"
-      title="after returning advice on interface constructor">
-        <compile files="AfterReturningInterfaceConstructor.java"/>
-        <run class="AfterReturningInterfaceConstructor"/>
-    </ajc-test>
-    
-    <ajc-test dir="new" pr="889"
-      title="after returning advice on interface constructor - error">
-        <compile files="AfterReturningInterfaceConstructorCE.java">
-        	<message kind="error" line="26"/>
-        	<message kind="warning" line="30"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs" pr="900"
-      title="after advice on static call join point">
-        <compile files="AfterStaticCall.java"/>
-        <run class="AfterStaticCall"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs" pr="901"
-      title="incompatible class change error"
-      comment="XXX Jim and Erik found/fixed this - need basis">
-        <compile files="IncompatibleClassChangeErrorBug.java"/>
-        <run class="IncompatibleClassChangeErrorBug"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs" pr="903"
-      title="simple cflow of method execution">
-        <compile files="ExecutionCflow.java"/>
-        <run class="ExecutionCflow"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs" pr="909"
-      title="using instance as class reference to constant field"
-      comment="XXX need to verify run">
-        <compile files="InstanceAsClassRefToConstant.java"/>
-    </ajc-test>
-
-   <ajc-test dir="new" pr="774"
-      title="interface self-reference in anonymous instance">
-        <compile files="AnonymousSelfReference.java"/>
-        <run class="AnonymousSelfReference"/>
-    </ajc-test>
-    
-    <ajc-test dir="new" pr="776"
-      title="self-reference from (aspect-declared) method-local class">
-        <compile files="MethodSelfReference.java"/>
-        <run class="MethodSelfReference"/>
-    </ajc-test>
-    
-    <ajc-test dir="new" title="expect CE for unterminated declare error">
-        <compile files="UnterminatedDeclareErrorCE.java">
-            <message kind="error" line="4"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="new"
-      title="expect CE for declaration collision between subaspects instead of domination order">
-        <compile files="DeclarationCollisionCE.java">
-            <message kind="error" line="10"/>
-            <message kind="error" line="20"/>
-            <message kind="error" line="27"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="new"
-      title="subtype pattern in dominates should pick out aspect subtypes">
-        <compile files="DominatesTypePattern.java"/>
-        <run class="DominatesTypePattern"/>
-    </ajc-test>
-    
-    <ajc-test dir="new"
-      title="subtype pattern in dominates will conflict with type pattern">
-        <compile files="DominatesTypePatternCE.java">
-        	<message kind="error" line="15"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="new" pr="827"
-      title="after returning advice on interface and implementation constructor"
-      keywords="tofix">
-        <compile files="AfterReturningConstructor.java"/>
-        <run class="AfterReturningConstructor"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="832"
-      title="after throwing advice with non-throwable formal">
-        <compile files="AfterThrowingNonThrowable.java">
-            <message kind="error" line="41"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="new" pr="829" title="declare array field using postfix"
-      keywords="tofix">
-        <compile files="ArrayFieldDeclaration.java">
-            <message kind="error" line="17"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="new" pr="851"
-      title="prohibit declaring new aspect constructor with arguments">
-        <compile files="DeclareAspectConstructorCE.java">
-          <message kind="error" line="10"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="851"
-      title="prohibit declaring only aspect constructor with arguments">
-        <compile files="DeclareOnlyAspectConstructorCE.java">
-          <message kind="error" line="10"/>
-        </compile>
-    </ajc-test>
-    
-	<!-- The follwing three idioms are allowed.  Within a declare parents,
-	     implements and extends can be used interchangably.  We could
-	     provide -Xlint style warnings for misuse.
-	-->
-
-    <ajc-test dir="new" pr="853"
-      title="declare class extends interface">
-        <compile files="DeclareClassExtendsInterface.java">
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="853"
-      title="declare class implements class">
-        <compile files="DeclareClassImplementsClass.java">
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="853"
-      title="declare interface implements interface">
-        <compile files="DeclareInterfaceImplementsInterface.java">
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="new"
-      title="if and cflow arg binding">
-        <compile files="CflowBinding.java">
-          <message kind="error" line="13"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs" pr="902"
-      title="circularity in declare dominates">
-        <compile files="CircularDominates.java">
-		  <message kind="error" line="18"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="28702" title="percflow code hangs compiler">
-        <compile files="CloseConnectionsCflow.java" options="-1.4">
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs" pr="28852"
-      title="Verification error tracing constructor that takes arguments">
-        <compile files="ConstructorArgTracing.java"/>
-        <run class="ConstructorArgTracing"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="29106" title="declared exceptions in inter-type decls">
-        <compile files="ExceptionsOnInters.java"/>
-        <run class="ExceptionsOnInters"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="28921"
-      title="Verify error on non-Throwable in declare soft">
-        <compile files="DeclareSoftCf.java" options="-Xlint:warning">
-		  <message kind="warning" line="28"/>
-		  <message kind="error" line="29"/>
-		  <!--message kind="warning"/-->
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="29113" title="inter-type fields with array types">
-        <compile files="InterFieldArrays.java"/>
-        <run class="InterFieldArrays"/>
-    </ajc-test>
-
-    
-    <ajc-test dir="new" pr="838"
-      title="checking around join point for advice return type - numeric">
-        <compile files="AroundNumericCastCE.java">
-            <message kind="error" line="11"/>
-            <message kind="error" line="17"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="836" title="void around advice without proceed">
-        <compile files="VoidAround.java">
-            <message kind="error" line="11"/>
-            <message kind="error" line="29"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="new/PR852" pr="852"
-      title="declaring method on superclass and subclass">
-        <compile files="aspectPack/Aspect.java,target/SubClass.java,target/SuperClass.java">
-          <dir-changes added="target.SubClass,target.SuperClass"/>
-        </compile>
-        <run class="aspectPack.Aspect"/>
-    </ajc-test>
-    
-    <ajc-test dir="new/finalfield" pr="28974"
-      title="introducing final fields (simple)">
-        <compile files="Introducer.java,Receiver.java,User1.java"/>
-        <run class="User1"/>
-    </ajc-test>
-
-    <ajc-test dir="new/finalfield" pr="28974"
-      title="introducing final fields and using as constants">
-        <compile files="Introducer.java,Receiver.java,User2.java"/>
-        <run class="User2"/>
-    </ajc-test>
-
-    <ajc-test dir="new/finalfield" pr="28974"
-      title="introducing final fields and checking errors">
-        <compile files="Introducer.java,Receiver.java,UserCf.java">
-            <message kind="error" line="6"/>        
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="29691"
-    		title="Static inner aspects cannot reference user defined pointcuts">
-        <compile files="PcdLookup.java" />
-        <run class="PcdLookup"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="29691"
-    		title="Static inner aspects cannot reference user defined pointcuts">
-        <compile files="SoftWithin.java" />
-        <run class="SoftWithin"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="29689"
-    		title="Declare precedence should not allow multiple * patterns">
-        <compile files="CircularPrecedence.java">
-            <message kind="error" line="14"/> 
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="29662"
-    		title="VerifyError on accessing objects not accessible to the weaver">
-        <compile files="AroundAccess.java">
-        </compile>
-        <run class="AroundAccess"/>
-    </ajc-test>
-    
-    <ajc-test dir="new" pr="804"
-      title="aspect static initializers should run before instance constructed"
-      keywords="tofix">
-        <compile files="AspectStaticInit.java"/>
-        <run class="AspectStaticInit"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="29959"
-            title="super call in intertype method declaration body causes VerifyError">
-        <compile files="SuperToIntro.java"/>
-        <run class="SuperToIntro"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs/crashes" pr="30168" 
-    		title="Error with certain combination of advice">
-        <compile files="test/Test3.java"/>
-        <run class="test.Test3"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs" pr="31423" 
-    		title="Pointcut adviceexecution() does not work">
-        <compile files="AdviceExec.java"/>
-        <run class="AdviceExec"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="30026" 
-    		title="problems with finalize call">
-        <compile files="Finalizer.java">
-            <message kind="error" line="22"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="33635" 
-    		title="Negation of if pointcut does not work">
-        <compile files="NotIf.java"/>
-        <run class="NotIf"/>
-    </ajc-test>
-    
-    
-    <ajc-test dir="bugs" pr="32463" 
-    		title="ajc reports error when encountering static declaration of nested classes">
-        <compile files="WeaveLocal.java"/>
-        <run class="WeaveLocal"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="32428" 
-    		title="can't use pointcuts defined in inner aspects ">
-        <compile files="InnerPointcut.java"/>
-        <run class="InnerPointcut"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs/interfaceNames" pr="32421" 
-    		title="can't resolve nested public interfaces (also PR#32399)">
-        <compile files="TransactionTest.java,sub/ExecutionMonitor.java,sub/ObserverProtocol.aj"/>
-        <run class="TransactionTest"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="34210" 
-    		title="thisJoinPoint.getArgs() causes IncompatibleClassChangeError">
-        <compile files="ThisJoinPointAndVerifier.java"/>
-        <run class="ThisJoinPointAndVerifier"/>
-    </ajc-test>
-    
-    <ajc-test dir="errors"  keywords="error"
-    		title="inter-type declaration of void field">
-        <compile files="VoidFieldDeclarationCE.java">
-			<message kind="error" line="7"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="binding"
-      title="no such constructor for proceed argument (error)">
-        <compile files="UnfoundConstructor.java">
-        	<message kind="error" line="25"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="new/declare" pr="31724"
-            title="omnibus declare warning context with no initializer/constructor">
-        <compile files="DeclareWarningEmpty.java">
-            <message kind="warning" line="3" text="2 - initialization(DeclareWarningEmpty)"/>
-            <message kind="warning" line="3" text="1 - staticinitialization(DeclareWarningEmpty)"/>
-        </compile>
-    </ajc-test>
-    
-
-    <ajc-test dir="new/declare" pr="31724"
-            title="omnibus declare warning context">
-        <compile files="DeclareWarning.java">
-            <message kind="warning" line="3" text="staticinitialization(DeclareWarning)"/>
-            <message kind="warning" line="12" text="call(DeclareWarning.new())"/>
-            <message kind="warning" line="13" text="get staticInt"/>
-            <message kind="warning" line="14" text="get instanceInt"/>
-            <message kind="warning" line="15" text="set staticInt"/>
-            <message kind="warning" line="16" text="set instanceInt"/>
-            <message kind="warning" line="17" text="call(void run())"/>
-            <message kind="warning" line="18" text="call(void irun())"/>
-            <message kind="warning" line="21" text="execution(void run())"/>
-            <message kind="warning" line="22" text="execution(void irun())"/>
-            <message kind="warning" line="23" text="execution(DeclareWarning.new())"/>
-            <message kind="warning" line="23" text="initialization(DeclareWarning)"/>
-            <message kind="warning" line="33" text="handler(OutOfMemoryError) &amp;&amp; within(DeclareWarning)"/>
-            <message kind="warning" line="36" text="handler(Error)"/>
-            <message kind="warning" line="39" text="handler(RuntimeException) &amp;&amp; withincode(DeclareWarning.new())"/>
-            <message kind="warning" line="72" text="adviceExecution() &amp;&amp; within(A)"/>
-        </compile>
-    </ajc-test>
-    
-    
-    <ajc-test dir="bugs" pr="34858"
-      title="cflow binding issues with ignoring state">
-        <compile files="CflowBinding.java"/>
-        <run class="CflowBinding"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs" pr="34858"
-      title="cflow binding -- original weaver crash">
-        <compile files="CflowBindingOrig.java"/>
-        <run class="CflowBindingOrig"/>
-    </ajc-test>
-    
-    <ajc-test dir="errors"  
-    		title="type not imported in around advice">
-        <compile files="TypeNotImportedInAroundCE.java">
-        	<message kind="error" line="10"/>
-        </compile>
-	</ajc-test>
-
-    <ajc-test dir="errors"  
-    		title="type not imported in aspect">
-        <compile files="TypeInAspectNotImportedCE.java">
-        	<message kind="error" line="6"/>
-        </compile>
-	</ajc-test>
-	
-    <ajc-test dir="errors"  keywords="error"
-    		title="class extending abstract aspect">
-        <compile files="ClassExtendingAbstractAspectCE.java">
-			<message kind="error" line="20"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs" pr="34925"
-      title="declare soft and throw statements">
-        <compile files="ConvertToUnchecked.java" options="-Xlint:ignore"/>
-        <run class="ConvertToUnchecked"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs/interAbstract"
-      title="inter-type declaration bug with abstract classes"
-      pr="36046">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs/interInherit" pr="35725"
-      title="Inter type declaration to base class not seen by derived class">
-        <compile files="a_impl/AImpl.java,a_impl/Af.java,a_intf/A.java,b_impl/BImpl.java,b_intf/B.java"/>
-        <run class="b_impl.BImpl"/>
-    </ajc-test>
-
-    <ajc-test dir="new/declareParents"
-      title="Declare parents with intermediate ancestor"
-      keywords="from-new">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-    
-    <ajc-test dir="new/declareParents" 
-      title="Declare parents removing ancestor"
-      keywords="from-new">
-        <compile files="IllegalAdoption.java">
-            <message kind="error" line="13"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs/interSpecials" title="IllegalAccessError while accessing introduced variable / 1.1rc1"
-      pr="36110">
-        <compile files="p1/C.java,p2/A1.java"/>
-        <run class="p2.A1"/>
-    </ajc-test>
-    
-    <ajc-test dir="new" pr="36736"
-      title="implemented abstract pointcut">
-        <compile files="AbstractImplementedPointcut.java">
-            <message kind="error" line="14"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="new/verifyError" pr="36673"
-      title="privileged aspect main verify error">
-        <compile files="Privilege.java"/>
-        <run class="Privilege"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="36564"
-      title="Internal compiler error with thisJoinPoint.getStaticPart()">
-        <compile files="tjpStaticPart/Test.java,tjpStaticPart/Exceptions.java" options="-Xlint:ignore"/>
-        <run class="tjpStaticPart.Test"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="29665"
-      title="Inconsistant stack height with around">
-        <compile files="StackError.java" options="-Xlint:ignore"/>
-        <run class="StackError"/>
-    </ajc-test>
-    
-
-	<ajc-test dir="bugs/messyAround" pr="36056"
-      title="Ajc 1.1 rc1 java.lang.VerifyError with messy arounds">
-        <compile files="aspects/Trace.aj,cap/OptionList.java,DebugTrace.aj">
-            <message kind="warning" line="102"/>
-        	<message kind="warning" line="124"/>
-        	<message kind="warning" line="138"/>
-        </compile>
-        <run class="cap.OptionList"/>
-    </ajc-test>  
-
-    <ajc-test dir="new"
-      title="try/finally in around advice (same as ...messy arounds?)">
-        <compile files="TryFinallyInAround.java"/>
-        <run class="TryFinallyInAround"/>
-    </ajc-test>
-    
-    <ajc-test dir="new" pr="36778"
-      title="advise join points in subclass of empty interface">
-        <compile files="EmptyInterface.java"/>
-        <run class="EmptyInterface"/>
-    </ajc-test>
-    
-    <ajc-test dir="new" pr="36778"
-      title="can't put around advice on interface static initializer"
-      comment="this tests for a nice message given a compiler limitation">
-        <compile files="EmptyInterfaceCE.java" options="-1.4">
-        	<message kind="error" line="20"/>
-        	<message kind="error" line="23"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="36803"
-      title="cflow concretization causing assertion failure">
-        <compile files="CflowConcrete.java" options="-1.4"/>
-        <run class="CflowConcrete"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs" title="lame error message: negation doesn't allow binding"
-      pr="30663">
-        <compile files="BadBindingError.java">
-            <message kind="error" line="7"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs/interSpecials" pr="36936"
-      title="Error when introducing members of type Class">
-        <compile files="Trg.java,Asp.java"/>
-        <run class="Trg"/>
-    </ajc-test>
-    
-    <ajc-test dir="new"
-      comment="this is a pureJava test, but we always want to run it"
-      title="arrays via Class.forName()">
-        <compile files="ClassForName.java"/>
-        <run class="ClassForName"/>
-    </ajc-test>
-
-   <ajc-test dir="bugs/inlineAround" pr="37152"
-      title="perthis and inline arounds">
-        <compile files="aspect1/Base.java,aspect2/Concrete.java,p1/Main.java">
-        </compile>
-        <run class="p1.Main"/>
-    </ajc-test>
-    
-   <ajc-test dir="bugs" pr="37325"  
-      title="Weaver fails with NPE for very large source files ">
-        <compile files="LongFile.java"/>
-        <run class="LongFile"/>
-    </ajc-test>   
-
-     <ajc-test dir="harness" keywords="command-line-error"
-      title="CLE: no sources">
-        <compile badInput="true">
-            <message kind="error" text="no sources"/>
-            <message kind="abort" text="Usage"/>
-        </compile>
-    </ajc-test>
- 
-    <ajc-test dir="harness" 
-    	keywords="command-line-error,knownLimitation-ajctaskCompiler,knownLimitation-ajdeCompiler"
-    	comment="ajde omits usage"
-      title="CLE: bad filename">
-        <compile  badInput="true" files="NoSuchFile.java">
-            <message kind="error" text="NoSuchFile.java"/>
-            <message kind="abort" text="Usage"/>
-        </compile>
-    </ajc-test>
-    
-     <ajc-test dir="harness" keywords="command-line-error"
-    	comment="XXX test skipped - harness ignores -sourceroot option"
-      title="CLE: no dir specified for sourceroots">
-        <compile badInput="true" files="ErrorTest.java" 
-        	options="-sourceroots">
-            <message kind="error" text="no sources specified"/>
-            <message kind="error" text="bad sourceroot"/>
-            <message kind="abort" text="Usage"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="harness" keywords="command-line-error,knownLimitation-ajdeCompiler"
-    	comment="ajde has same errors, different wording"
-      title="CLE: no sourceroot specified for incremental">
-        <compile badInput="true" options="-incremental">
-            <message kind="error" text="no sources specified"/>
-            <message kind="error" text="specify a source root"/>
-            <message kind="abort" text="Usage"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="harness" keywords="command-line-error,knownLimitation-ajdeCompiler"
-    	comment="ajde has same errors, different wording"
-      title="CLE: file specified with incremental">
-        <compile badInput="true" files="ErrorTest.java"
-        	options="-incremental">
-            <message kind="error" text="incremental mode only handles source files using -sourceroots"/>
-            <message kind="error" text="no sources specified"/>
-            <message kind="error" text="specify a source root"/>
-            <message kind="abort" text="Usage"/>
-        </compile>
-    </ajc-test>
-    
-  
-    <ajc-test dir="bugs" pr="37304"
-   	 title="public static fields being ignored">
-        <compile files="FinalFields.java"/>
-        <run class="FinalFields"/>
-    </ajc-test>
- 
-      
-    <!-- This doesn't actually reproduce the bug, but no test case has been submitted
-         that does so this is here as a place-holder and to verify that we're mostly
-         working.
-    -->
-    <ajc-test dir="bugs/accessMethods" pr="38212"
-   	 title="can not resolve this member warning">
-        <compile files="p1/Base.java,p2/Derived.java"/>
-        <run class="p2.Derived"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="38345"
-   	 title="try switch VerifyError, InconsistentStackHeight">
-        <compile files="TrySwitch.java"/>
-        <run class="TrySwitch"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="39458"
-   	 title="Compiler crash in ajc 1.1 - terrible error for inaccessible constructor">
-        <compile files="NewVoid.java">
-            <message kind="error" line="17"/>        
-            <message kind="error" line="20"/>        
-            <message kind="error" line="21"/>
-                  
-            <message kind="error" line="28"/>        
-            <message kind="warning" line="29"/>        
-            <message kind="warning" line="30"/>            
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="39458"
-   	 title="Compiler crash in ajc 1.1 - terrible error for inaccessible constructor - 1.7">
-        <compile files="NewVoid.java">
-            <message kind="error" line="17"/>        
-            <message kind="error" line="20"/>        
-            <message kind="error" line="21"/>
-                  
-            <message kind="error" line="28"/>        
-            <message kind="warning" line="29"/>        
-            <message kind="error" line="30"/>            
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="39460"
-   	 title="Missing import crashes compiler">
-        <compile files="MissingImport.java">      
-            <message kind="error" line="13" text="InvocationTargetException cannot be resolved to a type"/> 
-<!-- this error has 'gone' in e37 upgrade            <message kind="error" line="14" text="e cannot be resolved"/> -->
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="39479"
-   	 title="NPE in bcel.LazyMethodGen when delegating from one ctor to a second that includes a switch">
-        <compile files="NewSwitch.java"/>
-        <run class="NewSwitch"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs" pr="40109"
-   	 title="switch statement in aspects crashes weaving">
-        <compile files="SwitchInAround.java"/>
-        <run class="SwitchInAround"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="39993"
-   	 title="ajc stack trace on declaring hashcode() method in aspect">
-        <compile files="OverridingInterfaceObjectMethod.java"/>
-        <run class="OverridingInterfaceObjectMethod"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs"
-   	 title="using super in method introduced on interface with multiple supertypes">
-        <compile files="MultipleSuperCf.java">
-        	<message kind="error" line="14"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs/cflowAndJar" pr="39462"
-   	 title="Compiler crashes in jar and cflow (with no .jar)">
-        <compile files="TestAspect.aj,Test.java,AbstractAspect.aj">
-        	<message kind="warning" line="16"/>
-        </compile>
-        <run class="Test"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs/cflowAndJar" pr="39462"
-   	 title="Compiler crashes in jar and cflow (with .jar)"
-   	 comment="make lib.jar with ajc -outjar lib.jar AbstractAspect.aj">
-        <compile files="TestAspect.aj,Test.java" aspectpath="lib.jar">
-        	<message kind="warning" line="16"/>
-        </compile>
-        <run class="Test"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="40589"
-   	 title="Default method impl for interface causes internal exception.">
-        <compile files="CloneMethod.java"/>
-        <run class="CloneMethod"/>
-    </ajc-test>
-    
-	<ajc-test dir="errors"
-		title="compile error expected for abstract pointcut outside abstract aspect">
-		<compile files="AbstractPointcutCE.java">
-			<message kind="error" line="4" text="The type C must be an abstract class to define abstract methods"/>
-			<message kind="error" line="5"/>
-			<message kind="error" line="10"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs"
-		pr="40876"
-		title="subtype-qualified pointcut reference">
-		<compile files="PointcutLibraryTest.java"/>
-		<run class="PointcutLibraryTest"/>
-	</ajc-test>
-	
-	<ajc-test dir="bugs"
-		pr="40858"
-		comment="super is not permitted in pointcuts in 1.1"
-		title="weaver trace on mis-qualified pointcut reference">
-		<compile files="SuperPointcutCE.java">
-			<message kind="error" line="23"/>
-			<message kind="error" line="26"/>
-		</compile>
-	</ajc-test>
-
-	<ajc-test dir="bugs"
-		pr="40814"
-		title="compile error expected for interface pointcuts">
-		<compile files="AbstractPointcutCE.java">
-			<message kind="error" line="14" text="The type Concrete must be an abstract class to define abstract methods"/>
-			<message kind="error" line="7"/>
-			<message kind="error" line="11"/>		
-			<message kind="error" line="15"/>
-		</compile>
-	</ajc-test>
-
-	<ajc-test dir="bugs"
-		pr="40805" 
-		title="interface call signatures when declaring method in aspect">
-		<compile files="DeclareWarningAndInterfaceMethodCW.java">
-			<message kind="warning" line="27" text="call getSomething"/>
-			<message kind="warning" line="27" text="call ICanGetSomething.getSomething"/>
-			<message kind="warning" line="31" text="call getSomething"/>
-			<message kind="warning" line="31" text="call ICanGetSomething.getSomething"/>
-			<message kind="warning" line="33" text="call getSomething"/>
-			<message kind="warning" line="33" text="call ICanGetSomething.getSomething"/>
-			<message kind="warning" line="35" text="call getSomething"/>
-			<message kind="warning" line="35" text="call ICanGetSomething.getSomething"/>
-			<message kind="warning" line="38" text="call getSomething"/>
-			<message kind="warning" line="38" text="call ICanGetSomething.getSomething"/>
-		</compile>
-	</ajc-test>
- 
- 	<ajc-test dir="bugs"
-		pr="41175"
-		title="reflective check of declared exceptions from aspect-declared methods">
-		<compile files="DeclaredExceptions.java"/>
-		<run class="DeclaredExceptions"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs/throwsSignature"
-		pr="42539"
-		title="throw derivative pointcuts not advised">
-		<compile files="ExceptionBugTest.java,ExceptionAspect.java">
-		    <message line="5" kind="warning" text="throws both"/>
-		    <message line="5" kind="error" text="throws Exception"/>
-		    <message line="7" kind="warning" text="throws both"/>
-		</compile>
-	</ajc-test>
-	
-    <ajc-test dir="bugs" pr="42652"
-   	 title="perthis and signature bad interaction">
-        <compile files="InterPerCall.java" options="-1.4"/>
-        <run class="InterPerCall"/>
-    </ajc-test>
-    
-	<ajc-test dir="bugs/declareBinding"
-		pr="42740"
-		title="declare error fails on pointcuts composed from multiple classes">
-		<compile files="SampleExceptionHandling1.java">
-		    <message line="2" kind="error" text="no checked exceptions"/>
-		</compile>
-	</ajc-test>
-
-	<ajc-test dir="bugs/declareSoftWithin"
-		pr="42740"
-		title="declare error fails on pointcuts composed from multiple classes">
-		<compile files="aspects/Softener.aj,test/NoSoftener.java"/>
-		<run class="test.NoSoftener"/>
-	</ajc-test>
-	
-    <ajc-test dir="bugs" pr="42993"
-   	    title="Interaction between pointcut binding and declare parents">
-        <compile files="ParentsAndPointcuts.java"/>
-        <run class="ParentsAndPointcuts"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="43194"
-   	 title="Non-functional concretezation of ReferencePointcut">
-        <compile files="AdviceInteraction.java"/>
-        <run class="AdviceInteraction"/>
-    </ajc-test>
-
-	<ajc-test dir="bugs/extdirs" 
-		pr="42574"
-		title="zip and jar suffixes for extdirs entries">
-		<compile files="extdirs-src/main/Main.java"
-			extdirs="lib/lowercase"/>
-	</ajc-test>
- 
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc11/ajc11.xml b/tests/src/test/java/org/aspectj/systemtest/ajc11/ajc11.xml
deleted file mode 100644
index 899dfe725..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc11/ajc11.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[
-<!ENTITY tests SYSTEM "../tests/src/org/aspectj/systemtest/ajc11/ajc11-tests.xml">
-]>
-<!-- AspectJ v1.1.x Tests -->
-
-<suite>
-
-&tests;
-
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc120/Ajc120Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc120/Ajc120Tests.java
index 8e1ef8789..633d4cc56 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc120/Ajc120Tests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc120/Ajc120Tests.java
@@ -13,7 +13,7 @@ import java.io.File;
 import junit.framework.Test;
 import org.aspectj.testing.XMLBasedAjcTestCase;
 
-public class Ajc120Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
+public class Ajc120Tests extends XMLBasedAjcTestCase {
 
   public static Test suite() {
     return XMLBasedAjcTestCase.loadSuite(Ajc120Tests.class);
@@ -23,7 +23,6 @@ public class Ajc120Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
     return getClassResource("ajc120.xml");
   }
 
-
   public void test001(){
     runTest("NPE in concretization error path");
   }
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc120/ajc120-tests.xml b/tests/src/test/java/org/aspectj/systemtest/ajc120/ajc120-tests.xml
deleted file mode 100644
index 4b51a98dd..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc120/ajc120-tests.xml
+++ /dev/null
@@ -1,482 +0,0 @@
-<!-- AspectJ v1.2.0 Tests -->
-
-  	<ajc-test dir="bugs/concretizeNpe" pr="43033"
-		title="NPE in concretization error path"
-		keywords="poorErrorMessages">
-		<compile files="base/ExceptionHandling.java,model/ModelExceptionHandling.java">
-		<!--
-		  <message line="5" kind="error" text="pointcut base.ExceptionHandling.scope() is abstract"/>
-		  <message line="4" kind="error" text="inherited abstract pointcut base.ExceptionHandling.scope() is not made concrete"/>
-		  <message line="8" kind="error" text="inherited abstract pointcut base.ExceptionHandling.scope() is not made concrete"/>
-		  <message line="12" kind="error" />
-		  <message line="13" kind="error" />
-		-->
-		  <message line="12" kind="error" />		
-		  <message line="13" kind="error" />
-		</compile>
-	</ajc-test>
-
-	<ajc-test dir="bugs/privilege/packageProtected" pr="42711" 
-            title="priviledged aspects calling methods from advice"> 
-        <compile files="concern/ContextUser.java,concern/BaseTarget.java,core/Base.java" /> 
-    </ajc-test> 
-
-    <ajc-test dir="bugs" pr="49457"
-   	 title="No error on overloaded pointcuts in class">
-        <compile files="OverloadedPointcutsInClass.java">
-        	<message kind="error" line="3" text="duplicate pointcut name: pc1"/>
-        	<message kind="error" line="4" text="duplicate pointcut name: pc1"/>
-        	<message kind="error" line="6" text="duplicate pointcut name: pc2"/>
-        	<message kind="error" line="7" text="duplicate pointcut name: pc2"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="49457"
-   	 title="No error on overloaded pointcuts unless binding variables">
-        <compile files="OverloadedPointcutsInAspect.java">
-        	<message kind="error" line="15" text="duplicate pointcut name: pc"/>
-        	<message kind="error" line="16" text="duplicate pointcut name: pc"/>
-        	<message kind="error" line="18" text="incompatible type"/>
-        	<message kind="error" line="20" text="incompatible type"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs" pr="48522"
-      title="Declare soft softening other exception types">
-        <compile files="SofteningTooMuch.java">
- 	        <message kind="error" line="6" text="Unhandled exception"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="47754"
-      title="static method introduction on interfaces, should not be allowed">
-        <compile files="StaticInterfaceMethods.java">
-		  <message kind="error" line="7" text="methods in interfaces cannot be declared static"/>
-        </compile>
-    </ajc-test>
-
-	<ajc-test dir="bugs" pr="45184"
-      title="External pointcut refs not resolved if named pointcut used by declare">
-        <compile files="DeclareErrorNamedPointcutCE.java">
- 	        <message kind="error" line="10" text="ref"/>
-        </compile>
-    </ajc-test>
-
-	<ajc-test dir="bugs"
-		title="Appropriate message for 'after() thowing(Throwable th)' syntax error"
-		pr="49638"
-		>
-		<compile 
-			files="AfterThrowingAdviceSyntaxError.java" >
-			<message kind="error" line="21" />
-			<message kind="error" line="23" />
-		</compile>
-	</ajc-test>
-
-   <ajc-test dir="bugs/faultingInSource" pr="46671"
-      title="Ensure we don't look for source on the classpath when binary not found">
-        <compile files="SimpleTracing.java" classpath="." options="-verbose -1.4">
-		  <message kind="warning" line="4" text="no match for this type name: SampleClass"/>
-        </compile>
-    </ajc-test>   
-    
-   	<ajc-test dir="bugs" pr="46750" title="inner aspect containing declare soft">
-       <compile files="TestSoftening.java">
-       </compile>
-    </ajc-test>
-    
-     <ajc-test dir="bugs" pr="45663"
-      title="Bad parser error recovery in advice">
-        <compile files="ParserRecoveryTest.java">
-		  <message kind="error" line="7"/>
-        </compile>
-    </ajc-test>   
-    
-	<ajc-test dir="bugs" pr="45663"
-      title="Bad parser error recovery in java source">
-        <compile files="ParserRecoveryTestPureJava.java">
-		  <message kind="error" line="6"/>
-		  <message kind="error" line="8"/>
-        </compile>
-    </ajc-test>     
-    
-    <ajc-test dir="bugs" 
-		pr="46280"
-		title="compiler issues error on inner aspects when privilieged">
-        <compile files="PrivilegedParsing.java"/>
-        <run class="PrivilegedParsing"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs" pr="44586"
-      title="After throwing advice on ctors doesn't execute for inter-type decl field inits">
-        <compile files="AfterThrowingCtor.java" options="-Xlint:ignore">
-        </compile>
-  		<run class="AfterThrowingCtor"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs/abstractMethods" pr="49784"
-   	 title="Introduced abstract method on abstract class not implemented by subtype (single source file)">
-        <compile files="singlesource/C.java">
-        	<message kind="error" line="9"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs/abstractMethods" pr="49784"
-   	 title="Introduced abstract method on abstract class with introduced concrete method (single source file)">
-        <compile files="singlesource/C1.java"/>
-        <run class="C1"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs/abstractMethods" pr="49784"
-   	 title="Introduced abstract method on abstract class with existing concrete method (single source file)">
-        <compile files="singlesource/C2.java"/>
-        <run class="C2"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs/interAbstract" 
-		pr="49784"
-		title="aspect declares interface method (no modifiers)">
-        <compile files="InterfaceMethodDeclarationNone.java" >
-        	<message kind="error" line="32" text="requires a body" />
-        </compile>
-    </ajc-test>
-	
-	<ajc-test dir="bugs/interAbstract" 
-		pr="49784"
-		title="aspect declares interface method (abstract)">
-        <compile files="InterfaceMethodDeclarationAbstract.java">
-        	<message kind="error" line="40" text="abstract intertype method declaration 'int I.getInt()' on interface I must be declared public (compiler limitation)" />
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs/interAbstract" 
-		pr="49784"
-		comment="working in 1.1.1 - keep with others?"
-		title="aspect declares interface method (public abstract)">
-        <compile files="InterfaceMethodDeclarationFull.java" />
-        <run class="InterfaceMethodDeclarationFull"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs/interfaceDefinition" 
-    	pr="43972"
-    	title="Use class implementing interface via aspect (not woven together)">
-        <compile 
-        	files="pack/DefineInterface.java,
-        		   pack/InterfaceDefinition.java,
-        		   pack/MyInterface.java" options="-XnotReweavable"/>
-        <run class="pack.InterfaceDefinition"/>
-        <compile 
-        	includeClassesDir="true"
-        	files="Main.java">
-        	<message kind="error" line="3"/>
-       </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs/interfaceDefinition" 
-    	pr="43972"
-    	title="Use class implementing interface via aspect (weave all together)">
-        <compile 
-        	files="pack/DefineInterface.java,
-        		   pack/InterfaceDefinition.java,
-        		   pack/MyInterface.java,
-        		   Main.java"/>
-        <run class="pack.InterfaceDefinition"/>
-        <run class="Main"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs/interfaceDefinition" 
-    	pr="43972"
-    	title="Use class implementing interface via aspect (only one implementer)">
-        <compile 
-        	files="pack/DefineInterface.java,
-        		   pack/InterfaceDefinition.java,
-        		   pack/MyInterface.java"/>
-        <run class="pack.InterfaceDefinition"/>
-        <compile 
-        	includeClassesDir="true"
-        	files="Main1.java"/>
-        <run class="Main1"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs" pr="44587"
-      title="Erroneous exception conversion">
-        <compile files="ErroneousExceptionConversion.java">
-        </compile>
-        <run class="ErroneousExceptionConversion"/>
-    </ajc-test>
-    
-  <ajc-test dir="bugs" pr="34206"
-      title="before():execution(new(..)) does not throw NoAspectBoundException">
-        <compile files="ErroneousExceptionConversion1.java" options="-Xlint:ignore">
-        </compile>
-        <run class="ErroneousExceptionConversion1"/>
-    </ajc-test>
-
-	<ajc-test dir="bugs" pr="38824"
-	      title="Anomalous handling of inter-type declarations to abstract base classes in aspectj 1.1">
-	        <compile files="AbstractBaseAndInterTypeInterface.java">
-	        </compile>
-	</ajc-test>
-
-  <ajc-test dir="bugs/caseSensitivity" pr="42515"
-      title="NPE When compiling intertype declaration">
-        <compile files="uniqueId/Numbered.java,uniqueId/Bug.aj">
-		  <message kind="error" line="4"/>
-        </compile>
-  </ajc-test>   
-        
-    <ajc-test dir="bugs" 
-		pr="49295"
-		title="declare warning on subtype constructor">
-        <compile files="SubtypeConstructorCW.java" >
-			<message kind="warning" line="5" text="String as first"/>
-			<message kind="warning" line="10" text="String as first"/>
-        </compile>
-        <run class="SubtypeConstructorCW"/>
-    </ajc-test>
-        
-    <ajc-test dir="bugs" pr="50570"
-      title="CatchClauseSignature has broken operation">
-        <compile files="HandlerSig.java"/>
-        <run class="HandlerSig"/>
-    </ajc-test>
-    
-
-    <ajc-test dir="new" pr="42668"
-   	 title="after returning with parameter: matching rules">
-        <compile files="AfterReturningParamMatching.java" options="-1.4"/>
-        <run class="AfterReturningParamMatching"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs/binaryCompat" pr="50641"
-      title="binary compatibility of advice method names - expect no error">
-        <compile files="Main.java,TraceV1.aj" options="-1.4"/>
-        <run class="Main"/>
-        <compile files="TraceV2.aj" options="-1.4"/>
-        <run class="Main"/>
-    </ajc-test>
-   
-    <ajc-test dir="bugs/binaryCompat" pr="50641"
-      title="binary compatibility of advice method names - expect error">
-        <compile files="Main.java,TraceV1.aj" options="-1.4"/>
-        <run class="Main"/>
-        <compile files="TraceRE.aj" options="-1.4"/>
-        <run class="Main"/>
-    </ajc-test>
-    
-     <ajc-test dir="bugs/binaryCompat" pr="50641"
-      title="binary compatibility of advice method names - expect no error">
-        <compile files="Main.java,TraceWithInnerV1.aj" options="-1.4"/>
-        <run class="Main"/>
-        <compile files="TraceWithInnerV2.aj" options="-1.4"/>
-        <run class="Main"/>
-    </ajc-test>
-    
-	<ajc-test dir="bugs/protectedvf"
-		title="mail list VerifyError with protected access">
-		<compile files="main/Driver.java,main/p2/AbstractTest.aj,main/p1/ConcreteTest.aj"/>
-		<run class="main.Driver"/>
-	</ajc-test>
-	
-	<ajc-test dir="bugs" pr="51919"
-   	 title="Polymorphic ITD fails in CVS HEAD (From ajdt 1.1.6)">
-        <compile files="OverloadedITDNPE.java" />
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="51320"
-   	 title="ClasscastException on concretization of if(false)">
-        <compile files="DecwClassCastException.java">
-        
-         <!-- These are the illegal PCDs against a deow -->
-         <message kind="error" line="27" text="if() pointcut designator cannot be used"/>
-         <message kind="error" line="29" text="if() pointcut designator cannot be used"/>
-         
-         <message kind="error" line="31" text="cflow() pointcut designator cannot be used"/>
-         <message kind="error" line="33" text="cflow() pointcut designator cannot be used"/>
-         
-         <message kind="error" line="35" text="cflowbelow() pointcut designator cannot be used"/>
-         <message kind="error" line="37" text="cflowbelow() pointcut designator cannot be used"/>
-         
-         <message kind="error" line="39" text="this() pointcut designator cannot be used"/>
-         <message kind="error" line="41" text="this() pointcut designator cannot be used"/>
-         
-         <message kind="error" line="43" text="target() pointcut designator cannot be used"/>
-         <message kind="error" line="45" text="target() pointcut designator cannot be used"/>
-         
-         <message kind="error" line="47" text="args() pointcut designator cannot be used"/>
-         <message kind="error" line="49" text="args() pointcut designator cannot be used"/>
-         
-        </compile>
-    </ajc-test>
-	
-	 <ajc-test dir="bugs" pr="51320"
-   	 	title="ClasscastException on concretization of if(false)">
-        <compile files="DeclareSoftDynamicPCDs.java">
-        
-         <!-- These are the illegal PCDs against a deow -->
-         <message kind="error" line="27" text="if() pointcut designator cannot be used"/>
-         <message kind="error" line="29" text="if() pointcut designator cannot be used"/>
-         
-         <message kind="error" line="31" text="cflow() pointcut designator cannot be used"/>
-         <message kind="error" line="33" text="cflow() pointcut designator cannot be used"/>
-         
-         <message kind="error" line="35" text="cflowbelow() pointcut designator cannot be used"/>
-         <message kind="error" line="37" text="cflowbelow() pointcut designator cannot be used"/>
-         
-         <message kind="error" line="39" text="this() pointcut designator cannot be used"/>
-         <message kind="error" line="41" text="this() pointcut designator cannot be used"/>
-         
-         <message kind="error" line="43" text="target() pointcut designator cannot be used"/>
-         <message kind="error" line="45" text="target() pointcut designator cannot be used"/>
-         
-         <message kind="error" line="47" text="args() pointcut designator cannot be used"/>
-         <message kind="error" line="49" text="args() pointcut designator cannot be used"/>
-         
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs/abstractMethods" pr="49784"
-   	 title="Introduced abstract method on interface not implemented by subtype (weave altogether)">
-        <compile files="interface/C.java,interface/A.java,interface/B.java" />
-        <run class="C"/>
-    </ajc-test>
- 
-    
-   	<ajc-test dir="bugs/fieldsOnInterfaces"
-		pr="52107"
-		title="declare String field on interface">
-		<compile files="StringFieldOnInterface.java">
-			<message kind="warning" line="16" text="this affected type is not exposed"/>
-         	<message kind="warning" line="17" text="this affected type is not exposed"/>
-		</compile>	   
-	</ajc-test>
-
-	<ajc-test dir="bugs/fieldsOnInterfaces"
-		pr="52107"
-		title="declare int field on interface">
-		<compile files="IntFieldOnInterface.java">
-		<message kind="warning" line="27" text="this affected type is not exposed"/>
-         	<message kind="warning" line="28" text="this affected type is not exposed"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/fieldsOnInterfaces"
-		pr="52107"
-		title="declare Object field on interface">
-		<compile files="ObjectFieldOnInterface.java">
-			<message kind="warning" line="20" text="this affected type is not exposed"/>
-         	<message kind="warning" line="21" text="this affected type is not exposed"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs" pr="50776"
-   	 title="fail in compiling aspect with overriding method introduction with different throws clause ">
-        <compile files="IntertypeDifferentThrows.java" />
-    </ajc-test>
-    
-	<ajc-test dir="new" 
-		comment="in ajc 1.1.1, VerifyError Illegal use of nonvirtual function call"
-		title="super call in anonymous class created in around advice">
-        <compile files="SuperClosure.java" />
-        <run class="SuperClosure" />
-    </ajc-test>
-
-      <ajc-test dir="bugs" pr="44272"
-    		title="retitle warning to circular {advice} dependency at ...">
-        <compile files="CircularAdvicePrecedence.java" options="-1.4">
-            <message kind="error" line="4"/> 
-            <message kind="error" line="5"/> 
-            <message kind="error" line="6"/> 
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs"  pr="51322"
-    	title="Introduce Unknown Type to class causes Null pointer exception"  >
-        <compile files="Pr51322.java"> 
-        	<message kind="error" line="5"/>
-        </compile>
-    </ajc-test>
-	
-    <ajc-test dir="bugs"
-		title="Private members introduced via an interface are visible to the class"
-		pr="52928">
-		<compile
-			files="VisiblePrivateInterfaceITDs.java" >
-            <message kind="error" line="13"/>
-		</compile>
-	</ajc-test>
-	
-    <ajc-test dir="bugs/declarePrecedenceWithClasses" pr="53012"
-   	 title="declare precedence on a class should be a compile-time error">
-        <compile files="DeclarePrecedenceTestClass.java" >
-          <message kind="error" line="10" text="Non-aspect types can only be specified"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs/declarePrecedenceWithClasses" pr="53012"
-   	 title="declare precedence on a class should be a compile-time error">
-        <compile files="Priority.aj" />
-    </ajc-test>
-	
-    <ajc-test dir="bugs"
-    	pr="59440"
-		title="NPE when binary weaving a ctor ITD">
-        <compile files="CtorITD.aj">
-        	<message kind="error" line="2"/>
-        </compile>
-    </ajc-test>
-
-	<ajc-test dir="bugs"
-    	pr="59397"
-		title="NPE in compiler when using (an unusual) declare warning against a ctor ITD">
-        <compile files="DecwInitializationITD.java">
-        </compile>
-    </ajc-test>
-	
-   <ajc-test dir="bugs/compileOrdering" 
-		pr="59778"
-		title="InterTypeMethodDeclaration.java:104">
-        <compile files="B.java,D.java" >
-          <message kind="error" line="2" file="B.java"/>
-        </compile>
-        <compile files="D.java,B.java">
-          <message kind="error" line="2" file="B.java"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" 
-		pr="61538" title="nested uses of this() inside constructors not handled properly for initialization and preinitialization pointcuts">
-        <compile files="ConstructorMain.java"/>
-        <run class="ConstructorMain"/>
-    </ajc-test> 
-    
-    <ajc-test dir="bugs"
-		pr="61568" title="wrong variable binding in || pointcuts">
-        <compile files="DisjunctVarBinding.java">
-          <message kind="error" line="17" text="ambiguous binding of parameter(s) a, b across '||' in pointcut"/>
-        </compile>
-    </ajc-test>
- 
- 	<ajc-test dir="bugs" 
-		pr="60936" title="error message for constructor-execution pcd">
-        <compile files="InterfaceConstructor.java" options="-1.4">
-          <message kind="warning" line="10" text="no interface constructor-execution join point"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs"  pr="43714"
-    	title="weaving using an empty jar in -injars"  >
-        <compile files="notAJar.jar" outjar="outJar.jar"> 
-        	<message kind="warning" text="build config error: skipping missing, empty or corrupt inpath entry"/>
-        	<message kind="error" text="no sources specified"/>
-        	<message kind="fail"/>
-        </compile>
-    </ajc-test>
-	
-	 <ajc-test dir="bugs"  pr="43714"
-    	title="weaving using an empty jar in -aspectpath"  >
-        <compile files="WeaveLocal.java" aspectpath="notAJar.jar" outjar="outJar.jar" >         	
-        	<message kind="warning" text="build config error: skipping missing, empty or corrupt aspectpath entry"/>
-        </compile>
-    </ajc-test>
-    
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc120/ajc120.xml b/tests/src/test/java/org/aspectj/systemtest/ajc120/ajc120.xml
deleted file mode 100644
index dade07154..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc120/ajc120.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[
-<!ENTITY tests SYSTEM "../tests/src/org/aspectj/systemtest/ajc120/ajc120-tests.xml">
-]>
-
-<!-- AspectJ v1.2.0 Tests -->
-
-<suite>
-
-&tests;
-
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc121/Ajc121Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc121/Ajc121Tests.java
index e1ae534bf..f7dddd8f7 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc121/Ajc121Tests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc121/Ajc121Tests.java
@@ -17,9 +17,6 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
 
 public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 
-
-
-	  
   public static Test suite() {
     return XMLBasedAjcTestCase.loadSuite(Ajc121Tests.class);
   }
@@ -28,7 +25,6 @@ public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
     return getClassResource("ajc121.xml");
   }
 
-
   public void test001(){
     runTest("false ambiguous binding error (introduced in 1.2rc2)");
   }
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc121/ajc121-tests.xml b/tests/src/test/java/org/aspectj/systemtest/ajc121/ajc121-tests.xml
deleted file mode 100644
index 1d65dc3e1..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc121/ajc121-tests.xml
+++ /dev/null
@@ -1,494 +0,0 @@
-<!-- AspectJ v1.2.1 Tests -->
-
-
-   	<ajc-test dir="bugs"
-		pr="62073" title="false ambiguous binding error (introduced in 1.2rc2)">
-        <compile files="DisjunctVarBinding_2.java,DisjunctVarBinding_3.java">
-        	<message kind="error" line="4" file="DisjunctVarBinding_3.java" text="ambiguous binding of parameter(s) a, b across '||' in pointcut"/>
-        </compile>
-        <compile files="DisjunctVarBinding_3.java,DisjunctVarBinding_2.java">
-        	<message kind="error" line="4" file="DisjunctVarBinding_3.java" text="ambiguous binding of parameter(s) a, b across '||' in pointcut"/>
-        </compile>
-    </ajc-test>
-    
-	<ajc-test dir="bugs/IfPerThis"
-		pr="62458" title="An if() pointcut inside a perthis() clauses an ABORT - null pointer exception in ajc">
-        <compile files="Testcase1.java">
-        	<message kind="error" line="15" text="if() pointcut designator cannot be used directly in a per clause"/>
-        	<message kind="error" line="23" text="if() pointcut designator cannot be used directly in a per clause"/>
-        	<message kind="error" line="25" text="if() pointcut designator cannot be used directly in a per clause"/>
-        	<message kind="error" line="27" text="if() pointcut designator cannot be used directly in a per clause"/>
-        </compile>
-    </ajc-test>
-    
-   	<ajc-test dir="bugs/IfPerThis"
-		pr="62458" title="An if() pointcut inside a perthis() clauses an ABORT - null pointer exception in ajc">
-        <compile files="Testcase2.java"/>
-        <run class="Testcase2"/>
-    </ajc-test>
-   	
-   	<ajc-test dir="bugs/IfPerThis"
-		pr="62458" title="An if() pointcut inside a perthis() clauses an ABORT - null pointer exception in ajc">
-        <compile files="Testcase3.java">
-        	<message kind="error" line="2" text="if() pointcut designator cannot be used directly in a per clause"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs/bug70619"
-		pr="70619" title="compiler aborts with 'conflicting dominates orders' with circular declare precedences">
-        <compile files="Precedence.java">
-          <message kind="error" line="0" text="conflicting declare precedence"/>
-        </compile>
-        <compile files="Conflict.java,Order2.aj,Order1.aj">        
-          <message kind="error" line="0" text="conflicting declare precedence"/>
-        </compile>
-        <compile files="Conflict.java,Order1.aj,Order2.aj">
-          <message kind="error" line="0" text="conflicting declare precedence"/>
-        </compile>
-    </ajc-test>
- 
-    <ajc-test dir="bugs"
-		pr="53999" title="'can't bind type' message has $ for . in type name for declare soft">
-        <compile files="Cosmetic.java">
-        <message kind="error" line="9" text="can't bind type name 'unknown.Error'"/>
-        </compile>
-    </ajc-test> 
-    
-    <ajc-test dir="bugs/intertypeOverrides"
-		pr="69459" title="Hiding of Instance Methods by static methods">
-        <compile files="IntertypeOverrides.java">
-          <message kind="error" line="8" text="void Sub.m() cannot override void Super.m(); overriding method is static"/>
-        </compile>
-        <compile files="IntertypeOverrides2.java">
-          <message kind="error" line="8" text="void Sub.m() cannot override void Super.m(); overridden method is static"/>
-        </compile>
-        <compile files="Superclass.java,Subclass.java,Aspect1.java">
-          <message file="Aspect1.java" kind="error" line="2" 
-             text="void Subclass.staticMethod() cannot override void Superclass.staticMethod(); overridden method is static"/>
-        </compile>
-        <compile files="Superclass.java,Subclass.java,Aspect2.java">
-          <message file="Aspect2.java" kind="error" line="2"
-             text="void Subclass.nonstaticMethod() cannot override void Superclass.nonstaticMethod(); overriding method is static"/>
-        </compile>
-    </ajc-test>
-   
-      <ajc-test dir="new"
-      title="if(false) optimisation" pr="48990">
-        <compile files="IfFalse.aj" options="-1.4"/>
-        <run class="IfFalse"/>
-    </ajc-test>
-   
-    <ajc-test dir="new"
-      title="if(true) optimisation" pr="48990">
-        <compile files="IfTrue.aj" options="-1.4"/>
-        <run class="IfTrue"/>
-    </ajc-test> 
-    
-    <ajc-test dir="bugs/abstractITDs"
-		pr="64331" title="java.lang.NullPointerException in WeaverMessageHandler class">
-        <compile files="A.java,C.java" aspectpath="B.jar">
-          <message kind="error" line="1" text="must implement abstract inter-type declaration: void A.foo()"/>
-        </compile>
-    </ajc-test>
-  
-   <ajc-test dir="bugs/pr64262"
-      title="ClassCastException at BcelRenderer.java:169" pr="64262">
-        <compile files="PrimitiveCoercionInExactTypePatternMatching.java"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs"
-		pr="61536" title="Front-end bug, shouldn't allow patterns of the form foo.., should be foo..*">
-        <compile files="EllipsesStar.java">
-          <message kind="error" line="3" text="Syntax error on token"/>
-          <message kind="error" line="4" text="Syntax error on token"/>
-          <message kind="error" line="5" text="Syntax error on token"/>
-          <message kind="error" line="6" text="Syntax error on token"/>
-          <message kind="error" line="8" text="Syntax error on token"/>
-          <message kind="error" line="10" text="Syntax error on token"/>
-          <message kind="error" line="12" text="Syntax error on token"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs"
-		pr="67774" title="Nullpointer-Exception when defining a withincode() pointcut">
-        <compile files="WithincodeNPE01.java">
-          <!-- there are 3 join points that result in decw match, but 2 are on the same line! -->
-          <message kind="warning" line="2" text="In String ctor"/>
-          <message kind="warning" line="11" text="In String ctor"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="60015"
-      title="NPE, Incorrect XLint:unmatchedSuperTypeInCall warning">
-      <compile files="IncorrectXlintOnInterface.java">
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs/typeVisibilityProblem" pr="67591"
-      title="invalid warning indicating no match when a match really occurs">
-      <compile files="Main.java">
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="71273"
-      title="RuntimeException thrown: Could not find instruction: org.apache.bcel.generic.B2I">
-      <compile files="NoByteToInt.java"/>
-      <run class="NoByteToInt"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs/AroundAdviceJPs" pr="71377"
-    	title="Cannot advise private method call in around advice">
-    	<compile files="JoinPointInAroundAdvice.java"/>
-    	<run class="JoinPointInAroundAdvice"/>
-   	</ajc-test>
-    
-   <ajc-test dir="bugs/AroundAdviceJPs" pr="71377"
-    	title="Cannot advise private field sets in around advice">
-    	<compile files="FieldJoinPointsInAroundAdvice.java"/>
-    	<run class="FieldJoinPointsInAroundAdvice"/>
-   	</ajc-test>
-   	
-   	<ajc-test dir="bugs/AroundAdviceJPs" pr="71377"
-    	title="Cannot advise private field gets in around advice">
-    	<compile files="FieldGetJoinPointsInAroundAdvice.java"/>
-    	<run class="FieldGetJoinPointsInAroundAdvice"/>
-   	</ajc-test>
-
-<!--
-	commented out as test takes over 5 minutes to run - reinstate if you need to investigate 70201 for
-	any reason.
-	<ajc-test dir="bugs" pr="70201"
-    	title="Branch target offset too large for short">
-        <compile files="VeryLongBranch.java"/>
-	</ajc-test>
--->
-
-<!-- these next two tests commented out as they take minutes to run - reinstate if you need to 
-	investigate 59208 for any reason 
-	<ajc-test dir="bugs/pr59208" pr="59208"
-    	title="Weaver fails in BCEL for large classes">
-        <compile files="Foo.java, A.aj">
-	        <message kind="error" line="0" text="constant pool too big"></message>
-	    </compile>
-	</ajc-test>
-
-
-	<ajc-test dir="bugs/pr59208" pr="59208"
-    	title="Weaver fails in BCEL for large classes (binary)">
-        <compile 
-        	aspectpath="test.jar"
-        	inpath="classes">
-	        <message kind="error" line="0" text="constant pool too big"></message>
-	    </compile>
-	</ajc-test>
--->
-
-  	<ajc-test dir="bugs/pr53981" pr="538981"
-    	title="proceed used as method name in around advice (1)">
-    	<compile files="Proceeding1.aj"/>
-    	<run class="Proceeding1"/>
-   	</ajc-test>
-
-  	<ajc-test dir="bugs/pr53981" pr="538981"
-    	title="proceed used as method name in around advice (2)">
-    	<compile files="Proceeding2.aj"/>
-    	<run class="Proceeding2"/>
-   	</ajc-test>
-
-  	<ajc-test dir="bugs/pr53981" pr="538981"
-    	title="proceed used as method name in around advice (3)">
-    	<compile files="Proceeding3.aj"/>
-    	<run class="Proceeding3"/>
-   	</ajc-test>
-
-	<ajc-test dir="bugs" pr="61572"
-    	title="ITDs on inner classes should be static context">
-    	<compile files="PR61572.aj">
-	        <message kind="error" line="19" text="Cannot make a static reference to the non-static field zzz"></message>
-    	</compile>
-   	</ajc-test>
-
-    <ajc-test dir="bugs/oxford" pr="65319"
-	  	title="ajc crashes when compiling the following program (binding this() and target())">
-		<compile files="PR65319.java">
-		    <!-- target comes before this comes before args, and we only report one error -->
-			<message kind="error" line="23" text="ambiguous binding of parameter(s) x across '||' in pointcut"/>
-			<message kind="error" line="25" text="ambiguous binding of parameter(s) x across '||' in pointcut"/>
-			<message kind="error" line="27" text="ambiguous binding of parameter(s) x across '||' in pointcut"/>
-			<message kind="error" line="29" text="ambiguous binding of parameter(s) x across '||' in pointcut"/>
-		</compile>
-	</ajc-test>
-	
-<!-- should NOT raise error, despite Oxford expectations to the contrary -->
-	<ajc-test dir="bugs/oxford" pr="62475"
-	  	title="resolution of IT field inits">
-		<compile files="PR62475.java">
-		</compile>
-	</ajc-test>
-	
-
-	<ajc-test 
-    	dir="bugs/invalidAbsoluteTypeName" 
-    	pr="65925"
-		title="Valid but inaccessible type names should not be flagged by XLint:invalidAbsoluteTypeName">
-        <compile files="False_InvalidAbsoluteTypeName.java">
-        	<message kind="warning" line="17"/>
-        </compile>
-        <run class="False_InvalidAbsoluteTypeName"/>
-    </ajc-test>
- 
-  	<ajc-test dir="bugs/PR68991" pr="68991"
-    	title="intertype initialisers should match field set pointcuts">
-    	<compile files="Simple.java"/>
-    	<run class="Simple"/>
-   	</ajc-test>
-   	 	
-   	<ajc-test dir="bugs/PR68991" pr="68991"
-    	title="intertype initialisers should match field set pointcuts (oxford testcase)">
-    	<compile files="Oxford.java"/>
-    	<run class="Oxford"/>
-   	</ajc-test>
-	
-	<ajc-test dir="bugs" pr="54421"
-		title="Compile time declarations (warning and error) do not accept string concatenation (with +)">
-        <compile files="decwStrings.java">
-        	<message kind="warning" line="5"/>
-			<message kind="warning" line="19" text="hello world"/>
-			<message kind="warning" line="22" text="hello world"/>
-			<message kind="warning" line="25" text="hello world"/>
-			<message kind="warning" line="30" text="hello world"/>
-			<message kind="warning" line="34" text="hello world"/>
-			<message kind="warning" line="39" text="abcdefghijklmnopqrstuvwxyz"/>
-        </compile>
-    </ajc-test>
-	
-	<ajc-test dir="bugs" pr="54421"
-		title="Compile time declarations (warning and error) do not accept string concatenation (with +) (2)">
-        <compile files="decwStringsErroneous.java">
-			<message kind="error" line="22"/>
-        </compile>
-    </ajc-test>
-	    
-	<ajc-test dir="bugs/oxford" pr="61768"
-	  	title="scope for inter-type methods">
-		<compile files="PR61768.java">
-			<message kind="error" line="37" text="No enclosing instance of type Aspect is accessible"/>
-		</compile>
-	</ajc-test>
-
-	<ajc-test dir="bugs/doYouHaveVisiblePrivates" pr="71372"
-	  	title="NoSuchMethodError calling private method from around advice in inner aspect">
-		<compile files="PrivateCall.java"/>
-		<run class="PrivateCall"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs/doYouHaveVisiblePrivates" pr="71372"
-	  	title="NoSuchMethodError calling private method from around advice in inner aspect (2)">
-		<compile files="PrivateCall2.java,PrivateCall3.java"/>
-		<run class="def.PrivateCall3"/>
-	</ajc-test>
-		
-	<ajc-test dir="bugs/doYouHaveVisiblePrivates" pr="71372"
-	  	title="NoSuchMethodError calling private method from around advice in inner aspect (3)">
-		<compile files="PrivateCallInstance.java"/>
-		<run class="PrivateCallInstance"/>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/doYouHaveVisiblePrivates" pr="71372"
-	  	title="NoSuchMethodError calling private method from around advice in inner aspect (4)">
-		<compile files="PrivateCall_Instance_Package1.java,PrivateCall_Instance_Package2.java"/>
-		<run class="def.PrivateCall_Instance_Package2"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs/privilegedNPE" pr="67579"
-	  	title="NPE on privileged aspect error">
-		<compile files="a/ITD.aj,b/B.aj"/>
-		<run class="b.B"/>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/privilegedNPE" pr="67579"
-	  	title="NPE on privileged aspect error (2)">
-		<compile files="b/B.aj,a/ITD.aj"/>
-		<run class="b.B"/>
-	</ajc-test>
-
-    <ajc-test dir="bugs/privilegedAccess" pr="67578"
-	  	title="Privileged Aspect Access Problem Across Packages">
-		<compile files="b/B.aj,a/ITD.aj"/>
-		<run class="b.B"/>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/privilegedAccess" pr="67578"
-	  	title="Privileged Aspect Access Problem Across Packages (2)">
-		<compile files="b/B_notPrivileged.aj,a/ITD.aj">
-			<message kind="error" line="7" text="The method returnNothing(Object) from the type ITD is not visible"/>
-		</compile>
-	</ajc-test>
-		
-	<ajc-test dir="bugs" pr="62642"
-	  	title="proper handling of ExceptionInIntializer inside clinit in presence of after throwing advice">
-		<compile files="pr62642.java"/>
-		<run class="pr62642"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs" pr="64069"
-	  	title="ITD name clashes with private members">
-		<compile files="PR64069.aj">
-			<message kind="error" line="5" text="conflicts with existing member"/>
-			<message kind="error" line="10" text="conflicts with existing member"/>
-			<message kind="error" line="14" text="conflicts with existing member"/>
-			<!-- new error expected due to 275032 change - the itd for the ctor will be ignored in the clash case -->
-			<message kind="error" line="41" text="The constructor A() is not visible"/>
-		</compile>
-	</ajc-test>
-
-	<ajc-test dir="bugs/pr71723" pr="71723"
-	  	title="Inconsistency in scoping of protected members in ITDs">
-		<compile files="foo/Foo.java,bar/Bar.aj">
-			<message kind="error" line="8" text="The method i() from the type Foo is not visible"/>
-			<message kind="error" line="9" text="The method ancientI() from the type Foo is not visible"/>
-			<message kind="error" line="10" text="The method ancientJ() from the type AncientFoo is not visible"/>
-			<message kind="error" line="11" text="The method clone() from the type Object is not visible"/>
-			<message kind="error" line="12" text="Cannot make a static reference to the non-static method clone() from the type Object"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="design/sourceLines" pr="37020"
-	  	title="wrong line for method execution join point">
-		<compile files="TestSourceLines.java">
-			<message kind="warning" line="1" text="static init"/>
-			<message kind="warning" line="12" text="cons execution"/>
-			<message kind="warning" line="12" text="pre-init"/>
-			<message kind="warning" line="12" text="just-init"/>
-			<message kind="warning" line="16" text="cons execution"/>
-			<message kind="warning" line="16" text="just-init"/>
-			<message kind="warning" line="16" text="pre-init"/>
-			<message kind="warning" line="20" text="method execution"/>
-			<message kind="warning" line="24" text="method execution"/>
-			<message kind="warning" line="28" text="method execution"/>
-			<message kind="warning" line="35" text="static init"/>
-			<message kind="warning" line="35" text="just-init"/>
-			<message kind="warning" line="35" text="pre-init"/>
-			<message kind="warning" line="39" text="pre-init"/>
-			<message kind="warning" line="39" text="just-init"/>
-			<message kind="warning" line="39" text="static init"/>
-			<message kind="warning" line="47" text="advice"/>
-		</compile>
-	</ajc-test>
-
-	<ajc-test dir="bugs/interfaceITDs" pr="70794"
-	  	title="The introduction on interface causes the interface implementation class error (1)">
-		<compile files="PublicPublic.java"/>
-	</ajc-test>
-		
-	
-	<ajc-test dir="bugs/interfaceITDs" pr="70794"
-	  	title="The introduction on interface causes the interface implementation class error (2)">
-		<compile files="PackagePublic.java"/>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/interfaceITDs" pr="70794"
-	  	title="The introduction on interface causes the interface implementation class error (3)">
-		<compile files="PackagePackage.java">
-			<message kind="error" line="17" text="abstract intertype method declaration 'void PackagePackage.world()' on interface PackagePackage must be declared public (compiler limitation)"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/interfaceITDs" pr="70794"
-	  	title="The introduction on interface causes the interface implementation class error (4)">
-		<compile files="PublicPackage.java">
-			<message kind="error" line="13" text="abstract intertype method declaration 'void PublicPackage.world()' on interface PublicPackage must be declared public (compiler limitation)"/>
-		</compile>
-	</ajc-test>
-
-	<ajc-test dir="bugs/pr72531" pr="72531"
-	  	title="declare warning warns at wrong points">
-		<compile files="de/rohith/HelloWorld.java,de/rohith/HelloWorldAspect.java,de/rohith/PrinterWorld.java">
-			<message kind="warning" line="15" text="*[] returning method called"/>
-			<message kind="warning" line="22" text="*[] returning method called"/>
-		</compile>
-	</ajc-test>
-
-    <ajc-test dir="bugs" pr="72699"
-	   title="Bogus error message: The abstract method ajc$pointcut$$tracingScope$a2 in type Tracing can only be defined by an abstract class (1)">
-	   <compile files="BogusMessage.java">
-	      <message kind="error" line="2" text="The abstract pointcut tracingScope can only be defined in an abstract aspect"/>
-       </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="72699"
-	   title="Bogus error message: The abstract method ajc$pointcut$$tracingScope$a2 in type Tracing can only be defined by an abstract class (2)">
-	   <compile files="BogusMessage2.java">
-	     <message kind="error" line="1" text="The type BogusMessage2 must be an abstract class to define abstract methods"/>
-	     <message kind="error" line="2" text="The abstract pointcut tracingScope can only be defined in an aspect"/>
-	   </compile>
-    </ajc-test>
-	
-	<ajc-test dir="bugs/pr70404" pr="70404" 
-		title="passing null to array arguments confuzes static join point signature. (1)">
-	  <compile files="Main.java,MainAspect.java"/>
-	  <run class="dk.infimum.aspectjtest.Main"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs/pr70404" pr="70404" 
-		title="passing null to array arguments confuzes static join point signature. (2)">
-	  <compile files="Main2.java,MainAspect.java"/>
-	  <run class="dk.infimum.aspectjtest.Main2"/>
-	</ajc-test>
-	
-    <ajc-test dir="bugs" pr="72528"
-		title="around advice throws java.lang.VerifyError at runtime">
-		<compile files="ArrayCloning.java"/>
-		<run class="ArrayCloning"/>
-	</ajc-test>
-
-    <ajc-test dir="bugs" pr="72157"
-		title="declare soft can cause programs with invalid exception behaviour to be generated">
-		<compile files="PR72157.java">
- 	      <message kind="error" line="13" text="Unhandled"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test 
-    	dir="bugs" 
-    	pr="75129"
-		title="NPE on thisJoinPoint mistake">
-        <compile files="TjpMistake.java">
-        	<message kind="error" line="22"/>
-        </compile>
-    </ajc-test>
-
-	<ajc-test dir="cflow" pr="76030" title="Optimization of cflow - counters (1)">
-        <compile files="CounterTest01.java"/>
-		<run class="CounterTest01"/>
-    </ajc-test>
-	
-	<ajc-test dir="cflow" pr="76030" title="Optimization of cflow - shared counters (2)">
-        <compile files="CounterTest02.java" options="-1.4"/>
-		<run class="CounterTest02"/>
-    </ajc-test>
-	
-	<ajc-test dir="cflow" pr="76030" title="Optimization of cflow - shared stacks (3)">
-        <compile files="CounterTest03.java"/>
-		<run class="CounterTest03"/>
-    </ajc-test>
-	
-	<ajc-test dir="cflow" pr="76030" title="Optimization of cflow - counters (4)">
-        <compile files="CounterTest04.java" options="-1.4"/>
-		<run class="CounterTest04"/>
-    </ajc-test>
-	
-    <ajc-test dir="cflow" pr="76030" title="Optimization of cflow - counters with abstract pointcuts (5)">
-        <compile files="CounterTest05.java"/>
-		<run class="CounterTest05"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs/pr76096" pr="76096" title="Anonymous classes unaware of introductions into abstract classes">
-        <compile files="ConcreteClassA.java"/>
-        <run class="ConcreteClassA"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="74952" title="before,after not (cflow(within(Trace*))) prints nothing">
-        <compile files="WhatsGoingOn.java"/>
-        <run class="WhatsGoingOn"/>
-    </ajc-test>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc121/ajc121.xml b/tests/src/test/java/org/aspectj/systemtest/ajc121/ajc121.xml
deleted file mode 100644
index 8ad54bf32..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc121/ajc121.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[
-<!ENTITY tests SYSTEM "../tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml">
-]>
-
-<!-- AspectJ v1.2.1 Tests -->
-
-<suite>
-
-&tests;
-
-</suite>
-
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/Annotations.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/Annotations.java
index f6cea64cb..d09a477b8 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc150/Annotations.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/Annotations.java
@@ -25,7 +25,7 @@ public class Annotations extends XMLBasedAjcTestCase {
 	  }
 
 	  protected File getSpecFile() {
-	    return new File("../tests/src/org/aspectj/systemtest/ajc150/ajc150.xml");
+		    return getClassResource("ajc150.xml");
 	  }
 	  
   public void testCompilingAnnotation() {
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/test/java/org/aspectj/systemtest/ajc150/ajc150.xml
deleted file mode 100644
index 9eda00b0c..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc150/ajc150.xml
+++ /dev/null
@@ -1,6308 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<!-- AspectJ v1.5.0 Tests -->
-<suite>
-
-    <ajc-test dir="bugs150" title="abstract perthis in @AspectJ">
-        <compile files="pr121197.aj" options="-1.5"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" title="different numbers of type vars">
-        <compile files="pr121575.aj" options="-1.5"/>
-        <run class="pr121575"/>
-    </ajc-test>
-
-    
-    <ajc-test dir="bugs150/pr121385" title="mixing aspect styles">
-        <compile files="A.java" options="-1.5"/>
-        <run class="A"/>
-    </ajc-test>
-    
-    <ajc-test dir="java5/generics/tvars" title="different numbers of type vars - 2">
-        <compile files="Case1.aj" options="-1.5 -showWeaveInfo">
-          <message kind="weave" text="Join point 'method-execution(void MyClass.read(java.lang.String))' in Type 'MyClass' (Case1.aj:13) advised by before advice from 'MyAspect' (Case1.aj:5)"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/generics/tvars" title="different numbers of type vars - 3">
-        <compile files="Case2.aj" options="-1.5 -showWeaveInfo">
-          <message kind="weave" text="Join point 'method-execution(void MyClass.read(java.lang.Number))' in Type 'MyClass' (Case2.aj:13) advised by before advice from 'MyAspect' (Case2.aj:5)"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/generics/tvars" title="different numbers of type vars - 4">
-        <compile files="Case3.aj" options="-1.5 -showWeaveInfo">
-          <message kind="error" line="9" text="The type MyClass&lt;T,E&gt; must implement the inherited abstract method MyInterface&lt;T&gt;.read(T)"/>
-        </compile>
-    </ajc-test>
-
-
-    <ajc-test dir="bugs150" title="access to private ITD from nested type">
-        <compile files="pr118698.aj"/>
-        <run class="pr118698"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" title="modifier overrides">
-       <compile files="pr119749.aj" options="-1.5">
-        	<message kind="warning" line="26" text="C E.*()"/>
-        	<message kind="warning" line="25" text="D E.*()"/>
-        	<message kind="warning" line="17" text="aa @Me void m()"/>
-        	<message kind="warning" line="17" text="aa void m() throws Exception"/>
-        	<message kind="warning" line="17" text="aa * *(..) throws Exception"/>
-        	<message kind="warning" line="37" text="aa call void m() throws Exception"/>
-        	<message kind="warning" line="38" text="aa call void m() throws Exception"/>
-       </compile>
-        <run class="pr119749">
-            <stdout>
-             <line text="execution(void pr119749.C.m()): execMe[Me]"/>
-             <line text="execution(void pr119749.C.m()): execEx"/>
-            </stdout>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr120826" pr="120826" title="varargs NPE">
-     <compile files="TestVarargs.java" options="-1.5"/>
-    </ajc-test> 
-    
-
-    <ajc-test dir="bugs150/pr112476/case1" title="binary weaving decp broken">
-        <compile files="lib/A.java,lib/B.java,lib/C.java" outjar="library.jar" options="-1.5"/>
-        <!-- library.jar on the aspectpath here just for resolution when compiling SuperC -->
-        <compile aspectpath="library.jar" files="weaved/SuperC.java" outjar="newsuper.jar" options="-1.5"/>
-        <compile inpath="library.jar;newsuper.jar" files="weaved/DeclareAspect.aj" options="-1.5 -showWeaveInfo">
-          <message kind="weave" text="Setting superclass of type 'lib.C' (C.java) to 'weaved.SuperC' (DeclareAspect.aj)"/>
-        </compile>
-        <run class="weaved.SuperC">
-          <stdout>
-             <line text="Is [class lib.C] subcass of [class weaved.SuperC]? true"/>
-          </stdout>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr114005" title="Annotated ITDFs - 1">
-      <compile files="Declaration1.java" options="-1.5"/>
-      <run class="Declaration1">
-        <stdout>
-          <line text="public java.lang.String Test.firstProperty has annotation:true"/>
-          <line text="public java.lang.String Test.secondProperty has annotation:true"/>
-        </stdout>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" pr="114495" title="parameterized pointcut and advice">
-    		<compile files="Pr114495.aj" options="-1.5">
-    			<message kind="warning" line="3" text="going()"/>
-    		</compile>
-    		<run class="Pr114495">
-    			<stdout>
-    				<line text="A.going()"/>
-    				<line text="AA.going()"/>
-    			</stdout>
-    		</run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" pr="112880" title="double parameter generic abstract type">
-    	  <compile files="Pr112880.aj" options="-1.5">
-    	  </compile>
-    	  <run class="Pr112880">
-    	  	<stdout>
-    	  		<line text="method returning C1 or C2"/>
-    	  		<line text="method returning C1 or C2"/>
-    	  	</stdout>
-    	  </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr114005" title="Annotated ITDFs - 2">
-      <compile files="Declaration2.java" options="-1.5"/>
-      <run class="Declaration2">
-        <stdout>
-          <line text="public java.lang.String Test.firstProperty has annotation:true"/>
-          <line text="public java.lang.String Test.secondProperty has annotation:true"/>
-        </stdout>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" pr="114054" title="pertarget and negated pointcut">
-     <compile files="Pr114054.aj" options=""/>
-     <run class="Pr114054"/>
-    </ajc-test>  
-    
-    <ajc-test dir="bugs150" pr="121385" title="mixing styles">
-     <compile files="pr121385.aj" options="-1.5"/>
-    </ajc-test> 
-        
-    <ajc-test dir="java5/decps" title="decps - 1">
-     <compile files="Basic1.java" options="-1.5"/>
-     <run class="Basic1"/>
-    </ajc-test>  
-
-    <ajc-test dir="java5/decps" title="decps - 1b">
-     <compile files="Basic1b.java" options="-1.5"/>
-     <run class="Basic1b"/>
-    </ajc-test>   
-    
-    <ajc-test dir="java5/decps" title="decps - 2">
-     <compile files="Basic2.java" options="-1.5 -showWeaveInfo">
-       <message kind="weave" text="Join point 'method-execution(void X$I.m2())' in Type 'X' (Basic2.java:15) advised by before advice from 'X' (Basic2.java:23)"/>
-       <message kind="weave" text="Type 'X$I' (Basic2.java) has intertyped method from 'X' (Basic2.java:'void X$I.m2()')"/>
-       <message kind="weave" text="Extending interface set for type 'Basic2' (Basic2.java) to include 'X$I' (Basic2.java)"/>
-       <message kind="weave" text="Type 'Basic2' (Basic2.java) has intertyped method from 'X' (Basic2.java:'void X$I.m2()')"/>
-       <message kind="weave" text="Join point 'method-execution(void Basic2.main(java.lang.String[]))' in Type 'Basic2' (Basic2.java:2) advised by before advice from 'X' (Basic2.java:23)"/>
-     </compile>
-     <run class="Basic2"/>
-    </ajc-test>  
-
-    <ajc-test dir="java5/decps" title="decps - 2b">
-     <compile files="Basic2b.java" options="-1.5 -showWeaveInfo">
-       <message kind="weave" text="Join point 'method-execution(void X$IIimpl.m2())' in Type 'X$IIimpl' (Basic2b.java:18) advised by before advice from 'X' (Basic2b.java:27)"/>
-       <message kind="weave" text="Extending interface set for type 'Basic2b' (Basic2b.java) to include 'X$I' (Basic2b.java)"/>
-       <message kind="weave" text="Join point 'method-execution(void Basic2b.main(java.lang.String[]))' in Type 'Basic2b' (Basic2b.java:4) advised by before advice from 'X' (Basic2b.java:27)"/>
-     </compile>
-     <run class="Basic2b"/>
-    </ajc-test>  
-    
-    <ajc-test dir="java5/decps" title="decps - 3">
-     <compile files="Basic3.java" options="-1.5 -showWeaveInfo">
-       <message kind="weave" text="Extending interface set for type 'Basic3' (Basic3.java) to include 'X$I' (Basic3.java)"/>
-       <message kind="weave" text="Type 'Basic3' (Basic3.java) has intertyped method from 'X' (Basic3.java:'void X$I.m2()')"/>
-       <message kind="weave" text="Type 'Basic3' (Basic3.java) has intertyped method from 'X' (Basic3.java:'void X$I.m3()')"/>
-	   <message kind="weave" text="Type 'Basic3' (Basic3.java) has intertyped method from 'X' (Basic3.java:'void X$I.m4()')"/>
-	   <message kind="weave" text="Join point 'method-call(void X$I.m2())' in Type 'Basic3' (Basic3.java:7) advised by before advice from 'X' (Basic3.java:29)"/>
-	   <message kind="weave" text="Join point 'method-call(void X$I.m3())' in Type 'Basic3' (Basic3.java:8) advised by before advice from 'X' (Basic3.java:29)"/>
-	   <message kind="weave" text="Join point 'method-call(void X$I.m2())' in Type 'Basic3' (Basic3.java:9) advised by before advice from 'X' (Basic3.java:29)"/>
-	   <message kind="weave" text="Join point 'method-call(void X$I.m4())' in Type 'Basic3' (Basic3.java:10) advised by before advice from 'X' (Basic3.java:29)"/>
-	   <message kind="weave" text="Type 'X$I' (Basic3.java) has intertyped method from 'X' (Basic3.java:'void X$I.m2()')"/>
-	   <message kind="weave" text="Type 'X$I' (Basic3.java) has intertyped method from 'X' (Basic3.java:'void X$I.m3()')"/>
-	   <message kind="weave" text="Type 'X$I' (Basic3.java) has intertyped method from 'X' (Basic3.java:'void X$I.m4()')"/>
-	 </compile>
-     <run class="Basic3"/>
-    </ajc-test>  
-
-    <ajc-test dir="java5/decps" title="decps - 3b">
-     <compile files="Basic3b.java" options="-1.5 -showWeaveInfo">
-       <message kind="weave" text="Extending interface set for type 'Basic3b' (Basic3b.java) to include 'X$I' (Basic3b.java)"/>
-       <message kind="weave" text="Type 'Basic3b' (Basic3b.java) has intertyped method from 'X' (Basic3b.java:'void X$I.m2()')"/>
-       <message kind="weave" text="Type 'Basic3b' (Basic3b.java) has intertyped method from 'X' (Basic3b.java:'void X$I.m3()')"/>
-	   <message kind="weave" text="Type 'Basic3b' (Basic3b.java) has intertyped method from 'X' (Basic3b.java:'void X$I.m4()')"/>
-	   <message kind="weave" text="Join point 'method-call(void X$I.m2())' in Type 'Basic3b' (Basic3b.java:7) advised by before advice from 'X' (Basic3b.java:35)"/>
-	   <message kind="weave" text="Join point 'method-call(void X$I.m3())' in Type 'Basic3b' (Basic3b.java:8) advised by before advice from 'X' (Basic3b.java:35)"/>
-	   <message kind="weave" text="Join point 'method-call(void X$I.m2())' in Type 'Basic3b' (Basic3b.java:9) advised by before advice from 'X' (Basic3b.java:35)"/>
-	   <message kind="weave" text="Join point 'method-call(void X$I.m4())' in Type 'Basic3b' (Basic3b.java:10) advised by before advice from 'X' (Basic3b.java:35)"/>
-	 </compile>
-     <run class="Basic3b"/>
-    </ajc-test>   
-    
-    <ajc-test dir="java5/decps" title="decps - 3c">
-     <compile files="Basic3c.java" options="-1.5">
-       <message kind="error" text="@DeclareParents: defaultImpl=&quot;X$IImpl&quot; has a no argument constructor, but it is of incorrect visibility"/>
-	 </compile>
-    </ajc-test>  
-        
-    <ajc-test dir="bugs150/pr119570" pr="119570" title="spurious override method warning">
-     <compile files="NodeImpl.java,INode.java,ParameterizedDP.java" options="-1.5"/>
-     <run class="bugs.ParameterizedDP"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr119570" pr="119570" title="spurious override method warning - 2">
-     <compile files="ParameterizedDP.java,NodeImpl.java,INode.java" options="-1.5"/>
-     <run class="bugs.ParameterizedDP"/>
-    </ajc-test>  
-    
-    <ajc-test dir="bugs150/pr119570" pr="119570" title="spurious override method warning - 3">
-     <compile files="SimpleTest.java" options="-1.5"/>
-     <run class="SimpleTest"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs150/pr120521" pr="120521" title="named pointcut not resolved in pertarget pointcut">
-     <compile files="PerTargetSubaspectError.java" options="-1.4"/>
-    </ajc-test>  
-
-    <ajc-test dir="bugs150/pr119210" pr="119210" title="autoboxing around advice - 1">
-     <compile files="TestLib.java,ThreadAspectLib.java" options="-1.5"/>
-     <run class="TestLib">
-       <stderr>
-          <line text="obtaining five, got 3"/>
-       </stderr>
-     </run>
-    </ajc-test> 
- 
-    <ajc-test dir="bugs150/pr119210" pr="119210" title="autoboxing around advice - 2">
-     <compile files="TestLib2.java,ThreadAspectLib2.java" options="-1.5"/>
-     <run class="TestLib2">
-       <stderr>
-          <line text="obtaining five, got 3"/>
-       </stderr>
-     </run>
-    </ajc-test> 
-   
-    <ajc-test dir="bugs150/pr119210" pr="119210" title="autoboxing around advice - 3">
-     <compile files="TestLib2.java,ThreadAspectLib2.java" options="-1.4">
-       <message kind="error" line="16" text="incompatible return type applying to method-call(java.lang.Integer TestLib2.getFive())"/>
-       <message kind="error" line="4" text="incompatible return type applying to method-call(java.lang.Integer TestLib2.getFive())"/>
-     </compile>
-    </ajc-test> 
-    
-    <ajc-test dir="bugs150/pr119539" pr="119539" title="generic pertypewithin aspect - 1">
-     <compile files="GenericPerTypeWithin.java" options="-1.5 -showWeaveInfo">
-     	<message kind="weave" text="Join point 'constructor-execution(void bugs.C.&lt;init&gt;())' in Type 'bugs.C' (GenericPerTypeWithin.java:10) advised by before advice from 'bugs.A' (GenericPerTypeWithin.java:21)"/>
-	    <message kind="weave" text="Join point 'constructor-execution(void bugs.C.&lt;init&gt;())' in Type 'bugs.C' (GenericPerTypeWithin.java:10) advised by before advice from 'bugs.A' (GenericPerTypeWithin.java:20)"/>
-	 </compile>
-     <run class="bugs.GenericPerTypeWithin"/>
-    </ajc-test>  
-    
-    <ajc-test dir="bugs150/pr119539" pr="119539" title="generic pertypewithin aspect - 2">
-     <compile files="GenericPerTypeWithin2.java" options="-1.5 -showWeaveInfo">
-       <message kind="error" line="24" text="a generic super-aspect must be fully parameterized in an extends clause"/>
-	 </compile>
-    </ajc-test>  
-    
-    <ajc-test dir="bugs150/pr119539" pr="119539" title="generic pertypewithin aspect - 3">
-     <compile files="GenericPerTypeWithin3.java" options="-1.5 -showWeaveInfo">
-     	<message kind="weave" text="Join point 'constructor-execution(void bugs.GenericPerTypeWithin3$C.&lt;init&gt;())' in Type 'bugs.GenericPerTypeWithin3$C' (GenericPerTypeWithin3.java:15) advised by before advice from 'bugs.GenericPerTypeWithin3$A' (GenericPerTypeWithin3.java:10)"/>
-		<message kind="warning" line="15" text="Singleton.creation()"/>
-	 </compile>
-     <run class="bugs.GenericPerTypeWithin3"/>
-    </ajc-test>  
-    
-    <ajc-test dir="bugs150/pr117854" pr="117854" title="broken switch transform">
-     <compile files="BrokenSwitch.java" options=""/>
-     <run class="BrokenSwitch"/>
-    </ajc-test>  
-    
-    <ajc-test dir="bugs150/pr119749" pr="119749" title="incorrect exception signature matching">
-     <compile files="InheritedThrows.java" options="-showWeaveInfo">  
-     	<message kind="weave" text="Join point 'method-execution(void InheritedThrows$NestedClassBoth.m())' in Type 'InheritedThrows$NestedClassBoth' (InheritedThrows.java:24) advised by afterThrowing advice from 'InheritedThrows$A' (InheritedThrows.java:4)"/>
-     	<message kind="weave" text="Join point 'method-execution(void InheritedThrows$NestedClass1.m())' in Type 'InheritedThrows$NestedClass1' (InheritedThrows.java:16) advised by afterThrowing advice from 'InheritedThrows$A' (InheritedThrows.java:4)"/>
-     </compile>
-    </ajc-test>  
-    
-    <ajc-test dir="bugs150/pr118599" pr="118599" title="ambiguous method when binary weaving - 1">
-     <!-- separate compilation was failing  -->
-     <compile files="Attributable.java" outjar="foo.jar" options="-1.5"/>
-     <compile files="AnAttributedClass.java" aspectpath="foo.jar" options="-1.5"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr118599" pr="118599" title="ambiguous method when binary weaving - 2">
-     <!-- complete compilation works -->
-     <compile files="Attributable.java,AnAttributedClass.java" options="-1.5"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs150" pr="104220" title="adviceexecution join point toString forms">
-      <compile files="Pr104220.aj"/>
-      <run class="Pr104220">
-        <stdout>
-          <line text="adviceexecution"/>
-          <line text="adviceexecution(void SomeAspect.before())"/>
-          <line text="adviceexecution(SomeAspect.before())"/>
-          <line text="adviceexecution(void SomeAspect.before())"/>
-        </stdout>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" pr="112756" title="pointcut expression containing 'assert'">
-     <compile files="Pr112756.aj" options="-warn:assertIdentifier -Xdev:Pinpoint"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr118781" pr="118781" title="verify error with around advice array sigs">
-     <compile files="MyMain.java,MyAspect.java,MyClass.java" options="-XnoInline"/>
-     <run class="blah.MyMain"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr117681" pr="117681" title="at declare parents">
-     <compile files="Test.java,TestAspect.java,Audit.java,AuditImpl.java" options="-1.5"/>
-     <run class="Test"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr120474" pr="120474" title="Dollar classes">
-     <compile files="$ProxyPr120474.java"/>
-     <compile files="X.aj" options="-outxml -1.4"/>
-     <run class="$ProxyPr120474" ltw="aop.xml">
-        <stdout>
-        </stdout>
-     </run>
-    </ajc-test>
-        
-    <ajc-test dir="bugs150/pr111667" pr="111667" title="lint for advice sorting">
-     <compile files="A.java,X.java,Y.java" options="-1.5 -Xlint:warning">
-       <message kind="warning" line="9" text="at this shadow method-execution(void A.m1()) no precedence is specified between advice applying from aspect X and aspect Y [Xlint:unorderedAdviceAtShadow]"/>
-     </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs150/pr118326" pr="118326" title="illegal initialization - 1">
-     <compile files="Foo.java,Bar.java">
-       <message kind="error" line="2" text="Type mismatch: cannot convert from null to int"/>
-       <message kind="error" line="6" text="Type mismatch: cannot convert from Integer to int"/>
-       <message kind="error" line="8" text="Type mismatch: cannot convert from String to int"/>
-     </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr118326" pr="118326" title="illegal initialization - 2">
-     <compile files="Foo.java,Bar.java" options="-1.5">
-       <message kind="error" line="2" text="Type mismatch: cannot convert from null to int"/>
-       <message kind="error" line="8" text="Type mismatch: cannot convert from String to int"/>
-     </compile>
-    </ajc-test>
-        
-    <ajc-test dir="bugs150/pr117296" pr="117296" title="self bounding generic types">
-     <compile files="PropertySupport.java" options="-1.5"/>
-     <run class="PropertySupport"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" pr="113368" title="thisJoinPointStaticPart in if test">
-    		<compile files="Pr113368.aj"/>
-    		<run class="Pr113368">
-    		</run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr87525" pr="87525" title="privilege problem with switch">
-   		<compile files="A.java,B.java">
-   		  <message kind="error" line="5" text="Fields accessible due to an aspect being privileged can not be used in switch statements"/>
-   		</compile>
-    </ajc-test>
-
-	<ajc-test dir="java5/reflection" title="pointcut parsing with ajc compiled pointcut references">
-		<compile files="PointcutLibrary.aj,ReflectOnAjcCompiledPointcuts.java" options="-1.5"></compile>
-		<run class="ReflectOnAjcCompiledPointcuts" classpath="../lib/bcel/bcel.jar"/>
-	</ajc-test>
-	
-	<ajc-test dir="java5/reflection" title="reflection on itds">
-		<compile files="InterTypeDeclarations.aj,ReflectOnCodeStyleITDs.java" options="-1.5 -Xlint:ignore -makeAjReflectable"></compile>
-		<run class="ReflectOnCodeStyleITDs" classpath="../lib/bcel/bcel.jar">
-		  <stdout>
-		  	<line text="public C.new(int, int, int)"/>
-		  	<line text="C.new(int, int)"/>
-		  	<line text="private C.new(int)"/>
-		  	<line text="private C.new(int)"/>	
-		  	<line text="public C.new(int, int, int)"/>
-		  	<line text="public C.new(int, int, int)"/>
-		  	<line text="int C.getY()"/>
-		  	<line text="int I.getY()"/>
-		  	<line text="public int C.getZ()"/>
-		  	<line text="public int I.getZ()"/>
-		  	<line text="private int C.getX()"/>
-		  	<line text="private int I.getX()"/>
-		  	<line text="private int C.getX()"/>
-		  	<line text="public int C.getZ()"/>
-		  	<line text="public int I.getZ()"/>
-		  	<line text="public int C.getZ()"/>
-		  	<line text="int C.y"/>
-		  	<line text="int I.y"/>
-		  	<line text="public int C.z"/>
-		  	<line text="public int I.z"/>
-		  	<line text="private int C.x"/>
-		  	<line text="private int I.x"/>
-		  	<line text="private int C.x"/>
-		  	<line text="public int C.z"/>
-		  	<line text="public int I.z"/>
-		  	<line text="public int C.z"/>
-		  </stdout>
-		</run>
-	</ajc-test>
-
-	<ajc-test dir="java5/reflection" title="reflection on @DeclareParents">
-		<compile files="AtAspectJDeclareParents.aj,ReflectOnAtAspectJDeclareParents.java" options="-1.5 -Xlint:ignore"></compile>
-		<run class="ReflectOnAtAspectJDeclareParents" classpath="../lib/bcel/bcel.jar">
-		  <stdout>
-		    <line text="declare parents : C implements I"/>
-		  	<line text="public int I.getX()"/>
-		  	<line text="public void I.setX(int)"/>
-		  	<line text="public int I.getX()"/>
-			<line text="public int I.getX()"/>
-		  	<line text="public void I.setX(int)"/>
-		  	<line text="public int I.getX()"/>
-		  </stdout>
-		</run>
-	</ajc-test>
-	
-	<ajc-test dir="compatibility/case1" title="generating code for a 1.2.1 runtime - 1">
-		<compile files="Simple.java" options="-Xajruntimetarget:1.2"/>
-		<run class="Simple" classpath="../lib/aspectj/lib/aspectjrt121.jar"/>
-	</ajc-test>
-	
-	<ajc-test dir="compatibility/case2" title="generating code for a 1.2.1 runtime - 2">
-		<compile files="TrackingErrors.aj,A.java" options="-Xajruntimetarget:1.2 -Xlint:ignore"/>
-		<run class="A" classpath="../lib/aspectj/lib/aspectjrt121.jar"/>
-	</ajc-test>
-		
-	<ajc-test dir="java5/reflection" title="arg names in advice annotations">
-		<compile files="AdviceWithArgs.aj" options="-1.5"></compile>
-		<run class="AdviceWithArgs"/>
-	</ajc-test>
-	
-	
-	<ajc-test dir="java5/reflection" pr="114322" title="reflection on abstract ITDs (Billing example)">
-		<compile files="ReflectBilling.java,Billing.aj" options="-1.5 -makeAjReflectable"/>
-		<run class="ReflectBilling">
-			<stdout>
-				<line text="public void Customer.addCharge(long)"/>
-				<line text="public long Local.callRate()"/>
-				<line text="public long LongDistance.callRate()"/>
-				<line text="public abstract long Connection.callRate()"/>
-				<line text="public Customer Connection.payer"/>
-				<line text="public long Customer.totalCharge"/>
-			</stdout>
-		</run>
-	</ajc-test>
-	
-	<ajc-test dir="bugs150" pr="103157" title="returning(Object) binding">
-		<compile files="Pr103157.aj" options="-1.4"/>
-		<run class="Pr103157">
-			<stdout>
-				<line text="returning from staticinit"/>
-				<line text="returning from preinit"/>
-				<line text="returning from set"/>
-				<line text="returning from cons exe"/>
-				<line text="returning from init"/>
-			</stdout>
-		</run>
-	</ajc-test>
-	
-	<ajc-test dir="bugs150" title="declare soft and adviceexecution" pr="103051">
-		<compile files="Pr103051.aj" options="-Xdev:Pinpoint"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs150" title="declare soft and exclusions" pr="103097">
-		<compile files="Pr103097.aj" options="-Xlint:ignore"/>
-		<run class="Pr103097"/>
-	</ajc-test>
-		    
-
-	<ajc-test dir="bugs150" title="Range problem">
-		<compile files="pr109614.java"/>
-		<run class="pr109614"/>
-	</ajc-test>
-	    
-    <ajc-test dir="bugs150/pr114436" title="ClassFormatError binary weaving perthis">
-     <compile files="SimpleTrace.aj,ConcreteSimpleTracing.aj" outjar="aspects.jar" options="-1.4"/>
-     <compile files="TestClass.java" aspectpath="aspects.jar" options="-1.4"/>
-     <run class="TestClass"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr113066" title="possible static imports bug - 1">
-        <compile files="Consts.java,TestNPE.java" options="-1.5"/>
-    </ajc-test>
-  
-    <ajc-test dir="bugs150" title="parameterized type and around advice">
-        <compile files="pr115250.aj" options="-1.5 -Xlint:ignore">
-          <!-- this first error happens twice, once for each piece of around advice -->
-          <message kind="error" line="10" text="incompatible return type applying to constructor-execution(void pr115250$C.&lt;init&gt;())"/>
-          <message kind="error" line="17" text="incompatible return type applying to constructor-execution(void pr115250$C.&lt;init&gt;())"/>
-          <message kind="error" line="27" text="incompatible return type applying to constructor-execution(void pr115250$C.&lt;init&gt;())"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" title="parameterized type and around advice - 2">
-        <compile files="pr115250_2.aj" options="-1.5 -Xlint:ignore -showWeaveInfo">
-          	<message kind="weave" text="Join point 'method-execution(pr115250_2$C pr115250_2$C.foo())' in Type 'pr115250_2$C' (pr115250_2.aj:7) advised by around advice from 'pr115250_2$A' (pr115250_2.aj:22)"/>
-			<message kind="weave" text="Join point 'method-execution(pr115250_2$C pr115250_2$C.foo())' in Type 'pr115250_2$C' (pr115250_2.aj:7) advised by around advice from 'pr115250_2$Normal' (pr115250_2.aj:12)"/>
-		</compile>
-        <run class="pr115250_2">
-          <stderr>
-            <line text="funky advice running"/>
-          </stderr>
-        </run>
-    </ajc-test>
-      
-    <ajc-test dir="bugs150/pr115788" title="parser exception">
-        <compile files="AAA.java">
-          <message kind="warning" line="3" text="no match for this type name: Screen"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr113066" title="possible static imports bug - 2">
-        <compile files="Consts2.java,TestNPE2.java" options="-1.5">
-          <message kind="error" line="2" text="The field Consts2.a.Consts2.A_CONST is not visible"/>
-          <!--  message has changed with 3.3 compiler upgrade, it used to be this: -->
-          <!-- message kind="error" line="2" text="The import a.Consts2.A_CONST cannot be resolved"/-->
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr113066" title="possible static imports bug - 3">
-        <compile files="Consts3.java,TestNPE3.java" options="-1.5"/>
-    </ajc-test>
-    
-    <ajc-test dir="java5/staticImports" title="import static java.lang.System.out">
-        <compile files="StaticImport.aj" options="-1.5"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs150" title="Problem with constructor ITDs">
-        <compile files="pr112783.aj" options="-1.5"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs150" title="NPE in ensureScopeSetup">
-        <compile files="pr115038.aj" options="-1.5">
-          <message kind="error" line="2" text="Cannot make inter-type declarations on type variables"/>
-        </compile>
-    </ajc-test>
- 
-    <ajc-test dir="bugs150" title="ITDC with no explicit cons call">
-      <compile files="Pr62606.aj" options="-1.5">
-        <message kind="warning" line="6" text="[Xlint:noExplicitConstructorCall]"/>
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/generics/bugs" title="using same type variable in ITD">
-      <compile files="SameTypeVariable.aj" options="-1.5">
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" title="capturebinding wildcard problem">
-      <compile files="pr114744.aj" options="-1.5">
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" title="Anonymous types and nome matching">
-      <compile files="Pr73050.aj" outjar="jar1.jar">
-        <message kind="warning" line="16" text="anonymous types should be matched by a * wild card"/>
-      </compile>
-      <compile inpath="jar1.jar">
-        <message kind="warning" line="0" text="anonymous types should be matched by a * wild card"/>     
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr86903" title="bcelrenderer bad">
-      <compile files="GenericService.java,Service.java,Main.java,BadWormhole.java"/>
-      <run class="Main"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr114343" title="field-get, generics and around advice">
-      <compile files="Test.java,Test1.java,Test2.java,TestAspect.aj" options="-1.5">
-          <message kind="warning" line="7" text="unchecked conversion when advice applied at shadow field-get(java.util.Set Test1.intsSet), expected java.util.Set&lt;java.lang.Integer&gt; but advice uses java.util.Set"/>
-          <message kind="warning" line="8" text="unchecked conversion when advice applied at shadow field-get(java.util.Set Test2.doubSet), expected java.util.Set&lt;java.lang.Double&gt; but advice uses java.util.Set"/>
-      </compile>
-      <run class="TestAspect"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr113947/case1" title="maws generic aspect - 1">
-        <compile files="AbstractListSupport.java,AnotherItem.java,Item.java,LinkedList.java,LinkedListItem.java,ListItem.java,StringList.java" options="-1.5">
-          <message kind="error" line="6" text="Cannot make inter-type declarations on type variables"/>
-          <message kind="error" line="8" text="Cannot make inter-type declarations on type variables"/>
-          <message kind="error" line="12" text="Cannot make inter-type declarations on type variables"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" title="aspectOf and generic aspects">
-        <compile files="pr115237.aj" options="-1.5"/>
-        <run class="pr115237"/>
-    </ajc-test>
-
-   <ajc-test dir="bugs150/pr114343/case2" title="field-get, generics and around advice - 2">
-      <compile files="Test.java,TTT.java,TestAspect.java" options="-1.5"/>
-      <run class="TestAspect">
-        <stderr>
-          <line text="TestAspect.main: Calling foo"/>
-          <line text="Creating Test&lt;Integer&gt; instance"/>
-          <line text="Calling toArray"/>
-          <line text="In around advice"/>
-          <line text="In toArray()"/>
-          <line text="done"/>
-          <line text="TestAspect.main: done"/>
-        </stderr>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr114343/case3" title="field-get, generics and around advice - 3">
-      <compile files="Test.java,TTT.java,TestAspect.java" options="-1.5"/>
-      <run class="TestAspect">
-        <stderr>
-          <line text="TestAspect.main: Calling foo"/>
-          <line text="Creating Test&lt;Integer&gt; instance"/>
-          <line text="Calling toArray"/>
-          <line text="In around advice"/>
-          <line text="In toArray()"/>
-          <line text="done"/>
-          <line text="Creating Test&lt;Integer&gt; instance"/>
-          <line text="Calling getFirst"/>
-          <line text="around on getFirstExec(): running"/>
-          <line text="done"/>
-          <line text="TestAspect.main: done"/>
-        </stderr>
-      </run>
-    </ajc-test>
-
-
-    <ajc-test dir="bugs150/pr113947/case2" title="maws generic aspect - 2">
-        <compile files="AbstractListSupport.java,AnotherItem.java,Item.java,LinkedList.java,LinkedListItem.java,ListItem.java,StringList.java" options="-1.5"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr113861" title="field-get problems with generic field">
-        <compile files="Test.java,TestAspect.java" options="-1.5"/>
-        <run class="com.Test"/>
-    </ajc-test>
-    
-    
-    <ajc-test dir="bugs150/pr99191" title="declare annotation on non existent type - 1">
-        <compile files="pr99191_1.java" options="-1.5">
-        	<message kind="error" line="4" text="The field 'int C.noSuchField' does not exist"/>
-			<message kind="error" line="5" text="The field 'int B.noSuchField' does not exist"/>
-        </compile>
-    </ajc-test> 
-    
-    <ajc-test dir="java5/generics/bugs/lists/case1" title="generics and ITD overrides - 1">
-        <compile files="Identifiable.java,Bean.java,LongIdentifiable.java,IdentifiableAspect.java" options="-1.5">
-        </compile>
-        <run class="IdentifiableAspect"/>
-    </ajc-test> 
-
-    <ajc-test dir="java5/generics/bugs/lists/case2" title="generics and ITD overrides - 2">
-        <compile files="Identifiable.java,Bean.java,LongIdentifiable.java,IdentifiableAspect.java" options="-1.5">
-        </compile>
-        <run class="IdentifiableAspect"/>
-    </ajc-test>
-    
-    <ajc-test dir="java5/generics/bugs/lists/case3" title="generics and ITD overrides - 3">
-        <compile files="Identifiable.java,Bean.java,LongIdentifiable.java,IdentifiableAspect.java" options="-1.5">
-        </compile>
-        <run class="IdentifiableAspect"/>
-    </ajc-test> 
-    
-    <ajc-test dir="java5/generics/bugs/lists/case4" title="generics and ITD overrides - 4">
-        <compile files="Identifiable.java,Bean.java,LongIdentifiable.java,IdentifiableAspect.java" options="-1.5">
-        </compile>
-        <run class="IdentifiableAspect"/>
-    </ajc-test> 
-
-    <!-- Currently a warning doesn't occur if the annotation is already on the field
-         (see bug 113029). If this is fixed, need to add check for this warning to this
-         test as in test "declare annotation on non existent type - 4" -->
-    <ajc-test dir="bugs150/pr99191" title="declare annotation on non existent type - 2">
-        <compile files="pr99191_2.java" options="-1.5">
-        </compile>
-    </ajc-test> 
-
-    <ajc-test dir="bugs150/pr99191" title="declare annotation on non existent type - 3">
-        <compile files="pr99191_3.java" options="-1.5">
-        	<message kind="error" line="4" text="The method 'public * C.noSuchMethod(..)' does not exist"/>
-			<message kind="error" line="5" text="The method '* B.noSuchMethod(..)' does not exist"/>
-        </compile>
-    </ajc-test> 
-
-    <ajc-test dir="bugs150/pr99191" title="declare annotation on non existent type - 4">
-        <compile files="pr99191_4.java" options="-1.5">
-        	<message kind="warning" text="void C.amethod() - already has an annotation of type Annotation, cannot add a second instance [Xlint:elementAlreadyAnnotated]"/>
-        </compile>
-    </ajc-test> 
-
-    <ajc-test dir="bugs150/pr99191" title="declare annotation on non existent type - 5">
-        <compile files="pr99191_5.java" options="-1.5">
-        	<message kind="error" line="4" text="The method 'C.new(java.lang.String)' does not exist"/>
-			<message kind="error" line="5" text="The method 'B.new(int)' does not exist"/>
-        </compile>
-    </ajc-test> 
-
-    <ajc-test dir="bugs150/pr99191" title="declare annotation on non existent type - 6">
-        <compile files="pr99191_6.java" options="-1.5">
-        	<message kind="warning" text="void C.&lt;init&gt;(int) - already has an annotation of type Annotation, cannot add a second instance [Xlint:elementAlreadyAnnotated]"/>
-        </compile>
-    </ajc-test>
- 
-    <ajc-test dir="bugs150/pr113630/case1" title="IncompatibleClassChangeError - errorscenario">
-        <compile files="Bean.java,BeanTestCase.java,javaBean.java,propertyChanger.java,PropertySupportAspect5.aj" options="-1.5">
-          <message kind="warning" line="9" text="Failing match because annotation 'javaBean' on type 'Bean' has SOURCE retention.  Matching allowed when RetentionPolicy is CLASS or RUNTIME"/>
-          <message kind="error" line="18" text="The method addPropertyChangeListener(String, BeanTestCase) is undefined for the type Bean"/>
-        </compile>
-    </ajc-test>  
-
-    <ajc-test dir="bugs150/pr113630/case2" title="IncompatibleClassChangeError - workingscenario">
-        <compile files="Bean.java,BeanTestCase.java,javaBean.java,propertyChanger.java,PropertySupportAspect5.aj" options="-1.5"/>
-        <run class="BeanTestCase"/>
-    </ajc-test>  
- 
-    <ajc-test dir="bugs150" title="Generics ClassCastException">
-        <compile files="pr113445.aj" options="-1.5,-emacssym"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" title="test illegal change to pointcut declaration">
-        <compile files="pr111915.java" options="-1.5 -showWeaveInfo">
-          <message kind="weave" text="Join point 'method-execution(void SomeClass.doSomething())' in Type 'SomeClass' (pr111915.java:4) advised by around advice from 'DoesntCompile' (pr111915.java:15)"/>
-          <message kind="weave" text="Extending interface set for type 'SomeClass' (pr111915.java) to include 'java.io.Serializable' (pr111915.java)"/>
-        </compile>
-    </ajc-test> 
-
-    <ajc-test dir="java5/bridgeMethods" pr="72766" title="Ignore bridge methods">
-        <compile files="AspectX.aj" inpath="testcode.jar" options="-showWeaveInfo">
-  <!--        <message kind="warning" line="7" text="pointcut did not match on the method call to a bridge method."/>
-          <message kind="warning" line="7" text="does not match because declaring type is Number"/>-->
-          <message kind="weave" text="(AspectX.aj:18) advised by before advice from 'AspectX'"/>
-          <message kind="weave" text="(AspectX.aj:19) advised by before advice from 'AspectX'"/>
-          <message kind="weave" text="(Number.java:5) advised by before advice from 'AspectX'"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test title="intermediate annotation matching" dir="bugs150">
-        <compile files="AnnotationPlusPatternMatchingError.aj" options="-1.5">
-            <message kind="warning" line="28" text="matched"/>
-        </compile>
-        <run class="AnnotationPlusPatternMatchingError">
-            <stdout>
-                <line text="In advice"/>
-            </stdout>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="migration" title="load aspectj 1.2.1 aspects in aspectj 5">
-        <compile files="Program.java" aspectpath="aspects121.jar">
-        </compile>
-        <run class="Program"/>
-    </ajc-test>
-
-	<ajc-test dir="bugs/java5/arrayCloning" pr="72150" vm="1.5"
-	   title="AJC possible bug with static nested classes">
-	   <compile files="A.java,C.java" options="-1.5,-showWeaveInfo">
-	       <message kind="weave" text="Type 'C' (C.java:14) advised by around advice from 'A' (A.java:2)"/>
-	   </compile>
-	   <run class="C"/>
-    </ajc-test>
-
-	<ajc-test dir="java5/pseudoKeywords" 
-	   title="method called around in class">
-	   <compile files="MethodCalledAround.java">
-	   </compile>
-    </ajc-test>
-
-	<ajc-test dir="java5/pseudoKeywords" 
-	   title="method called around in aspect">
-	   <compile files="MethodCalledAroundAspect.java">
-	       <message kind="error" line="2"/>
-	   </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" pr="64568" title="clear error message on itd with type pattern">
-        <compile files="pr64568.aj">
-            <message line="4" kind="error" text="Syntax error on token &quot;*&quot;, delete this token"/>
-            <message line="4" kind="error" text="foo cannot be resolved to a type"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs150" pr="74562" title="before and after are valid identifiers in classes">
-        <compile files="pr74562.aj">
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="bugs150" pr="107486" title="anonymous inner classes">
-        <compile files="pr107486.aj">
-        </compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150" pr="102210" title="NullPointerException trying to compile">
-        <compile files="PR102210.java"/>
-        <run class="PR102210">
-          <stderr>
-            <line text="List size is 1"/>
-            <line text="m1 running"/>
-            <line text="List size is 2"/>
-            <line text="m2 running"/>
-            <line text="List size is 3"/>
-            <line text="m3 running"/>
-          </stderr>
-        </run>
-   </ajc-test>
-
-   <ajc-test dir="bugs150" pr="107486" title="multiple anonymous inner classes">
-        <compile files="pr107486part2.aj">
-        </compile>
-        <run class="pr107486part2">
-            <stdout>
-                <line text="[advised] f"/>
-                <line text="[advised] g"/>
-            </stdout>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="java5/compliance" title="java 5 pointcuts and declares at pre-java 5 compliance levels">
-      <compile files="AJ5FeaturesAtJ14.aj" options="-1.4">
-        <message kind="error" line="3" text="the @annotation pointcut expression is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="11" text="the @within pointcut expression is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="13" text="the @withincode pointcut expression is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="5" text="the @this pointcut expression is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="7" text="the @target pointcut expression is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="9" text="the @args pointcut expression is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="15" text="declare @type is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="15" text="annotations are only available if source level is 1.5 or greater"/>
-        <message kind="error" line="15" text="cannot convert from Foo to Annotation"/>     
-        <message kind="error" line="17" text="declare @method is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="17" text="annotations are only available if source level is 1.5 or greater"/>
-        <message kind="error" line="17" text="cannot convert from Foo to Annotation"/>
-        <message kind="error" line="19" text="declare @field is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="19" text="annotations are only available if source level is 1.5 or greater"/>
-        <message kind="error" line="19" text="cannot convert from Foo to Annotation"/>
-        <message kind="error" line="21" text="declare @constructor is only supported at Java 5 compliance level or above"/>       
-        <message kind="error" line="21" text="annotations are only available if source level is 1.5 or greater"/>
-        <message kind="error" line="21" text="cannot convert from Foo to Annotation"/>
-        <message kind="error" line="25" text="annotation type patterns are only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="27" text="annotation type patterns are only supported at Java 5 compliance level or above"/>
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/compliance" title="java 5 pointcuts and declares at pre-java 5 compliance levels - 1.7">
-      <compile files="AJ5FeaturesAtJ14.aj" options="-1.4">
-        <message kind="error" line="3" text="the @annotation pointcut expression is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="11" text="the @within pointcut expression is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="13" text="the @withincode pointcut expression is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="5" text="the @this pointcut expression is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="7" text="the @target pointcut expression is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="9" text="the @args pointcut expression is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="15" text="declare @type is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="15" text="annotations are only available if source level is 1.5 or greater"/>
-        <message kind="error" line="15" text="Foo is not an annotation type"/>     
-        <message kind="error" line="17" text="declare @method is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="17" text="annotations are only available if source level is 1.5 or greater"/>
-        <message kind="error" line="17" text="Foo is not an annotation type"/>
-        <message kind="error" line="19" text="declare @field is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="19" text="annotations are only available if source level is 1.5 or greater"/>
-        <message kind="error" line="19" text="Foo is not an annotation type"/>
-        <message kind="error" line="21" text="declare @constructor is only supported at Java 5 compliance level or above"/>       
-        <message kind="error" line="21" text="annotations are only available if source level is 1.5 or greater"/>
-        <message kind="error" line="21" text="Foo is not an annotation type"/>
-        <message kind="error" line="25" text="annotation type patterns are only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="27" text="annotation type patterns are only supported at Java 5 compliance level or above"/>
-      </compile>
-    </ajc-test>
-    
-    
-    <ajc-test dir="bugs150" pr="91114" title="before and after are valid identifiers in classes, part 2">
-        <compile files="pr91114.aj">
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs150" pr="78621" title="void field type in pointcut expression">
-        <compile files="pr78261.aj">
-            <message line="3" kind="error" text="fields cannot have a void type"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs150" pr="86057" title="overriding final pointcut from super-aspect">
-        <compile files="pr86057.aj">
-            <message line="9" kind="error" text="can't override final pointcut Base.foo()"/>
-        </compile>
-    </ajc-test>
-                                
-   <ajc-test dir="bugs150" pr="78707" title="before returning advice not allowed!">
-        <compile files="pr78707.aj">
-            <message line="3" kind="error" text="Syntax error on token &quot;returning&quot;, delete this token"/>
-            <message line="3" kind="error" text="Syntax error on token &quot;throwing&quot;, delete this token"/>
-         </compile>
-    </ajc-test>        
-            
-    <ajc-test dir="bugs150" pr="104529" title="@SuppressWarnings should suppress">
-        <compile files="pr104529.aj" options = "-1.5 -warn:+unchecked">
-            <message line="11" kind="warning" text="needs unchecked conversion"/>
-        </compile>
-    </ajc-test>
-            
-    <ajc-test dir="bugs150" pr="79523" title="declare warning : foo(str) : ...;">
-        <compile files="pr79523.aj">
-            <message line="4" kind="warning" text="no match for this type name: str"/>
-            <message line="4" kind="error" text="bad parameter"/>
-            <message line="4" kind="error" text="args() pointcut designator cannot be used in declare statement"/>
-        </compile>
-    </ajc-test>
-                        
-    <ajc-test dir="bugs150" pr="107059" title="parser crashes on call(void (@a *)(..)">
-        <compile files="pr107059.aj">
-            <message line="3" kind="error" text="Syntax error on token &quot;(&quot;, &quot;name pattern&quot; expected"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" pr="107059" title="target(@Foo *)">
-        <compile files="pr107059_2.aj" options="-1.5">
-            <message kind="error" line="4" text="wildcard type pattern not allowed"></message>
-        </compile>
-    </ajc-test>
- 
-     <ajc-test dir="bugs150"  title="varargs with type variable">
-        <compile files="ParameterizedVarArgMatch.aj" options="-1.5">
-        </compile>
-    </ajc-test>
- 
- 
-    <ajc-test dir="bugs150" pr="108104" title="multiple anonymous inner classes 2">
-        <compile files="pr108104.aj" options="-1.5">
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs150" pr="108050" title="signature matching in override scenario">
-        <compile files="pr108050.aj" options="-1.5">
-            <message kind="warning" line = "2" text="servlet request"></message>
-            <message kind="warning" line = "7" text="servlet request"></message>
-            <message kind="warning" line = "21" text="servlet request"></message>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs150/pr108425" pr="108245" title="wildcard annotation matching - pr108245">
-        <compile files="package1/Bean.java,package2/Bean.java,package2/propertyChanger.java,package3/pr108425.aj" options="-1.5 -Xlint:ignore">
-        </compile>
-    </ajc-test>
-           
-    <ajc-test dir="bugs150/" pr="108104" title="inner types and type variables">
-        <compile files="ShapeCommandMap.java" options="-1.5">
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs150/" pr="107953" title="@AfterThrowing with no formal specified">
-        <compile files="pr107953.java" options="-1.5">
-            <message kind="error" line="8" text="throwing formal 'RuntimeException' must be declared as a parameter in the advice signature"></message>
-        </compile>
-    </ajc-test>
-               
-    <ajc-test dir="bugs150/pr106130" pr="106130" title="test weaving with > 256 locals">
-        <compile files="AroundLotsOfVars.java LotsOfVars.java" options="-preserveAllLocals"/>
-        <run class="LotsOfVars">
-            <stdout>
-                <line text="hello"/>
-                <line text="2"/>
-            </stdout>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr87376" title="structure model npe on type not found">
-        <compile files="I.java,NPE.aj" options="-emacssym">
-            <message kind="error" line="8" text="I cannot be resolved to a type"/>
-            <message kind="error" line="10" text="I cannot be resolved to a type"/>
-        </compile>
-    </ajc-test>
-    
-   <ajc-test dir="bugs150" pr="83311" title="overriding/polymorphism error on interface method introduction">
-     <compile files="pr83311.aj"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150" pr="103266" title="NPE on syntax error">
-     <compile files="pr103266.aj">
-          <message kind="error" line="41" text="ConnectionRequestContext cannot be resolved to a type"/>
-          <!-- this next message is new in e37 -->
-          <message kind="error" line="41" text="Type mismatch: cannot convert from new ConnectionRequestContext(){} to WorkerExample.RequestContext"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test title="itd override with no exception clause" dir="bugs150">
-       <compile files="pr83377.aj"></compile>
-   </ajc-test>
-    
-    <ajc-test dir="bugs150/pr84260" vm="1.5" title="static import failures">
-        <compile files="A.java,I1.java,I2.java" options="-1.5"/>
-        <run class="I1">
-          <stderr>
-            <line text="static method running"/>
-          </stderr>
-        </run>
-        <run class="I2">
-          <stderr>
-            <line text="static method running"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test title="anonymous inner class with method returning type parameter"  pr="107898" dir="bugs150">
-        <compile files="pr107898.aj" options="-1.5"></compile>
-    </ajc-test>
-
-    <ajc-test title="matching against Object[]"  pr="72668" dir="bugs150">
-        <compile files="pr72668.aj" options="-1.5">
-            <message kind="error" line="3" text="incompatible return type applying to method-execution(java.lang.Number[] pr72668.getThoseInts())"></message>
-            <message kind="error" line="10" text="incompatible return type applying to method-execution(java.lang.Number[] pr72668.getThoseInts())"></message>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="decp" pr="80249" title="Order of types passed to compiler determines weaving behavior">
-        <compile files="A.java,B.java,AspectX.java"/>
-        <run class="B"/>
-        <compile files="B.java,A.java,AspectX.java"/>
-        <run class="B"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" pr="99228" vm="1.5" title="ITD of a field into a generic class">
-        <compile files="PR99228.aj" options="-1.5"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" pr="98320" vm="1.5" title="intertype with nested generic type">
-        <compile files="PR98320.aj" options="-1.5"/>
-    </ajc-test>
-    
-    <ajc-test dir="decs" pr="42743" title="declare soft of runtime exception">
-        <compile files="DeclareSoftRuntimeException.aj">
-            <message kind="warning" line="3" text="MyRuntimeException will not be softened as it is already a RuntimeException"/>
-        </compile>
-        <run class="DeclareSoftRuntimeException">
-            <stdout>
-                <line text="MyRuntimeException"/>
-                <line text="org.aspectj.lang.SoftException"/>
-                <line text="MyRuntimeException"/>
-            </stdout>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="decs" pr="42743" title="declare soft w. catch block">
-        <compile files="VerifyError.aj" options="-Xlint:ignore">
-        </compile>
-        <run class="VerifyError"/>
-    </ajc-test>
-        
-    <ajc-test dir="bugs" pr="61568" title="Various kinds of ambiguous bindings">
-        <compile files="AmbiguousBindings.aj" options="-1.4">
-            <message line="17" text="ambiguous binding of parameter(s) foo across '||' in pointcut"></message>
-            <message line="19" text="ambiguous binding of parameter(s) foo across '||' in pointcut"></message>
-            <message line="21" text="ambiguous binding of parameter(s) foo across '||' in pointcut"></message>
-            <message line="23" text="ambiguous binding of parameter(s) x across '||' in pointcut"></message>
-            <message line="25" text="ambiguous binding of parameter(s) foo across '||' in pointcut"></message>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="61658" title="ambiguous args">
-        <compile files="PR61658.java">
-            <message line="17" text="ambiguous binding of parameter(s) a, b across '||' in pointcut"></message>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" pr="78021" title="Injecting exception into while loop with break statement causes catch block to be ignored">
-        <compile files="PR78021.java"/>
-        <run class="PR78021"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr99089" vm="1.5" pr="99089" title="ArrayIndexOutOfBoundsException - Generics in privileged aspects">
-        <compile files="DataClass.java,TracingAspect.java" options="-1.5"/>
-        <run class="DataClass">
-          <stderr>
-          <line text="before:Length of v=1"/>
-          <line text="after:Length of v=2"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" pr="79554" title="Return in try-block disables catch-block if final-block is present">
-        <compile files="PR79554.java"/>
-        <run class="PR79554"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" pr="82570" title="Weaved code does not include debug lines">
-        <compile files="PR82570_1.java"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" pr="83303" title="compiler error when mixing inheritance, overriding and polymorphism">
-        <compile files="PR83303.java"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs150" pr="83563" title="pertypewithin() handing of inner classes (1)">
-        <compile files="PR83563_1.java"/>
-        <run class="PR83563_1"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs150" pr="83563" title="pertypewithin() handing of inner classes (2)">
-        <compile files="PR83563_2.java"/>
-        <run class="PR83563_2"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs150" pr="83645" title="pertypewithin({interface}) illegal field modifier">
-        <compile files="PR83645.java" options="-Xlint:ignore"/>
-        <run class="PR83645"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" title="bad asm for enums" vm="1.5">
-        <compile files="Rainbow.java" options="-emacssym,-1.5,-Xset:minimalModel=false"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" pr="10461" title="missing name pattern">
-        <compile files="PR106461.aj">
-            <message kind="error" line="3" text="Syntax error on token &quot;(&quot;, &quot;name pattern&quot; expected"/>
-            <message kind="error" line="5" text="Syntax error on token &quot;)&quot;, &quot;name pattern&quot; expected"/>
-            <message kind="error" line="7" text="Syntax error on token &quot;.&quot;, &quot;name pattern&quot; expected"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" pr="106634" title="IllegalStateException unpacking signature of nested parameterized type">
-        <compile files="pr106634.aj" options="-1.5"/>
-    </ajc-test>
-        
-    <ajc-test dir="bugs150" title="(@Foo *)+ type pattern parse error">
-            <compile files="AnnotationPlusPatternParseError.aj" options="-1.5"/>
-    <!-- next line needs the change for inherited anno matching... -->
-        <!--compile files="AnnotationPlusPatternParseError.aj" options="-1.5">
-          <message kind="warning" line="19"/>
-        </compile-->
-    </ajc-test>
-
-    <ajc-test dir="bugs150" pr="80571" title="around advice on interface initializer">
-        <compile files="pr80571.aj">
-          <message kind="warning" text="The joinpoint 'constructor-call(void pr80571.&lt;init&gt;())' cannot be advised"/>
-        </compile>
-        <run class="pr80571">
-            <stdout>
-                <line text="before"/>
-                <line text="after"/>
-            </stdout>
-        </run>
-    </ajc-test>
- 
-     <ajc-test dir="bugs150" pr="78314" title="good error message for unmatched member syntax">
-        <compile files="pr78314.aj" options="-1.5">
-          <message kind="error" line="5" text="Syntax error on token &quot;foo&quot;, no accurate correction available"/>
-         </compile>
-        <compile files="pr78314.aj">
-          <message kind="error" line="5" text="Syntax error on token &quot;foo&quot;, no accurate correction available"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" pr="108377" title="itd field access inside itd method">
-        <compile files="pr108377.aj"/>
-        <run class="pr108377"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs150/pr108054" pr="108054" title="type variable with type variable bound">
-        <compile files="pr108054.aj" options="-1.5"/>
-        <compile files="ISequence.java,ICounter.java,ASequence.java" options="-1.5"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs150/pr108370" pr="108370" title="switch on enum inside ITD method">
-        <compile files="et/Q.java" options="-1.5"/>
-        <compile files="EnumTest.aj" options="-1.5 -inpath et"/>
-        <run class="EnumTest">
-            <stdout>
-                <line text="B!"/>
-            </stdout>
-        </run>
-    </ajc-test>
- 
-    <ajc-test dir="bugs150" pr="95992" title="inner type of generic interface reference from parameterized type">
-        <compile files="pr95992.aj" options="-1.5"/>
-    </ajc-test>
-
-
-    <ajc-test dir="bugs150" pr="104024" title="inner class passed as argument to varargs method">
-        <compile files="pr104024.aj" options="-1.5"/>
-    </ajc-test>  
-    
-    <ajc-test dir="bugs150" pr="107858" title="inlined field access in proceed call">
-        <compile files="pr107858.aj" options="-1.5">
-            <message kind="error" line="9" text="too many arguments to proceed, expected 0"></message>
-            <message kind="error" line="10" text="too many arguments to proceed, expected 0"></message>
-        </compile>
-    </ajc-test>  
- 
-    <ajc-test dir="bugs150/pr71159" pr="71159" title="visibility in signature matching with overrides - 1">
-        <compile files="pr71159.aj">
-            <message kind="warning" line="26" text="should match"/>
-        </compile>
-    </ajc-test>  
-
-    <ajc-test dir="bugs150/pr71159" pr="71159" title="visibility in signature matching with overrides - 2">
-        <compile files="PrivateITD.aj">
-            <message kind="warning" line="28" text="should match"/>
-        </compile>
-    </ajc-test>  
-
-    <ajc-test dir="bugs150/pr71159" pr="71159" title="visibility in signature matching with overrides - 3">
-        <compile files="pkg1/A.java,pkg1/B.java,pkg1/C.java,pkg2/ITDInDiffPackage.aj">
-            <message kind="warning" line="10" text="should match"/>
-        </compile>
-    </ajc-test>  
- 
-    <ajc-test dir="bugs150" pr="59196" title="args generated correctly for advice execution join point">
-        <compile files="pr59196.aj" options="-XnoInline -1.5"/>
-    </ajc-test>  
-  
-    <ajc-test dir="bugs150" pr="74048" title="no unused warnings on aspect types">
-        <compile files="pr74048.aj" options="-warn:unusedPrivate"/>
-    </ajc-test>  
-  
-    <ajc-test dir="bugs150" pr="59397" title="synthetic arguments on itd cons are not used in matching">
-        <compile files="pr59397.aj">
-            <message line="6" kind="warning" text="should match"/>
-        </compile>
-    </ajc-test>  
- 
-    <ajc-test dir="bugs150" pr="108602" title="parse generic type signature with parameterized type in interface">
-        <compile files="pr108602.java" options="-1.5"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs150" pr="105479" title="declare parents introducing override with covariance">
-        <compile files="pr105479.aj" options="-1.5"/>
-    </ajc-test>                   
-    
-    <ajc-test dir="bugs150" pr="105479" title="override and covariance with decp - runtime">
-        <compile files="pr105479part2.aj" options="-1.5"/>
-        <run class="pr105479part2">
-            <stdout>
-                <line text="in Test.hashCode()"/>
-                <line text="in Test.hashCode()"/>
-                <line text="id"/>
-                <line text="in Test.hashCode()"/>
-            </stdout>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="bugs150/pr105479/case1" pr="105479" title="override and covariance with decp - runtime separate files">
-        <compile files="ReturnTypeTest.aj,ReturnTypeTester.java,Driver.java" options="-1.5"/>
-        <run class="Driver">
-            <stdout>
-                <line text="in Test.hashCode()"/>
-                <line text="in Test.hashCode()"/>
-                <line text="id"/>
-                <line text="in Test.hashCode()"/>
-            </stdout>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr105479/case2" pr="105479" title="override and covariance with decp - binary weaving">
-        <compile files="ReturnTypeTest.java" outjar="jar1.jar" options="-1.5 -Xlint:ignore"/>
-        <compile files="ReturnTypeTester.java" outjar="jar2.jar" options="-1.5"/>
-        <compile inpath="jar1.jar;jar2.jar" options="-1.5"/>
-        <run class="ReturnTypeTester"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" pr="102212" title="abstract synchronized itdms not detected">
-        <compile files="pr102212.aj">
-            <message line="7" kind="error" text="The abstract method _abstract in type Parent can only set a visibility modifier, one of public or protected"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs150" pr="102212" title="synchronized itd interface methods">
-        <compile files="SynchronizedInterfaceMethods.aj" options="-1.5">
-        </compile>
-        <run class="SynchronizedInterfaceMethods"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs150" pr="101606" title="unused private pointcuts">
-        <compile files="pr101606.aj" options="-warn:unusedPrivate">
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr99125" pr="99125" title="itd interface method already existing on interface">
-        <compile files="p/pr99125.aj,p/I.java,p/J.java" options="-1.5">
-        </compile>
-        <compile files="Aspects.aj" options="-inpath p"/>
-        <run class="p.pr99125"/>
-        <compile files="p2/pr99125.aj,p/I.java,p/J.java"/> <!-- actually in package p, introduces incompatible change -->
-        <compile files="Aspects.aj" options="-inpath p">
-            <message kind="error" line="7" text="inter-type declaration from X conflicts with existing member"/>
-            <!-- 275032 - new error at affected member location too -->
-            <message kind="error" line="10" text="inter-type declaration from X conflicts with existing member"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr87530" pr="87530" title="final itd methods on interfaces">
-        <compile files="FinalITDMOnInterface.aj">
-            <message kind="error" line="12" text="Cannot override the final method from A.TestInterface"></message>
-        </compile>
-        <compile files="FinalITDMOnInterface2.aj">
-            <!--message kind="error" line="8" text="Cannot override the final method from A.TestInterface"></message-->
-            <message kind="error" line="8" text="can't override final void A$TestInterface.m()"></message>
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="bugs150" pr="108818" title="can't override private pointcut in abstract aspect">
-        <compile files="PrivatePointcutOverriding.aj">
-            <message kind="warning" line="19" text="matched join point from super advice"/>
-            <message kind="warning" line="21" text="matched join point from sub advice"/>
-        </compile>
-    </ajc-test>
- 
-    <ajc-test dir="bugs150" pr="108816" title="advising cflow advice execution">
-        <compile files="pr108816.aj" >
-        </compile>
-    </ajc-test>   
-
-    <ajc-test dir="bugs150/pr108902" pr="108902" title="no type mismatch on generic types in itds">
-        <compile files="Subject.java,Observer.java,ObserverProtocol.aj" >
-        </compile>
-    </ajc-test>   
-
-    <ajc-test dir="bugs150" pr="108903" title="super call in ITD">
-        <compile files="pr108903.aj" >
-            <message kind="error" line="14" text="The method print() is undefined for the type Object"/>
-        </compile>
-    </ajc-test>  
-
-    <ajc-test dir="bugs150" pr="109042" title="no unused parameter warnings for synthetic advice args">
-        <compile files="pr109042.aj" options="-warn:+unusedArgument -warn:+unusedPrivate -warn:+unusedImport -1.5">
-        </compile>
-    </ajc-test>  
-    
-    <ajc-test dir="bugs150" pr="109486" title="Internal compiler error (ClassParser.java:242)">
-        <compile files="PR109486.java" >
-          <message kind="error" line="1" text="The class PR109486 can be either abstract or final, not both"/>
-        </compile>
-    </ajc-test>  
-    
-    <ajc-test dir="bugs150" pr="109124" title="no verify error with set on inner type">
-        <compile files="VerifyErrorOnSet.aj" options="-1.5" >
-        </compile>
-        <run class="test.VerifyErrorOnSet"/>
-        <compile files="pr106874.aj" options="-1.5" >
-        </compile>
-        <run class="pr106874"/>    
-    </ajc-test>  
-        
-    <ajc-test dir="bugs150" pr="108826" title="cant find type error with generic return type or parameter">
-        <compile files="pr108826.aj" options="-1.5 -emacssym" >
-        </compile>
-    </ajc-test> 
- 
-     <ajc-test dir="bugs150" pr="105181" title="no verify error on generic collection member access">
-        <compile files="pr105181.aj" options="-1.5">
-        </compile>
-        <run class="pr105181"/>
-    </ajc-test> 
-
-    <ajc-test dir="bugs150/pr108903" pr="108903" title="super call in ITD - part 2">
-        <compile files="com/designpattern/decorator/HeaderDecorator.aj,com/designpattern/decorator/Main.java,com/designpattern/decorator/Order.java,com/designpattern/decorator/OrderDecorator.aj,com/designpattern/decorator/SalesOrder.java" options="-1.5" >
-        </compile>
-    </ajc-test> 
-        
-    <ajc-test dir="bugs150/pr103740" pr="103740" title="Compiler failure on at_annotation">
-     <compile files="AroundAdvice.aj" options="-1.5,-showWeaveInfo">
-       <message kind="weave" text="Join point 'method-execution(void C.m1())' in Type 'C' (AroundAdvice.aj:12) advised by before advice from 'ErrorHandling' (AroundAdvice.aj:8)"/>
-	   <message kind="weave" text="Join point 'method-execution(void C.m3())' in Type 'C' (AroundAdvice.aj:14) advised by before advice from 'ErrorHandling' (AroundAdvice.aj:8)"/>
-	 </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr106554" pr="106554" title="Problem in staticinitialization with pertypewithin aspect">
-        <compile files="A.aj" options="-showWeaveInfo -1.4">
-          <message kind="weave" text="Join point 'staticinitialization(void A.&lt;clinit&gt;())' in Type 'A' (A.aj:1) advised by before advice from 'StopsInit' (A.aj:21)"/>
-        </compile>
-        <run class="A">
-          <stdout>
-            <line text="test = 1"/>
-          </stdout>
-        </run>
-    </ajc-test> 
-
-    <ajc-test dir="bugs150/SimpleInsuranceFailure" title="raw and generic type conversion with itd cons">
-        <compile files="" options=" -emacssym, -sourceroots ." >
-        </compile>
-    </ajc-test> 
-    
-    <ajc-test dir="bugs150" title="@annotation binding with around advice">
-        <compile files="AnnotationBinding.aj" options="-1.5"/>
-        <run class="AnnotationBinding"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" title="declare parents on a missing type">
-        <compile files="Pr76374.aj" options="-1.5">
-            <message kind="warning" line="3" text="no match for this type name"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" title="parameterized generic methods">
-        <compile files="Pr109283.aj" options="-1.5 -warn:indirectStatic">
-        </compile>
-    </ajc-test> 
-    
-    <ajc-test dir="bugs150" title="call join points in anonymous inner classes">
-        <compile files="pr104229.aj" options="-1.5">
-            <message kind="warning" line="54" text="bingo"/>
-            <message kind="warning" line="115" text="bingo"/>
-            <message kind="warning" line="130" text="bingo"/>
-        </compile>
-        <run class="pr104229">
-            <stdout>
-                <line text="call match class pr104229"/>
-                <line text="OK it worked!"/>
-            </stdout>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="bugs150" title="default impl of Runnable">
-        <compile files="pr88900.aj" options="-Xdev:Pinpoint">
-        </compile>
-    </ajc-test> 
-    
-     <ajc-test dir="bugs150" title="array clone call join points in 1.4 vs 1.3">
-        <compile files="pr102933.aj" options="-1.3">
-            <message kind="warning" line="7" text="a call within pr102933"/>
-        </compile>
-        <compile files="pr102933.aj" options="-1.4">
-            <message kind="warning" line="7" text="a call within pr102933"/>
-        </compile>     
-        <compile files="pr102933.aj" options="-1.5">
-            <message kind="warning" line="7" text="a call within pr102933"/>
-        </compile>   
-     </ajc-test> 
-     
-    <ajc-test dir="bugs150" pr="100195" title="debug info in around advice inlining">
-        <compile files="pr100195.aj">
-        </compile>
-        <run class="pr100195"/>
-    </ajc-test> 
-
-    <ajc-test dir="bugs150" title="weaveinfo message for declare at method on an ITDd method">
-        <compile files="pr113073.java" options="-1.5 -showWeaveInfo">
-			<message kind="weave" text="Type 'C' (pr113073.java) has intertyped method from 'D' (pr113073.java:'void C.anotherMethod()')"/>
-			<message kind="weave" text="'public void C.anotherMethod()' (pr113073.java) is annotated with @Annotation method annotation from 'B' (pr113073.java:3)"/>
-			<message kind="weave" text="Type 'C' (pr113073.java) has intertyped method from 'D' (pr113073.java:'void C.anotherMethod(java.lang.String)')"/>
-			<message kind="weave" text="'public void C.anotherMethod(String)' (pr113073.java) is annotated with @Annotation method annotation from 'B' (pr113073.java:3)"/>
-			<message kind="weave" text="Type 'C' (pr113073.java) has intertyped constructor from 'D' (pr113073.java:'void C."/>
-			<message kind="weave" text="'public void C.new(String)' (pr113073.java) is annotated with @Annotation constructor annotation from 'B' (pr113073.java:4)"/>
-        </compile>
-    </ajc-test> 
-
-    <ajc-test dir="bugs150/pr113447" title="no verify error with two this pcds">
-        <compile files="PR113447.java">
-        </compile>
-        <run class="PR113447"/>
-    </ajc-test> 
-
-	<ajc-test dir="bugs150/pr113447" title="no verify error with two at this pcds">
-        <compile files="PR113447a.java" options="-1.5">
-        </compile>
-        <run class="PR113447a"/>
-    </ajc-test>
-
-	<ajc-test dir="bugs150/pr113447" title="no verify error with at within pcds">
-        <compile files="PR113447b.java" options="-1.5">
-        </compile>
-        <run class="PR113447b"/>
-    </ajc-test>
-
-	<ajc-test dir="bugs150/pr113447" title="no verify error with at withincode pcds">
-        <compile files="PR113447c.java" options="-1.5">
-        </compile>
-        <run class="PR113447c"/>
-    </ajc-test>
-
-	<ajc-test dir="bugs150/pr113447" title="no verify error with at annotation pcds">
-        <compile files="PR113447d.java" options="-1.5">
-        </compile>
-        <run class="PR113447d"/>
-    </ajc-test>
-
-	<ajc-test dir="bugs150/pr113447" title="no verify error with two args pcds">
-        <compile files="PR113447e.java" options="-1.5">
-        </compile>
-        <run class="PR113447e"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs150" title="no StackOverflowError with circular pcd in generic aspect">
-        <compile files="pr115235.aj" options="-1.5">
-        	<message kind="warning" line="3" text="advice defined in GenericAbstractAspect has not been applied [Xlint:adviceDidNotMatch]"/>
-        	<message kind="error" text="circular pointcut declaration involving: pc()"/>
-        	<message kind="error" line="20" text="circular pointcut declaration involving: pc2()"/>
-	    </compile>
-    </ajc-test> 
-
-    <ajc-test dir="bugs150" title="no StackOverflowError with circular pcd in generic aspect - 2">
-        <compile files="pr115235b.aj" options="-1.5">
-        </compile>
-    </ajc-test>
-
-	<ajc-test dir="bugs150/pr115252" title="xlint message for improper exact annotation type">
-        <compile files="ExactAnnotationTypePattern.java" options="-1.5">
-			<message kind="warning" line="20" text="field blah"/>
-        	<message kind="warning" line="28" text="does not match because annotation @TypeAnnotation has @Target{ElementType.TYPE} [Xlint:unmatchedTargetKind]"/>
-        	<message kind="warning" line="37" text="does not match because annotation @FieldAnnotation has @Target{ElementType.FIELD} [Xlint:unmatchedTargetKind]"/>
-            <message kind="warning" line="46" text="does not match because annotation @MethodAnnotation has @Target{ElementType.METHOD} [Xlint:unmatchedTargetKind]"/>
-        </compile>
-    </ajc-test>
-
-	<ajc-test dir="bugs150/pr115252" title="xlint message for improper annotation type inside OR">
-        <compile files="OrTypePattern.java" options="-1.5">
-            <message kind="warning" line="26" text="does not match because annotation @FieldAnnotation has @Target{ElementType.FIELD} [Xlint:unmatchedTargetKind]"/>
-        	<message kind="warning" line="31" text="does not match because annotation @TypeAnnotation has @Target{ElementType.TYPE} [Xlint:unmatchedTargetKind]"/>
-        	<message kind="warning" line="31" text="does not match because annotation @FieldAnnotation has @Target{ElementType.FIELD} [Xlint:unmatchedTargetKind]"/>
-        </compile>
-    </ajc-test>
-
-	<ajc-test dir="bugs150/pr115252" title="xlint message for improper annotation type inside AND">
-        <compile files="AndTypePattern.java" options="-1.5">
-            <message kind="warning" line="23" text="does not match because annotation @FieldAnnotation has @Target{ElementType.FIELD} [Xlint:unmatchedTargetKind]"/>
-        </compile>
-    </ajc-test>
-
-	<ajc-test dir="bugs150/pr115252" title="xlint message for improper annotated return type">
-        <compile files="AnnotationReturnType.java" options="-1.5">
-            <!-- warnings coming from matching pointcuts and corresponding declare warnings -->
-			<message kind="warning" line="12" text="(@TypeAnnotation *) *(..)"/>
-			<message kind="warning" line="12" text="(@(TypeAnnotation || MethodAnnotation) *) *(..)"/>
-            <!-- xlint warnings that were put in as part of fix for pr115252 -->
-        	<message kind="warning" line="32" text="does not match because annotation @MethodAnnotation has @Target{ElementType.METHOD} [Xlint:unmatchedTargetKind]"/>
-        	<message kind="warning" line="37" text="does not match because annotation @MethodAnnotation has @Target{ElementType.METHOD} [Xlint:unmatchedTargetKind]"/>
-        </compile>
-    </ajc-test>
-
-	<ajc-test dir="bugs150/pr115252" title="xlint message for improper annotated declaring type">
-        <compile files="AnnotationDeclaringType.java" options="-1.5">
-            <!-- warning coming from matching pointcuts and corresponding declare warnings -->
-			<message kind="warning" line="13" text="* (@TypeAnnotation *).*(..)"/>
-            <!-- xlint warning that was put in as part of fix for pr115252 -->
-        	<message kind="warning" line="27" text="does not match because annotation @MethodAnnotation has @Target{ElementType.METHOD} [Xlint:unmatchedTargetKind]"/>
-        </compile>
-    </ajc-test>
-
-	<ajc-test dir="bugs150/pr115252" title="xlint message for improper annotated parameter type">
-        <compile files="AnnotationParameterType.java" options="-1.5">
-            <!-- warning coming from matching pointcuts and corresponding declare warnings -->
-			<message kind="warning" line="12" text="* *(@TypeAnnotation *)"/>
-            <!-- xlint warning that was put in as part of fix for pr115252 -->
-        	<message kind="warning" line="31" text="does not match because annotation @MethodAnnotation has @Target{ElementType.METHOD} [Xlint:unmatchedTargetKind]"/>
-        </compile>
-    </ajc-test>
-
-	<ajc-test dir="bugs150/pr115252" title="xlint message for improper annotated throws pattern">
-        <compile files="AnnotationThrowsPattern.java" options="-1.5">
-            <!-- warnings coming from matching pointcuts and corresponding declare warnings -->
-			<message kind="warning" line="12" text="(* *.*(..) throws (@TypeAnnotation *))"/>
-			<message kind="warning" line="12" text="* *.*(..) throws !(@MethodAnnotation *)"/>
-			<message kind="warning" line="14" text="(* *.*(..) throws !(@TypeAnnotation *))"/>
-			<message kind="warning" line="14" text="* *.*(..) throws !(@MethodAnnotation *)"/>
-            <!-- xlint warnings that were put in as part of fix for pr115252 -->
-        	<message kind="warning" line="40" text="does not match because annotation @MethodAnnotation has @Target{ElementType.METHOD} [Xlint:unmatchedTargetKind]"/>
-        	<message kind="warning" line="46" text="does not match because annotation @MethodAnnotation has @Target{ElementType.METHOD} [Xlint:unmatchedTargetKind]"/>
-        </compile>
-    </ajc-test>
-
-	<ajc-test dir="bugs150/pr115252" title="xlint message for more than one improper annotated parameter type">
-        <compile files="MoreThanOneTargetAnnotation.java" options="-1.5">
-            <!-- xlint warning that was put in as part of fix for pr115252 -->
-        	<message kind="warning" line="28" text="does not match because annotation @MethodAndFieldAnnotation has @Target{ElementType.FIELD,ElementType.METHOD} [Xlint:unmatchedTargetKind]"/>
-        	<message kind="warning" line="38" text="does not match because annotation @TypeAndMethodAnnotation has @Target{ElementType.METHOD,ElementType.TYPE} [Xlint:unmatchedTargetKind]"/>
-        </compile>
-    </ajc-test>
-
-	<ajc-test dir="bugs150/pr119019" title="no NPE when inaccessible method is called within itd">
-        <compile files="bar/TargetITDClass.java,foo/ITDWithACall.aj"/>
-        <run class="foo.ITDWithACall"/>
-    </ajc-test>
-
-	<ajc-test dir="bugs150" title="no NPE with or pointcut and more than one args">
-        <compile files="PR118149.aj"/>
-    </ajc-test>
-
-	<ajc-test dir="bugs150" title="no StringOutOfBoundsException with generic inner aspects">
-        <compile files="PR119543.java" options="-1.5">
-		   	<message kind="warning" line="8" text="advice defined in PR119543$A has not been applied [Xlint:adviceDidNotMatch]"/>
-        </compile>
-    </ajc-test>
-
-    <!-- ============================================================================ -->
-    <!-- ============================================================================ -->
-    
-    <!-- atOverride tests with ITDs -->
-    
-    <ajc-test dir="java5/generics/itds" pr="106630" title="atOverride used with ITDs">
-      <compile files="AtOverride.aj" options="-1.5"/>
-    </ajc-test>
-    <ajc-test dir="java5/generics/itds" pr="106630" title="atOverride used with ITDs - 1">
-      <compile files="AtOverride1.aj" options="-1.5">
-        <message kind="error" line="9" text="The method method() of type Child must override a superclass method"/>
-      </compile>
-    </ajc-test>
-    <ajc-test dir="java5/generics/itds" pr="106630" title="atOverride used with ITDs - 2">
-      <compile files="AtOverride2.aj" options="-1.5"/>
-    </ajc-test>
-    <ajc-test dir="java5/generics/itds" pr="106630" title="atOverride used with ITDs - 3">
-      <compile files="AtOverride3.aj" options="-1.5"/>
-    </ajc-test>
-    <ajc-test dir="java5/generics/itds" pr="106630" title="atOverride used with ITDs - 4">
-      <compile files="AtOverride4.aj" options="-1.5"/>
-    </ajc-test>
-    <ajc-test dir="java5/generics/itds" pr="106630" title="atOverride used with ITDs - 5">
-      <compile files="AtOverride5.aj" options="-1.5">
-        <message kind="error" line="11" text="The method method() of type Child must override a superclass method"/>
-      </compile>
-    </ajc-test>
-    <ajc-test dir="java5/generics/itds" pr="106630" title="atOverride used with ITDs - 6">
-      <compile files="AtOverride6.aj" options="-1.5"/>
-    </ajc-test>
-    <ajc-test dir="java5/generics/itds" pr="106630" title="atOverride used with ITDs - 7">
-      <compile files="AtOverride7.aj" options="-1.5"/>
-    </ajc-test>
-               
-    <!-- end of atOverride tests with ITDs -->
-
-    <ajc-test dir="../docs/dist/doc/examples/introduction" title="introduction sample" vm="1.5">
-        <compile files="CloneablePoint.java,ComparablePoint.java,HashablePoint.java,Point.java" options="-1.5 -Xlint:ignore"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/varargs" title="varargs in constructor sig" vm="1.5">
-        <compile files="Pr88652.aj" options="-1.5">
-            <message kind="warning" line="8" text="should match"/>
-            <message kind="warning" line="9" text="should match"/>        
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/varargs" title="Varargs with .. in pointcut" vm="1.5">
-        <compile files="pr93356.aj" options="-1.5">  
-        	<message kind="warning" line="5" text="a"/>
-        	<message kind="warning" line="5" text="b"/>    
-        	<message kind="warning" line="5" text="c"/>    
-        	<message kind="warning" line="5" text="d"/>    
-        	<message kind="warning" line="5" text="e"/>  
-        	<message kind="warning" line="5" text="k"/> 
-        	<message kind="warning" line="5" text="l"/>
-        	
-        	<message kind="warning" line="4" text="f"/>
-        	<message kind="warning" line="4" text="g"/>    
-        	<message kind="warning" line="4" text="h"/>    
-        	<message kind="warning" line="4" text="i"/>    
-        	<message kind="warning" line="4" text="j"/>  
-        	
-        	<message kind="warning" line="7" text="f"/>      
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/varargs" title="star varargs pattern" vm="1.5">
-        <compile files="StarVarargsPattern.aj" options="-1.5">
-            <message kind="warning" line="5" text="you used a varargs signature"/>
-            <message kind="warning" line="7" text="you used a varargs signature"/>        
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations" title="invalid cons syntax" vm="1.5">
-        <compile files="SyntaxError.aj" options="-1.5">
-            <message kind="error" line="3" text="Syntax error on token &quot;new&quot;, &quot;method name (not constructor)&quot; expected"/>
-        </compile>
-    </ajc-test>
-
-    <!-- hasmethod / hasfield tests -->
-
-   <ajc-test title="declare parents : hasmethod(..) - 1" dir="hasmember">
-        <compile files="HasMethod.aj">
-            <message kind="error" line="5" text="the type pattern hasmethod(* print(..)) can only be used when the -XhasMember option is set"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test title="declare parents : hasmethod(..) - 1" dir="hasmember">
-        <compile files="HasMethod.aj" options="-XhasMember">
-        </compile>
-        <run class="HasMethod"></run>
-    </ajc-test>
-
-    <ajc-test title="declare parents : hasmethod(..) - 2" dir="hasmember">
-        <compile files="HasMethodInherited.aj" options="-XhasMember">
-        </compile>
-        <run class="HasMethodInherited"></run>
-    </ajc-test>
-
-    <ajc-test title="declare parents : hasmethod(..) - 3" dir="hasmember">
-        <compile files="HasPrivateMethodInherited.aj" options="-XhasMember">
-        </compile>
-        <run class="HasPrivateMethodInherited"></run>
-    </ajc-test>
-
-    <ajc-test title="declare parents : hasmethod(..) - 4" dir="hasmember">
-        <compile files="HasMethodViaITD.aj" options="-XhasMember">
-            <message kind="warning" line="15" text="hasmethod matched on ITD ok"/>
-        </compile>
-    </ajc-test>
-         
-    <ajc-test title="declare parents : hasfield(..) - 1" dir="hasmember">
-        <compile files="HasField.aj" options="-XhasMember">
-        </compile>
-        <run class="HasField"></run>
-    </ajc-test>
-
-    <ajc-test title="declare parents : hasfield(..) - 2" dir="hasmember">
-        <compile files="HasFieldInherited.aj"  options="-XhasMember">
-        </compile>
-        <run class="HasFieldInherited"></run>
-    </ajc-test>
-
-    <ajc-test title="declare parents : hasfield(..) - 3" dir="hasmember">
-        <compile files="HasPrivateFieldInherited.aj" options="-XhasMember">
-        </compile>
-        <run class="HasPrivateFieldInherited"></run>
-    </ajc-test>
-                              
-    <!-- Annotation binding tests -->
-    
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="call annotation binding 1">
-        <compile files="CallAnnBinding.aj" options="-1.5"/>
-        <run class="CallAnnBinding"/>    
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="call annotation binding 2">
-        <compile files="CallAnnBinding2.aj" options="-1.5"/>
-        <run class="CallAnnBinding2"/>    
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="call annotation binding 3">
-        <compile files="CallAnnBinding3.aj" options="-1.5"/>
-        <run class="CallAnnBinding3"/>    
-    </ajc-test>
- 
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="call annotation binding 4">
-        <compile files="CallAnnBinding4.aj" options="-1.5"/>
-        <run class="CallAnnBinding4"/>    
-    </ajc-test>
-
-   <ajc-test dir="java5/annotations/binding" vm="1.5" title="call annotation binding 5">
-        <compile files="CallAnnBinding5.aj" options="-1.5"/>
-        <run class="CallAnnBinding5"/>    
-    </ajc-test>
-    
-           <ajc-test dir="java5/annotations/binding" vm="1.5" title="call annotation binding 6">
-        <compile files="CallAnnBinding6.aj" options="-1.5"/>
-        <run class="CallAnnBinding6"/>    
-    </ajc-test>
-    
-   <ajc-test dir="java5/annotations/binding" vm="1.5" title="call annotation binding 7">
-        <compile files="CallAnnBinding7.aj" options="-1.5"/>
-        <run class="CallAnnBinding7"/>    
-    </ajc-test>
-        
-     <ajc-test dir="java5/annotations/binding" vm="1.5" title="@target annotation binding 1">
-        <compile files="AtTarget1.aj" options="-1.5"/>
-        <run class="AtTarget1"/>    
-    </ajc-test>
-
-     <ajc-test dir="java5/annotations/binding" vm="1.5" title="@target annotation binding 2">
-        <compile files="AtTarget2.aj" options="-1.5"/>
-        <run class="AtTarget2"/>    
-    </ajc-test>
-
-     <ajc-test dir="java5/annotations/binding" vm="1.5" title="@target annotation binding 3">
-        <compile files="AtTarget3.aj" options="-1.5"/>
-        <run class="AtTarget3"/>    
-    </ajc-test>
-
-     <ajc-test dir="java5/annotations/binding" vm="1.5" title="@target annotation binding 4">
-        <compile files="AtTarget4.aj" options="-1.5"/>
-        <run class="AtTarget4"/>    
-    </ajc-test>
-
-     <ajc-test dir="java5/annotations/binding/usingPackageNames" vm="1.5" title="@target annotation binding 5">
-        <compile files="MyAspect.aj,MyAnnotation.java,MyClass.java" options="-1.5"/>
-        <run class="test.MyClass"/>    
-    </ajc-test>
-
-     <ajc-test dir="java5/annotations/binding" vm="1.5" title="@this annotation binding 1">
-        <compile files="AtThis1.aj" options="-1.5"/>
-        <run class="AtThis1"/>    
-    </ajc-test>
-
-     <ajc-test dir="java5/annotations/binding" vm="1.5" title="@this annotation binding 2">
-        <compile files="AtThis2.aj" options="-1.5"/>
-        <run class="AtThis2"/>    
-    </ajc-test>
-
-     <ajc-test dir="java5/annotations/binding" vm="1.5" title="@this annotation binding 3">
-        <compile files="AtThis3.aj" options="-1.5"/>
-        <run class="AtThis3"/>    
-    </ajc-test>
-
-     <ajc-test dir="java5/annotations/binding" vm="1.5" title="@this annotation binding 4">
-        <compile files="AtThis4.aj" options="-1.5"/>
-        <run class="AtThis4"/>    
-    </ajc-test>
-
-     <ajc-test dir="java5/annotations/binding" vm="1.5" title="@this annotation binding 5">
-        <compile files="AtThis5.aj" options="-1.5"/>
-        <run class="AtThis5"/>    
-    </ajc-test>
-
-     <ajc-test dir="java5/annotations/binding" vm="1.5" title="@args annotation binding 1">
-        <compile files="AtArgs1.aj" options="-1.5"/>
-        <run class="AtArgs1"/>    
-    </ajc-test>
-
-     <ajc-test dir="java5/annotations/binding" vm="1.5" title="@args annotation binding 2">
-        <compile files="AtArgs2.aj" options="-1.5"/>
-        <run class="AtArgs2"/>    
-    </ajc-test>
-
-     <ajc-test dir="java5/annotations/binding" vm="1.5" title="@args annotation binding 3">
-        <compile files="AtArgs3.aj" options="-1.5"/>
-        <run class="AtArgs3"/>    
-    </ajc-test>
-
-     <ajc-test dir="java5/annotations/binding" vm="1.5" title="@args annotation binding 4">
-        <compile files="AtArgs4.aj" options="-1.5"/>
-        <run class="AtArgs4"/>    
-    </ajc-test>
-
-     <ajc-test dir="java5/annotations/binding" vm="1.5" title="@args annotation binding 5">
-        <compile files="AtArgs5.aj" options="-1.5"/>
-        <run class="AtArgs5"/>    
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="execution and @annotation">
-        <compile files="ExecutionAnnBinding1.aj" options="-1.5"/>
-        <run class="ExecutionAnnBinding1"/>    
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="set and @annotation">
-        <compile files="FieldAnnBinding1.aj" options="-1.5"/>
-        <run class="FieldAnnBinding1"/>    
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="get and @annotation">
-        <compile files="FieldAnnBinding2.aj" options="-1.5"/>
-        <run class="FieldAnnBinding2"/>    
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="get and @annotation with arrays">
-        <compile files="FieldAnnBinding3.aj" options="-1.5"/>
-        <run class="FieldAnnBinding3"/>    
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="cons call and @annotation">
-        <compile files="CtorAnnBinding1.aj" options="-1.5"/>
-        <run class="CtorAnnBinding1"/>    
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="cons exe and @annotation">
-        <compile files="CtorAnnBinding2.aj" options="-1.5"/>
-        <run class="CtorAnnBinding2"/>    
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="staticinit and @annotation">
-        <compile files="StaticInitBinding.aj" options="-1.5"/>
-        <run class="StaticInitBinding"/>    
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="preinit and @annotation">
-        <compile files="PreInitBinding.aj" options="-1.5"/>
-        <run class="PreInitBinding"/>    
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="init and @annotation">
-        <compile files="InitBinding.aj" options="-1.5"/>
-        <run class="InitBinding"/>    
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="adviceexecution and @annotation">
-        <compile files="AdviceExecBinding.aj" options="-1.5"/>
-        <run class="AdviceExecBinding"/>    
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="handler and @annotation">
-        <compile files="HandlerBinding.aj" options="-1.5"/>
-        <run class="HandlerBinding"/>    
-    </ajc-test>
-        
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="@withincode() and call(* println(..))">
-       <compile files="WithinCodeBinding1.aj" options="-1.5"/>
-       <run class="WithinCodeBinding1"/>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="@within">
-       <compile files="WithinBinding1.aj" options="-1.5"/>
-       <run class="WithinBinding1"/>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="@within - multiple types">
-       <compile files="WithinBinding2.aj" options="-1.5"/>
-       <run class="WithinBinding2"/>
-    </ajc-test>
- 
-    <ajc-test dir="java5/annotations/binding/complexExample" vm="1.5" title="packages and no binding">
-        <compile files="A.java,B.java,Color.java,X.java" options="-1.5"/>
-        <run class="a.b.c.A"/>    
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/binding/complexExample" vm="1.5" title="packages and binding">
-        <compile files="A.java,B.java,Color.java,X2.java" options="-1.5"/>
-        <run class="a.b.c.A"/>    
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="binding with static methods">
-        <compile files="StaticMethods.java" options="-1.5"/>
-        <run class="StaticMethods"/>    
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations" vm="1.5" title="annotation matching on call">
-        <weave classesFiles="AnnotatedType.java,SimpleAnnotation.java,SimpleAnnotation2.java"
-               aspectsFiles="AnnotationAspect02.aj"
-               options="-1.5,-showWeaveInfo">
-               <message kind="weave" text="Type 'AnnotatedType' (AnnotatedType.java:3) advised by before advice from 'AnnotationAspect02' (aspects.jar!AnnotationAspect02.class:4(from AnnotationAspect02.aj))"/>
-               <message kind="weave" text="Type 'AnnotatedType' (AnnotatedType.java:3) advised by before advice from 'AnnotationAspect02' (aspects.jar!AnnotationAspect02.class:2(from AnnotationAspect02.aj))"/>
-               <message kind="weave" text="Type 'AnnotatedType' (AnnotatedType.java:4) advised by before advice from 'AnnotationAspect02' (aspects.jar!AnnotationAspect02.class:4(from AnnotationAspect02.aj))"/>
-        </weave>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations" vm="1.5" title="at annotation matching">
-        <weave classesFiles="AnnotatedType.java,SimpleAnnotation.java,SimpleAnnotation2.java"
-               aspectsFiles="AnnotationAspect03.aj"
-               options="-1.5,-showWeaveInfo">
-               <message kind="warning" line="8" text="@annotation matched here"/>
-        </weave>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/within_code" vm="1.5" title="annotations and within(code)">
-        <weave classesFiles="TestingAnnotations.java"
-               aspectsFiles="WithinAndWithinCodeTests.java"
-               options="-1.5,-showWeaveInfo">
-               <message kind="warning" line="31" text="@within match on non-inherited annotation"/>
-               <message kind="warning" line="39" text="@within match on non-inherited annotation"/>
-               <message kind="warning" line="39" text="@within match on inheritable annotation"/>
-               <message kind="warning" line="43" text="@within match on inheritable annotation"/>
-               <message kind="warning" line="32" text="@withincode match"/>
-        </weave>
-    </ajc-test>    
-    
-    <ajc-test dir="java5/annotations/within" vm="1.5" title="annotations and within">
-        <weave classesFiles="PlainWithin.java"
-               aspectsFiles="PlainWithinTests.java"
-               options="-1.5,-showWeaveInfo">
-               <message kind="warning" line="21" text="positive within match on annotation"/>
-               <message kind="warning" line="25" text="negative within match on annotation"/>
-        </weave>
-    </ajc-test>   
-    
-    <ajc-test dir="java5/annotations/thisOrtarget" vm="1.5" title="must have runtime retention">
-        <compile options="-1.5" files="NotRuntimeRetention.aj">
-         <message kind="error" line="20" text="Annotation type MySourceAnnotation does not have runtime retention"/>
-            <message kind="error" line="21" text="Annotation type MyClassAnnotation does not have runtime retention"/>
-            <message kind="error" line="22" text="Annotation type MyAnnotation does not have runtime retention"/>
-        </compile>
-    </ajc-test>
-     
-    <ajc-test dir="java5/annotations/thisOrtarget" vm="1.5" title="inheritable or not">
-        <compile options="-1.5" files="TestingAnnotations.java,ThisOrTargetTests.aj">
-        </compile>
-        <run class="TestingAnnotations"/>
-    </ajc-test> 
-
-    <ajc-test dir="java5/annotations/thisOrtarget" vm="1.5" title="use of @this/target in deow">
-        <compile options="-1.5" files="TestingAnnotations.java,DeclareEoW.java">
-               <message kind="error" line="3" text="this() pointcut designator cannot be used in declare statement"/>
-               <message kind="error" line="5" text="target() pointcut designator cannot be used in declare statement"/>
-        </compile>
-    </ajc-test> 
-
-    <ajc-test dir="java5/annotations/args" vm="1.5" title="@args tests">
-        <compile options="-1.5" files="TestingArgsAnnotations.java,AtArgsAspect.java">
-        </compile>
-        <run class="TestingArgsAnnotations"/>
-    </ajc-test> 
-    
-    <ajc-test dir="java5/annotations/args" vm="1.5" title="use of @args in deow">
-        <compile options="-1.5" files="TestingArgsAnnotations.java,DeclareEoW.java">
-               <message kind="error" line="3" text="args() pointcut designator cannot be used in declare statement"/>
-        </compile>
-    </ajc-test> 
-    
-    <ajc-test dir="java5/annotations" vm="1.5" title="compiling an annotation">
-        <compile options="-1.5" files="SimpleAnnotation.java">
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations" vm="1.5" title="compiling annotated file">
-        <compile options="-1.5" files="SimpleAnnotation.java,AnnotatedType.java">
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/within" vm="1.5" title="annotations and within (src)">
-        <compile files="PlainWithin.java,PlainWithinTests.java"
-               aspectsFiles="PlainWithinTests.java"
-               options="-1.5">
-               <message kind="warning" line="21" text="positive within match on annotation"/>
-               <message kind="warning" line="25" text="negative within match on annotation"/>
-        </compile>
-    </ajc-test>   
-
-    <ajc-test dir="java5/annotations/attarget" vm="1.5" title="losing annotations...">
-        <compile options="-1.5" files="Program.java,AtTargetAspect.java">
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations" vm="1.5" title="no itds on annotation types">
-        <compile files="AnnotatedType.java,SimpleAnnotation.java,SimpleAnnotation2.java,AnnotationAspect01.aj"
-               options="-1.5">
-               <message kind="error" line="4" text="can't make inter-type constructor declarations"/>
-               <message kind="error" line="8" text="can't make inter-type method declarations"/>
-               <message kind="error" line="13" text="can't make inter-type field declarations"/>
-        </compile>
-    </ajc-test>   
-
-   <ajc-test dir="java5/annotations" vm="1.5" title="no declare parents on annotation types">
-        <compile files="AnnotatedType.java,SimpleAnnotation.java,SimpleAnnotation2.java,AnnotationAspect04.aj"
-               options="-1.5">
-               <message kind="error" line="7" text="can't use declare parents to alter supertype of annotation type SimpleAnnotation"/>
-               <message kind="error" line="10" text="can't use declare parents to make 'java.lang.annotation.Annotation' the parent of type"/>
-               <message kind="error" line="4" text="can't use declare parents to make annotation type SimpleAnnotation implement an interface"/>
-        </compile>
-    </ajc-test>   
-
-   <ajc-test dir="java5/annotations" vm="1.5" title="declare parents wildcards matching annotation types">
-        <compile files="AnnotatedType.java,SimpleAnnotation.java,SimpleAnnotation2.java,AnnotationAspect05.aj"
-               options="-1.5">
-               <message kind="warning" line="4" text="annotation type SimpleAnnotation2 matches a declare parents type pattern but is being ignored"/>
-               <message kind="warning" line="4" text="annotation type SimpleAnnotation matches a declare parents type pattern but is being ignored"/>
-        </compile>
-    </ajc-test>   
-    
-   <ajc-test dir="java5/annotations/binding/complexExample" vm="1.5" title="annotated any pattern">
-        <compile files="A.java,B.java,C.java,Color.java,X3.java"
-               options="-1.5">
-        </compile>
-        <run class="g.h.i.C"/>
-        <run class="a.b.c.A"/>
-    </ajc-test>   
-    
-   <ajc-test dir="java5/annotations/binding/complexExample" vm="1.5" title="annotation not imported">
-        <compile files="A.java,B.java,C.java,Color.java,X4.java"
-               options="-1.5">
-               <message kind="warning" line="6" text="no match for this type name: Color"/>
-        </compile>
-        <run class="a.b.c.A"/>
-    </ajc-test>   
-    
-    <ajc-test dir="java5/annotations/itds" vm="1.5" title="annotated public itds">
-      <compile files="AtItd2.aj" options="-1.5"/>
-      <run class="AtItd2"/>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/itds" vm="1.5" title="annotated public itds - values">
-      <compile files="AtItd3.aj" options="-1.5"/>
-      <run class="AtItd3"/>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/itds" vm="1.5" title="annotated public itds - multiple complex annotations">
-      <compile files="AtItd4.aj" options="-1.5"/>
-      <run class="AtItd4"/>
-    </ajc-test>
-    
-    
-    <ajc-test dir="java5/annotations/itds" vm="1.5" title="nasty annotation and itds test">
-        <compile files="AnnotationsAndITDs.aj" options="-1.5">
-            <!-- first two are ITCs, second two are ITCs annotated via declare @ctor, third is default ctor -->
-            <message kind="warning" line="17" text="execution(@SomeAnnotation ...new(..)"/>    
-            <message kind="warning" line="20" text="execution(@SomeAnnotation ...new(..)"/>    
-            <message kind="warning" line="45" text="execution(@SomeAnnotation ...new(..)"/>    
-            <message kind="warning" line="46" text="execution(@SomeAnnotation ...new(..)"/>
-            <message kind="warning" line="180" text="execution(@SomeAnnotation ...new(..)"/>
-
-			<!-- first four are fields annotated via declare, last two are directly annotated ITDs -->
-            <message kind="warning" line="59" text="set(@SomeAnnotation...)"/>    
-            <message kind="warning" line="60" text="set(@SomeAnnotation...)"/>    
-            <message kind="warning" line="70" text="set(@SomeAnnotation...)"/>    
-            <message kind="warning" line="71" text="set(@SomeAnnotation...)"/>    
-            <message kind="warning" line="76" text="set(@SomeAnnotation...)"/>    
-            <message kind="warning" line="77" text="set(@SomeAnnotation...)"/>  
-
-			<!-- annotations added via declare -->
-            <message kind="warning" line="175" text="si(@SomeAnnotation...)"/>  
-            <message kind="warning" line="180" text="si(@SomeAnnotation...)"/>  
-            
-            <message kind="warning" line="25" text="execution(@SomeAnnotation ...)"/>        
-            <message kind="warning" line="28" text="execution(@SomeAnnotation ...)"/>        
-            <message kind="warning" line="52" text="execution(@SomeAnnotation ...)"/>        
-            <message kind="warning" line="53" text="execution(@SomeAnnotation ...)"/>    
-            <!--message kind="warning" line="70" text="set(@SomeAnnotation...)"/>    
-            <message kind="warning" line="71" text="set(@SomeAnnotation...)"/-->    
-        </compile>
-        <run class="AnnotationsAndITDs">
-            <stderr>
-                <line text="@type java.lang.System (AnnotationsAndITDs.aj:0)"/>
-                <line text="hello AnnotationsAndITDs (AnnotationsAndITDs.aj:17)"/>
-                <line text="goodbye java.lang.String (AnnotationsAndITDs.aj:20)"/>
-                <line text="goodbye java.lang.String (AnnotationsAndITDs.aj:20)"/>
-                <line text="y java.lang.Integer (AnnotationsAndITDs.aj:28)"/>
-                <line text="d java.lang.Double (AnnotationsAndITDs.aj:70)"/>
-                <line text="f java.lang.Double (AnnotationsAndITDs.aj:71)"/>
-                <line text="@type java.lang.System (AnnotationsAndITDs.aj:0)"/>
-                <line text="@field ITDMe2 (AnnotationsAndITDs.aj:59)"/>
-                <line text="@field ITDMe2 (AnnotationsAndITDs.aj:60)"/>
-                <line text="@cons java.lang.String (AnnotationsAndITDs.aj:45)"/>
-                <line text="@field ITDMe2 (AnnotationsAndITDs.aj:59)"/>
-                <line text="@field ITDMe2 (AnnotationsAndITDs.aj:60)"/>
-                <line text="@cons java.lang.String (AnnotationsAndITDs.aj:46)"/>
-                <line text="@cons java.lang.String (AnnotationsAndITDs.aj:46)"/>
-                <line text="@method ITDMe2 (AnnotationsAndITDs.aj:53)"/>
-                <line text="@field ITDMe2 (AnnotationsAndITDs.aj:76)"/>
-                <line text="@field ITDMe2 (AnnotationsAndITDs.aj:77)"/>
-                
-                <!--
-                <line text="method bar has 1 params, first param annotation is @ParamAnnotation"/>
-                -->
-            </stderr>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/declare" pr="91858" title="declare @Type (should be @type)">
-        <compile files="DeathByPoorSpelling.aj" options="-1.5">
-            <message kind="error" line="6" text="Syntax error on token &quot;:&quot;, &quot;one of type, method, field, constructor&quot; expected"/>
-        </compile>
-    </ajc-test>
-    
-   <!-- ======================================================================================= -->
-   <!--               Autoboxing tests                                                          -->
-   <!-- ======================================================================================= -->
-
-   <ajc-test dir="java5/autoboxing" vm="1.5" title="simple boxing test">
-        <compile files="AutoboxingB.java,AutoboxingC.java,AutoboxingD.java,AutoboxingF.java,AutoboxingI.java,AutoboxingJ.java,AutoboxingS.java,AutoboxingZ.java,SimpleAutoboxing.java,SimpleAutoboxingAspect.aj"
-               options="-1.5,-showWeaveInfo">
-               <message kind="weave" text="Type 'SimpleAutoboxing' (SimpleAutoboxing.java:7) advised by before advice from 'SimpleAutoboxingAspect' (SimpleAutoboxingAspect.aj:8)"/>
-               <message kind="weave" text="Type 'SimpleAutoboxing' (SimpleAutoboxing.java:7) advised by before advice from 'SimpleAutoboxingAspect' (SimpleAutoboxingAspect.aj:4)"/>
-        </compile>
-        <run class="SimpleAutoboxing">
-          <stderr>
-              <line text="Matching by Integer:20000"/>
-              <line text="Matching by int:20000"/>
-              <line text="method_takes_Integer=20000"/>
-          </stderr>
-        </run>
-   </ajc-test>   
-
-   <ajc-test dir="java5/autoboxing" vm="1.5" title="integer boxing">
-        <compile files="AutoboxingB.java,AutoboxingC.java,AutoboxingD.java,AutoboxingF.java,AutoboxingI.java,AutoboxingJ.java,AutoboxingS.java,AutoboxingZ.java,SimpleAutoboxing.java,AspectInteger.aj"
-               options="-1.5,-showWeaveInfo">
-               <message kind="weave" text="Type 'AutoboxingI' (AutoboxingI.java:11) advised by before advice from 'AspectInteger' (AspectInteger.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingI' (AutoboxingI.java:11) advised by before advice from 'AspectInteger' (AspectInteger.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingI' (AutoboxingI.java:12) advised by before advice from 'AspectInteger' (AspectInteger.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingI' (AutoboxingI.java:12) advised by before advice from 'AspectInteger' (AspectInteger.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingI' (AutoboxingI.java:13) advised by before advice from 'AspectInteger' (AspectInteger.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingI' (AutoboxingI.java:13) advised by before advice from 'AspectInteger' (AspectInteger.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingI' (AutoboxingI.java:14) advised by before advice from 'AspectInteger' (AspectInteger.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingI' (AutoboxingI.java:14) advised by before advice from 'AspectInteger' (AspectInteger.aj:4)"/>
-        </compile>
-        <run class="AutoboxingI">
-          <stderr>
-              <line text="Matching by Integer:10000"/>
-              <line text="Matching by int:10000"/>
-              <line text="method_takes_Integer=10000"/>
-              <line text="Matching by Integer:20000"/>
-              <line text="Matching by int:20000"/>
-              <line text="method_takes_Integer=20000"/>
-              <line text="Matching by Integer:30000"/>
-              <line text="Matching by int:30000"/>
-              <line text="method_takes_int=30000"/>
-              <line text="Matching by Integer:40000"/>
-              <line text="Matching by int:40000"/>
-              <line text="method_takes_int=40000"/>
-          </stderr>
-        </run>
-   </ajc-test>   
-   
-     <ajc-test dir="java5/autoboxing" vm="1.5" title="char boxing">
-        <compile files="AutoboxingB.java,AutoboxingC.java,AutoboxingD.java,AutoboxingF.java,AutoboxingI.java,AutoboxingJ.java,AutoboxingS.java,AutoboxingZ.java,SimpleAutoboxing.java,AspectChar.aj"
-               options="-1.5,-showWeaveInfo">
-               <message kind="weave" text="Type 'AutoboxingC' (AutoboxingC.java:11) advised by before advice from 'AspectChar' (AspectChar.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingC' (AutoboxingC.java:11) advised by before advice from 'AspectChar' (AspectChar.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingC' (AutoboxingC.java:12) advised by before advice from 'AspectChar' (AspectChar.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingC' (AutoboxingC.java:12) advised by before advice from 'AspectChar' (AspectChar.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingC' (AutoboxingC.java:13) advised by before advice from 'AspectChar' (AspectChar.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingC' (AutoboxingC.java:13) advised by before advice from 'AspectChar' (AspectChar.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingC' (AutoboxingC.java:14) advised by before advice from 'AspectChar' (AspectChar.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingC' (AutoboxingC.java:14) advised by before advice from 'AspectChar' (AspectChar.aj:4)"/>
-        </compile>
-        <run class="AutoboxingC">
-          <stderr>
-              <line text="Character:1"/>
-              <line text="char:1"/>
-              <line text="method_takes_Character=1"/>
-              <line text="Character:2"/>
-              <line text="char:2"/>
-              <line text="method_takes_Character=2"/>
-              <line text="Character:3"/>
-              <line text="char:3"/>
-              <line text="method_takes_char=3"/>
-              <line text="Character:4"/>
-              <line text="char:4"/>
-              <line text="method_takes_char=4"/>
-          </stderr>
-        </run>
-   </ajc-test>   
-   
-       <ajc-test dir="java5/autoboxing" vm="1.5" title="double boxing">
-        <compile files="AutoboxingB.java,AutoboxingC.java,AutoboxingD.java,AutoboxingF.java,AutoboxingI.java,AutoboxingJ.java,AutoboxingS.java,AutoboxingZ.java,SimpleAutoboxing.java,AspectDouble.aj"
-               options="-1.5,-showWeaveInfo">
-               <message kind="weave" text="Type 'AutoboxingD' (AutoboxingD.java:11) advised by before advice from 'AspectDouble' (AspectDouble.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingD' (AutoboxingD.java:11) advised by before advice from 'AspectDouble' (AspectDouble.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingD' (AutoboxingD.java:12) advised by before advice from 'AspectDouble' (AspectDouble.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingD' (AutoboxingD.java:12) advised by before advice from 'AspectDouble' (AspectDouble.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingD' (AutoboxingD.java:13) advised by before advice from 'AspectDouble' (AspectDouble.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingD' (AutoboxingD.java:13) advised by before advice from 'AspectDouble' (AspectDouble.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingD' (AutoboxingD.java:14) advised by before advice from 'AspectDouble' (AspectDouble.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingD' (AutoboxingD.java:14) advised by before advice from 'AspectDouble' (AspectDouble.aj:4)"/>
-        </compile>
-        <run class="AutoboxingD">
-          <stderr>
-              <line text="Double:100.0"/>
-              <line text="double:100.0"/>
-              <line text="method_takes_Double=100.0"/>
-              <line text="Double:200.0"/>
-              <line text="double:200.0"/>
-              <line text="method_takes_Double=200.0"/>
-              <line text="Double:300.0"/>
-              <line text="double:300.0"/>
-              <line text="method_takes_double=300.0"/>
-              <line text="Double:400.0"/>
-              <line text="double:400.0"/>
-              <line text="method_takes_double=400.0"/>
-          </stderr>
-        </run>
-   </ajc-test>   
-
-   <ajc-test dir="java5/autoboxing" vm="1.5" title="float boxing">
-        <compile files="AutoboxingB.java,AutoboxingC.java,AutoboxingD.java,AutoboxingF.java,AutoboxingI.java,AutoboxingJ.java,AutoboxingS.java,AutoboxingZ.java,SimpleAutoboxing.java,AspectFloat.aj"
-               options="-1.5,-showWeaveInfo">
-               <message kind="weave" text="Type 'AutoboxingF' (AutoboxingF.java:11) advised by before advice from 'AspectFloat' (AspectFloat.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingF' (AutoboxingF.java:11) advised by before advice from 'AspectFloat' (AspectFloat.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingF' (AutoboxingF.java:12) advised by before advice from 'AspectFloat' (AspectFloat.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingF' (AutoboxingF.java:12) advised by before advice from 'AspectFloat' (AspectFloat.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingF' (AutoboxingF.java:13) advised by before advice from 'AspectFloat' (AspectFloat.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingF' (AutoboxingF.java:13) advised by before advice from 'AspectFloat' (AspectFloat.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingF' (AutoboxingF.java:14) advised by before advice from 'AspectFloat' (AspectFloat.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingF' (AutoboxingF.java:14) advised by before advice from 'AspectFloat' (AspectFloat.aj:4)"/>
-        </compile>
-        <run class="AutoboxingF">
-          <stderr>
-              <line text="Float:100.0"/>
-              <line text="float:100.0"/>
-              <line text="method_takes_Float=100.0"/>
-              <line text="Float:200.0"/>
-              <line text="float:200.0"/>
-              <line text="method_takes_Float=200.0"/>
-              <line text="Float:300.0"/>
-              <line text="float:300.0"/>
-              <line text="method_takes_float=300.0"/>
-              <line text="Float:400.0"/>
-              <line text="float:400.0"/>
-              <line text="method_takes_float=400.0"/>
-          </stderr>
-        </run>
-   </ajc-test>   
-
-   <ajc-test dir="java5/autoboxing" vm="1.5" title="short boxing">
-        <compile files="AutoboxingB.java,AutoboxingC.java,AutoboxingD.java,AutoboxingF.java,AutoboxingI.java,AutoboxingJ.java,AutoboxingS.java,AutoboxingZ.java,SimpleAutoboxing.java,AspectShort.aj"
-               options="-1.5,-showWeaveInfo">
-               <message kind="weave" text="Type 'AutoboxingS' (AutoboxingS.java:11) advised by before advice from 'AspectShort' (AspectShort.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingS' (AutoboxingS.java:11) advised by before advice from 'AspectShort' (AspectShort.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingS' (AutoboxingS.java:12) advised by before advice from 'AspectShort' (AspectShort.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingS' (AutoboxingS.java:12) advised by before advice from 'AspectShort' (AspectShort.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingS' (AutoboxingS.java:13) advised by before advice from 'AspectShort' (AspectShort.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingS' (AutoboxingS.java:13) advised by before advice from 'AspectShort' (AspectShort.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingS' (AutoboxingS.java:14) advised by before advice from 'AspectShort' (AspectShort.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingS' (AutoboxingS.java:14) advised by before advice from 'AspectShort' (AspectShort.aj:4)"/>
-        </compile>
-        <run class="AutoboxingS">
-          <stderr>
-              <line text="Short:100"/>
-              <line text="short:100"/>
-              <line text="method_takes_Short=100"/>
-              <line text="Short:200"/>
-              <line text="short:200"/>
-              <line text="method_takes_Short=200"/>
-              <line text="Short:300"/>
-              <line text="short:300"/>
-              <line text="method_takes_short=300"/>
-              <line text="Short:400"/>
-              <line text="short:400"/>
-              <line text="method_takes_short=400"/>
-          </stderr>
-        </run>
-   </ajc-test>   
-
-   <ajc-test dir="java5/autoboxing" vm="1.5" title="long boxing">
-        <compile files="AutoboxingB.java,AutoboxingC.java,AutoboxingD.java,AutoboxingF.java,AutoboxingI.java,AutoboxingJ.java,AutoboxingS.java,AutoboxingZ.java,SimpleAutoboxing.java,AspectLong.aj"
-               options="-1.5,-showWeaveInfo">
-               <message kind="weave" text="Type 'AutoboxingJ' (AutoboxingJ.java:11) advised by before advice from 'AspectLong' (AspectLong.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingJ' (AutoboxingJ.java:11) advised by before advice from 'AspectLong' (AspectLong.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingJ' (AutoboxingJ.java:12) advised by before advice from 'AspectLong' (AspectLong.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingJ' (AutoboxingJ.java:12) advised by before advice from 'AspectLong' (AspectLong.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingJ' (AutoboxingJ.java:13) advised by before advice from 'AspectLong' (AspectLong.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingJ' (AutoboxingJ.java:13) advised by before advice from 'AspectLong' (AspectLong.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingJ' (AutoboxingJ.java:14) advised by before advice from 'AspectLong' (AspectLong.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingJ' (AutoboxingJ.java:14) advised by before advice from 'AspectLong' (AspectLong.aj:4)"/>
-        </compile>
-        <run class="AutoboxingJ">
-          <stderr>
-              <line text="Long:1000000"/>
-              <line text="long:1000000"/>
-              <line text="method_takes_Long=1000000"/>
-              <line text="Long:2000000"/>
-              <line text="long:2000000"/>
-              <line text="method_takes_Long=2000000"/>
-              <line text="Long:3000000"/>
-              <line text="long:3000000"/>
-              <line text="method_takes_long=3000000"/>
-              <line text="Long:4000000"/>
-              <line text="long:4000000"/>
-              <line text="method_takes_long=4000000"/>
-          </stderr>
-        </run>
-   </ajc-test>   
-
-   <ajc-test dir="java5/autoboxing" vm="1.5" title="boolean boxing">
-        <compile files="AutoboxingB.java,AutoboxingC.java,AutoboxingD.java,AutoboxingF.java,AutoboxingI.java,AutoboxingJ.java,AutoboxingS.java,AutoboxingZ.java,SimpleAutoboxing.java,AspectBoolean.aj"
-               options="-1.5,-showWeaveInfo">
-               <message kind="weave" text="Type 'AutoboxingZ' (AutoboxingZ.java:9) advised by before advice from 'AspectBoolean' (AspectBoolean.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingZ' (AutoboxingZ.java:9) advised by before advice from 'AspectBoolean' (AspectBoolean.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingZ' (AutoboxingZ.java:10) advised by before advice from 'AspectBoolean' (AspectBoolean.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingZ' (AutoboxingZ.java:10) advised by before advice from 'AspectBoolean' (AspectBoolean.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingZ' (AutoboxingZ.java:11) advised by before advice from 'AspectBoolean' (AspectBoolean.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingZ' (AutoboxingZ.java:11) advised by before advice from 'AspectBoolean' (AspectBoolean.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingZ' (AutoboxingZ.java:12) advised by before advice from 'AspectBoolean' (AspectBoolean.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingZ' (AutoboxingZ.java:12) advised by before advice from 'AspectBoolean' (AspectBoolean.aj:4)"/>
-        </compile>
-        <run class="AutoboxingZ">
-          <stderr>
-              <line text="Boolean:false"/>
-              <line text="boolean:false"/>
-              <line text="method_takes_Boolean=false"/>
-              <line text="Boolean:false"/>
-              <line text="boolean:false"/>
-              <line text="method_takes_Boolean=false"/>
-              <line text="Boolean:false"/>
-              <line text="boolean:false"/>
-              <line text="method_takes_boolean=false"/>
-              <line text="Boolean:false"/>
-              <line text="boolean:false"/>
-              <line text="method_takes_boolean=false"/>
-          </stderr>
-        </run>
-   </ajc-test>   
-
-   <ajc-test dir="java5/autoboxing" vm="1.5" title="byte boxing">
-        <compile files="AutoboxingB.java,AutoboxingC.java,AutoboxingD.java,AutoboxingF.java,AutoboxingI.java,AutoboxingJ.java,AutoboxingS.java,AutoboxingZ.java,SimpleAutoboxing.java,AspectByte.aj"
-               options="-1.5,-showWeaveInfo">
-               <message kind="weave" text="Type 'AutoboxingB' (AutoboxingB.java:11) advised by before advice from 'AspectByte' (AspectByte.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingB' (AutoboxingB.java:11) advised by before advice from 'AspectByte' (AspectByte.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingB' (AutoboxingB.java:12) advised by before advice from 'AspectByte' (AspectByte.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingB' (AutoboxingB.java:12) advised by before advice from 'AspectByte' (AspectByte.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingB' (AutoboxingB.java:13) advised by before advice from 'AspectByte' (AspectByte.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingB' (AutoboxingB.java:13) advised by before advice from 'AspectByte' (AspectByte.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingB' (AutoboxingB.java:14) advised by before advice from 'AspectByte' (AspectByte.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingB' (AutoboxingB.java:14) advised by before advice from 'AspectByte' (AspectByte.aj:4)"/>
-        </compile>
-        <run class="AutoboxingB">
-          <stderr>
-              <line text="Byte:1"/>
-              <line text="byte:1"/>
-              <line text="method_takes_Byte=1"/>
-              <line text="Byte:50"/>
-              <line text="byte:50"/>
-              <line text="method_takes_Byte=50"/>
-              <line text="Byte:3"/>
-              <line text="byte:3"/>
-              <line text="method_takes_byte=3"/>
-              <line text="Byte:52"/>
-              <line text="byte:52"/>
-              <line text="method_takes_byte=52"/>
-          </stderr>
-        </run>
-   </ajc-test>   
-
-   <ajc-test dir="java5/autoboxing" vm="1.5" title="boxing in after returning">
-        <compile files="AutoboxingB.java,AutoboxingC.java,AutoboxingD.java,AutoboxingF.java,AutoboxingI.java,AutoboxingJ.java,AutoboxingS.java,AutoboxingZ.java,SimpleAutoboxing.java,AspectAfterReturning.aj"
-               options="-1.5,-showWeaveInfo">
-               <message kind="weave" text="Type 'AspectAfterReturning' (AspectAfterReturning.aj:18) advised by afterReturning advice from 'AspectAfterReturning' (AspectAfterReturning.aj:4)"/>
-               <message kind="weave" text="Type 'AspectAfterReturning' (AspectAfterReturning.aj:18) advised by afterReturning advice from 'AspectAfterReturning' (AspectAfterReturning.aj:8)"/>
-               <message kind="weave" text="Type 'AspectAfterReturning' (AspectAfterReturning.aj:18) advised by afterReturning advice from 'AspectAfterReturning' (AspectAfterReturning.aj:12)"/>
-               <message kind="weave" text="Type 'AspectAfterReturning' (AspectAfterReturning.aj:19) advised by afterReturning advice from 'AspectAfterReturning' (AspectAfterReturning.aj:4)"/>
-               <message kind="weave" text="Type 'AspectAfterReturning' (AspectAfterReturning.aj:19) advised by afterReturning advice from 'AspectAfterReturning' (AspectAfterReturning.aj:8)"/>
-               <message kind="weave" text="Type 'AspectAfterReturning' (AspectAfterReturning.aj:19) advised by afterReturning advice from 'AspectAfterReturning' (AspectAfterReturning.aj:12)"/>
-        </compile>
-        <run class="AspectAfterReturning">
-          <stderr>
-              <line text="Returning I=5"/>
-              <line text="Returning Integer=5"/>
-              <line text="Returning Object=5"/>
-              <line text="Returning I=10"/>
-              <line text="Returning Integer=10"/>
-              <line text="Returning Object=10"/>
-          </stderr>
-        </run>
-   </ajc-test>   
-
-   <!-- ======================================================================================= -->
-   <!--               Covariance tests                                                          -->
-   <!-- ======================================================================================= -->
-
-    <ajc-test dir="java5/covariance" vm="1.5" title="covariance 1">
-        <compile options="-1.5,-showWeaveInfo" files="CovBaseProgram01.java,CovAspect01.aj">
-            <message kind="weave" text="Type 'CovBaseProgram01' (CovBaseProgram01.java:26) advised by before advice from 'CovAspect01' (CovAspect01.aj:5)"/>
-            <message kind="weave" text="Type 'CovBaseProgram01' (CovBaseProgram01.java:27) advised by before advice from 'CovAspect01' (CovAspect01.aj:5)"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/covariance" vm="1.5" title="covariance 2">
-        <compile options="-1.5,-showWeaveInfo" files="CovBaseProgram01.java,CovAspect02.aj">
-            <message kind="weave" text="Type 'CovBaseProgram01' (CovBaseProgram01.java:26) advised by before advice from 'CovAspect02' (CovAspect02.aj:5)"/>
-            <message kind="weave" text="Type 'CovBaseProgram01' (CovBaseProgram01.java:27) advised by before advice from 'CovAspect02' (CovAspect02.aj:5)"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/covariance" vm="1.5" title="covariance 3">
-        <compile options="-1.5,-showWeaveInfo" files="CovBaseProgram01.java,CovAspect03.aj">
-            <message kind="weave" text="Type 'CovBaseProgram01' (CovBaseProgram01.java:26) advised by before advice from 'CovAspect03' (CovAspect03.aj:5)"/>
-            <message kind="weave" text="Type 'CovBaseProgram01' (CovBaseProgram01.java:27) advised by before advice from 'CovAspect03' (CovAspect03.aj:5)"/>
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="java5/covariance" vm="1.5" title="covariance 4">
-        <compile options="-1.5,-showWeaveInfo" files="CovBaseProgram02.java,CovAspect04.aj">
-            <message kind="weave" text="Type 'CovBaseProgram02' (CovBaseProgram02.java:30) advised by before advice from 'CovAspect04' (CovAspect04.aj:5)"/>
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="java5/covariance" vm="1.5" title="covariance 5">
-        <compile options="-1.5,-showWeaveInfo" files="CovBaseProgram01.java,CovAspect05.aj">
-            <message kind="weave" text="Type 'CovBaseProgram01' (CovBaseProgram01.java:26) advised by before advice from 'CovAspect05' (CovAspect05.aj:5)"/>
-            <message kind="weave" text="Type 'CovBaseProgram01' (CovBaseProgram01.java:27) advised by before advice from 'CovAspect05' (CovAspect05.aj:5)"/>
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="java5/covariance" vm="1.5" title="covariance 6">
-        <compile options="-1.5,-showWeaveInfo" files="CovBaseProgram01.java,CovAspect06.aj">
-            <message kind="warning" line="3" text="does not match because declaring type is Super"/>
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="java5/covariance" vm="1.5" title="covariance 7">
-        <compile options="-1.5,-showWeaveInfo" files="CovBaseProgram01.java,CovAspect07.aj">
-            <message kind="weave" text="Type 'CovBaseProgram01' (CovBaseProgram01.java:27) advised by before advice from 'CovAspect07' (CovAspect07.aj:5)"/>
-            <message kind="warning" line="3" text="does not match because declaring type is Super"/>
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="java5/covariance" vm="1.5" title="covariance 8">
-        <compile options="-1.5,-showWeaveInfo" files="CovBaseProgram01.java,CovAspect08.aj">
-            <message kind="weave" text="Type 'CovBaseProgram01' (CovBaseProgram01.java:27) advised by before advice from 'CovAspect08' (CovAspect08.aj:11)"/>
-            <message kind="weave" text="Type 'CovBaseProgram01' (CovBaseProgram01.java:27) advised by before advice from 'CovAspect08' (CovAspect08.aj:5)"/>
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="java5/covariance" vm="1.5" title="covariance 9">
-        <compile options="-1.5,-showWeaveInfo" files="CovBaseProgram01.java,CovAspect09.aj">
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="java5/covariance" vm="1.5" title="covariance 10">
-        <compile options="-1.5,-showWeaveInfo" files="CovBaseProgram01.java,CovAspect10.aj">
-            <message kind="weave" text="Type 'CovBaseProgram01' (CovBaseProgram01.java:26) advised by before advice from 'CovAspect10' (CovAspect10.aj:5)"/>
-            <message kind="weave" text="Type 'CovBaseProgram01' (CovBaseProgram01.java:27) advised by before advice from 'CovAspect10' (CovAspect10.aj:5)"/>
-        </compile>
-    </ajc-test>
-
-   <!-- ======================================================================================= -->
-   <!--               Enum tests                                                                -->
-   <!-- ======================================================================================= -->
-
-    <ajc-test dir="java5/enums" vm="1.5" title="cant itd constructor on enum">
-        <compile files="SimpleEnum.java,SimpleEnum2.java,EnumAspect01.aj" options="-1.5">
-            <message kind="error" line="2" text="can't make inter-type constructor declarations on enum types"/>
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="java5/enums" vm="1.5" title="cant itd field or method on enum">
-        <compile files="SimpleEnum.java,SimpleEnum2.java,EnumAspect02.aj" options="-1.5">
-            <message kind="error" line="2" text="can't make inter-type method declarations on enum types"/>
-            <message kind="error" line="6" text="can't make inter-type field declarations on enum types"/>
-        </compile>
-    </ajc-test>
-    
-   <ajc-test dir="java5/enums" vm="1.5" title="declare parents and enums">
-        <compile files="SimpleEnum.java,SimpleEnum2.java,EnumAspect03.aj" options="-1.5">
-            <message kind="error" line="5" text="can't use declare parents to make enum type SimpleEnum implement an interface"/>
-            <message kind="error" line="8" text="can't use declare parents to alter supertype of enum type SimpleEnum"/>
-            <message kind="error" line="11" text="can't use declare parents to make 'java.lang.Enum' the parent of type EnumAspect03$D"/>          
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/enums" vm="1.5" title="wildcard enum match in itd">
-        <compile files="SimpleEnum.java,SimpleEnum2.java,EnumAspect04.aj" options="-1.5">
-            <message kind="warning" line="5" text="enum type SimpleEnum2 matches a declare parents type pattern but is being ignored"/>
-            <message kind="warning" line="5" text="enum type SimpleEnum matches a declare parents type pattern but is being ignored"/>
-        </compile>
-    </ajc-test>
-
-   <!-- ======================================================================================= -->
-   <!--               pertypewithin tests                                                       -->
-   <!-- ======================================================================================= -->
-    
-   <ajc-test dir="java5/pertypewithin" title="basic ptw test">
-       <compile files="A.java,B.java,C.java,D.java,Main.java,X.java" options="-Xlint:ignore"/>
-       <run class="p.A">
-           <stderr>
-               <line text="hi from A"/>
-               <line text="after() returning from a method call to sayhi()"/>
-               <line text="hi from A"/>
-               <line text="after() returning from a method call to sayhi()"/>
-               <line text="Tests in A have passed"/>
-               <line text="callcount = 2"/>
-           </stderr>
-       </run>
-   </ajc-test> 
-
-   <ajc-test dir="java5/pertypewithin" title="ptw hasAspect">
-       <compile files="A.java,B.java,C.java,D.java,Main.java,X.java" options="-Xlint:ignore"/>
-       <run class="p.B">
-           <stderr>
-               <line text="hi from B"/>
-               <line text="after() returning from a method call to sayhi()"/>
-               <line text="hi from B"/>
-               <line text="after() returning from a method call to sayhi()"/>
-               <line text="hi from B"/>
-               <line text="after() returning from a method call to sayhi()"/>
-               <line text="callcount = 3"/>
-           </stderr>
-       </run>
-   </ajc-test> 
-   
-    <ajc-test dir="java5/pertypewithin" title="ptw aspectOf">
-       <compile files="A.java,B.java,C.java,D.java,Main.java,X.java" options="-Xlint:ignore"/>
-       <run class="p.C"/>
-   </ajc-test> 
-
-    <ajc-test dir="java5/pertypewithin" title="ptw multi-aspects">
-       <compile files="P.java,Q.java,R.java"/>
-       <run class="P">
-           <stderr>
-               <line text="Q reporting 2"/>
-               <line text="R reporting 3"/>
-           </stderr>
-       </run>
-   </ajc-test> 
-
-    <ajc-test dir="java5/pertypewithin" title="ptw binary">
-       <weave classesFiles="G.java" aspectsFiles="H.java" options="-1.4"/>
-       <run class="G">
-           <stderr>
-               <line text="advice running"/>
-           </stderr>
-       </run>
-   </ajc-test> 
-   
-   <ajc-test dir="java5/pertypewithin" title="ptw binary aspect">
-       <compile files="H.java" outjar="aspects.jar" options="-1.4">
-           <message kind="warning" line="1" text="no match for this type name: G"/>
-       </compile>
-       <compile files="G.java" aspectpath="aspects.jar"/>
-       <run class="G">
-           <stderr>
-               <line text="advice running"/>
-           </stderr>
-       </run>
-   </ajc-test>
-
-   <!-- ======================================================================================= -->
-   <!--               varargs tests                                                             -->
-   <!-- ======================================================================================= -->
-
-   <ajc-test dir="java5/varargs" vm="1.5" title="varargs not matched by Object[] (call)">
-       <compile files="SimpleVarargs.java,VarargsAspect01.aj" options="-1.5,-showWeaveInfo">
-       </compile>
-   </ajc-test>
-
-   <ajc-test dir="java5/varargs" vm="1.5" title="varargs not matched by Object[] (exe)">
-       <compile files="SimpleVarargs.java,VarargsAspect02.aj" options="-1.5,-showWeaveInfo">
-       </compile>
-   </ajc-test>
-
-   <ajc-test dir="java5/varargs" vm="1.5" title="varargs not matched by Object[] (init)">
-       <compile files="SimpleVarargs.java,VarargsAspect03.aj" options="-1.5,-showWeaveInfo">
-       </compile>
-   </ajc-test>
-
-   <ajc-test dir="java5/varargs" vm="1.5" title="varargs not matched by Object[] (withincode)">
-       <compile files="SimpleVarargs.java,VarargsAspect04.aj" options="-1.5,-showWeaveInfo">
-       </compile>
-   </ajc-test>
-
-  <ajc-test dir="java5/varargs" vm="1.5" title="call with varargs signature">
-       <compile files="SimpleVarargs.java,VarargsAspect05.aj" options="-1.5,-showWeaveInfo">
-           <message kind="weave" text="Type 'SimpleVarargs' (SimpleVarargs.java:20) advised by before advice from 'VarargsAspect05' (VarargsAspect05.aj:3)"/>
-           <message kind="weave" text="Type 'SimpleVarargs' (SimpleVarargs.java:21) advised by before advice from 'VarargsAspect05' (VarargsAspect05.aj:3)"/>
-           <message kind="weave" text="Type 'SimpleVarargs' (SimpleVarargs.java:22) advised by before advice from 'VarargsAspect05' (VarargsAspect05.aj:3)"/>
-       </compile>
-   </ajc-test>
-
-     <ajc-test dir="java5/varargs" vm="1.5" title="call with varargs multi-signature">
-       <compile files="SimpleVarargs.java,VarargsAspect06.aj" options="-1.5,-showWeaveInfo">
-           <message kind="weave" text="Type 'SimpleVarargs' (SimpleVarargs.java:25) advised by before advice from 'VarargsAspect06' (VarargsAspect06.aj:3)"/>
-           <message kind="weave" text="Type 'SimpleVarargs' (SimpleVarargs.java:26) advised by before advice from 'VarargsAspect06' (VarargsAspect06.aj:3)"/>
-           <message kind="weave" text="Type 'SimpleVarargs' (SimpleVarargs.java:27) advised by before advice from 'VarargsAspect06' (VarargsAspect06.aj:3)"/>
-       </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/suppressedWarnings" vm="1.5" title="suppressing non-matching advice warnings">
-       <compile files="Suppression1.aj" options="-1.5,-showWeaveInfo">
-       	 <message kind="warning" line="13"/>
-         <message kind="warning" line="21"/>
-       </compile>
-   </ajc-test>
-   
-    <ajc-test dir="java5/suppressedWarnings" vm="1.5" title="suppressing non-matching advice warnings when multiple source files involved">
-       <compile files="A.java,A1.aj,A2.aj,A3.aj" options="-1.5,-showWeaveInfo">
-         <message kind="warning" line="4" file="A1.aj"/>
-         <message kind="warning" line="4" file="A2.aj"/>
-         <message kind="warning" line="11" file="A2.aj"/>
-         <message kind="warning" line="4" file="A3.aj"/>
-         <message kind="warning" line="11" file="A3.aj"/>
-       </compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150" title="XLint warning for advice not applied with cflow(execution)" pr="93345">
-     <compile options="-Xlint,-1.5" files="PR93345.aj" >
-       <message kind="warning" line="9" text="advice defined in AnAspect has not been applied [Xlint:adviceDidNotMatch]"/>
-     </compile>
-  </ajc-test>
-   
-  <ajc-test dir="bugs150" title="NPE in reflect implementation" pr="94167">
-     <compile files="PR94167.java"/>
-     <run class="reflect.PR94167"/>
-  </ajc-test>
-
-   <!-- ======================================================================================= -->
-   <!--               annotated aspect members                                                  -->
-   <!-- ======================================================================================= -->
-
-    <ajc-test dir="java5/annotations/aspectMembers" title="annotated annotations (@Target)">
-        <compile files="a/Annotations.java,a/Foo.java" options="-1.5">
-            <message kind="error" line="16" text="The annotation @MethodAnnotation is disallowed for this location"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/aspectMembers" title="simple annotated aspect members">
-        <compile files="a/Annotations.java,a/AnnotatedAspect.aj" options="-1.5">
-            <message kind="warning" line="4" text="annotated type"/>
-            <message kind="warning" line="6" text="annotated field"/>
-            <message kind="warning" line="8" text="annotated method"/>
-            <message kind="warning" line="11" text="annotated constructor"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/aspectMembers" title="simple annotated aspect members with bad target">
-        <compile files="a/Annotations.java,a/AnnotatedAspect02.aj" options="-1.5">
-            <message kind="error" line="3" text="The annotation @MethodAnnotation is disallowed for this location"/>
-            <message kind="error" line="6" text="The annotation @TypeAnnotation is disallowed for this location"/>
-            <message kind="error" line="8" text="The annotation @FieldAnnotation is disallowed for this location"/>
-            <message kind="error" line="10" text="The annotation @AnnotationAnnotation is disallowed for this location"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/aspectMembers" title="annotated itds">
-        <compile files="a/Annotations.java,a/AnnotatedAspect03.aj" options="-1.5">
-            <message kind="warning" line="4" text="annotated type"/>
-            <message kind="warning" line="6" text="annotated field"/>
-            <message kind="warning" line="8" text="annotated field"/>
-            <message kind="warning" line="10" text="annotated method"/>
-            <message kind="warning" line="12" text="annotated constructor"/>
-            <message kind="warning" line="12" text="annotated field"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/aspectMembers" title="annotated itds with bad target">
-        <compile files="a/Annotations.java,a/AnnotatedAspect04.aj" options="-1.5">
-            <message kind="error" line="6" text="The annotation @ConstructorAnnotation is disallowed for this location"/>
-            <message kind="error" line="8" text="The annotation @FieldAnnotation is disallowed for this location"/>
-            <message kind="error" line="10" text="The annotation @TypeAnnotation is disallowed for this location"/>
-            <!-- known limitation...
-                <message kind="error" line="12" text="The annotation @MethodAnnotation is disallowed for this location"/>
-            -->
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/aspectMembers" title="annotated advice">
-        <compile files="a/Annotations.java,a/AnnotatedAspect05.aj" options="-1.5">
-            <message kind="warning" line="17"/>
-        </compile>
-        <run class="a.AnnotatedAspect05"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/aspectMembers" title="annotated advice with bad target">
-        <compile files="a/Annotations.java,a/AnnotatedAspect06.aj" options="-1.5">
-            <message kind="error" line="6" text="The annotation @ConstructorAnnotation is disallowed for this location"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/aspectMembers" title="annotated pointcut">
-        <compile files="a/Annotations.java,a/AnnotatedAspect07.aj" options="-1.5">
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="java5/annotations/aspectMembers" title="annotated declare statements">
-        <compile files="a/Annotations.java,a/AnnotatedAspect08.aj" options="-1.5">
-        </compile>
-    </ajc-test>
-
- <!-- ======================================================================================= -->
-   <!--               ajdk examples                                                             -->
-   <!-- ======================================================================================= -->
-   <ajc-test dir="java5/annotations/ajdkExamples" title="ajdk: annotating aspects chapter">
-        <compile files="AnnotatingAspects.aj" options="-1.5">
-        </compile>
-    </ajc-test>
-   
-    <ajc-test dir="java5/annotations/ajdkExamples" title="ajdk: annotating aspects chapter, ex 2">
-        <compile files="SuppressAj.aj" options="-1.5">
-        </compile>
-    </ajc-test>
-   
-    <ajc-test dir="java5/annotations/ajdkExamples" title="ajdk: annotation pattern matching">
-        <compile files="AnnotationPatternMatching.aj,org/xyz/OrgXYZAnnotation.java" options="-1.5">
-            <message kind="warning" line="25" text="@Immutable"/>
-            <message kind="warning" line="25" text="!@Persistent"/>
-            <message kind="warning" line="29" text="!@Persistent"/>
-            <message kind="warning" line="31" text="!@Persistent"/>
-            <message kind="warning" line="33" text="!@Persistent"/>
-            <message kind="warning" line="29" text="@Foo @Goo"/>
-            <message kind="warning" line="29" text="@(Foo || Goo)"/>
-            <message kind="warning" line="31" text="@(Foo || Goo)"/>
-            <message kind="warning" line="33" text="@(org.xyz..*)"/>            
-        </compile>
-    </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,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 *)"/>
-            <message kind="warning" line="5" text="(@Immutable *)"/>
-            <message kind="warning" line="8" text="(@Immutable *)"/>
-            <message kind="warning" line="25" text="(!@Immutable *)"/>
-            <message kind="warning" line="27" text="(!@Immutable *)"/>
-            <message kind="warning" line="29" text="(!@Immutable *)"/>
-            <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="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.*)"/>
-            <message kind="warning" line="32" text="((@Immutable Foo+) || Goo)"/>
-            <message kind="warning" line="27" text="((@Immutable Foo+) || Goo)"/>
-            <message kind="warning" line="3" text="@(Immutable || NonPersistent) org.xyz..*"/>
-            <message kind="warning" line="6" text="@(Immutable || NonPersistent) org.xyz..*"/>
-            <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,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="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="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 *,..)"/>
-            
-            <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="17" text="staticinitialization(@Persisted *)"/>
-            <message kind="warning" line="56" text="call(@Oneway * *(..))"/>
-            <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>
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/ajdkExamples" title="ajdk: runtime annotations">
-        <compile files="RuntimeTypeMatching.aj" options="-1.5">
-            <message kind="warning" line="121" text="@within(Foo)"/>
-            <message kind="warning" line="122" text="@within(Foo)"/>
-        </compile>
-        <run class="RuntimeTypeMatching">
-            <stdout>
-              <line text="This information is TOP-SECRET"/>
-              <line text="@target(Classified) at call(void A.a())"/>
-              <line text="@this(Foo) at execution(void B.b())"/>
-              <line text="Classified data being passed at call(void B.callA(A))"/>
-              <line text="Classified data being passed at execution(void B.callA(A))"/>
-              <line text="This information is TOP-SECRET"/>
-              <line text="@target(Classified) at call(Class java.lang.Object.getClass())"/>
-              <line text="1 @Foo()"/>
-              <line text="1 @Foo()"/>
-              <line text="1 @Classified(classification=TOP-SECRET)" vm="1.5,1.6,1.7,1.8"/>
-              <line text="1 @Classified(classification=&quot;TOP-SECRET&quot;)" vm="9+"/>
-              <line text="This information is TOP-SECRET"/>
-              <line text="Entering critical join point with priority 3"/>
-              <line text="Entering critical join point with reflectively obtained priority 3"/>
-              <line text="@target(Classified) at call(void A.a())"/>
-              <line text="@this(Foo) at execution(void B.callA(A))"/>
-              <line text="(Class) Transaction required at execution(void ByeByeEJB.method1())"/>
-              <line text="(Method) Transaction required at execution(void ByeByeEJB.method1())"/>
-              <line text="(Class) Transaction required at execution(void ByeByeEJB.method2())"/>
-              <line text="(Method) Transaction required at execution(void ByeByeEJB.method2())"/>
-              <line text="(Class) Transaction required at execution(void ByeByeEJB.method3())"/>
-            </stdout>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/ajdkExamples" title="ajdk: @retention checking">
-        <compile files="RetentionTime.aj" options="-1.5">
-            <message kind="error" line="8" text="Annotation type Goo does not have runtime retention"/>
-            <message kind="error" line="13" text="Annotation type Goo does not have runtime retention"/>
-            <message kind="error" line="18" text="Annotation type Goo does not have runtime retention"/>
-        </compile>
-    </ajc-test>
-    
-     <ajc-test dir="java5/annotations/ajdkExamples" title="ajdk: @inherited">
-        <compile files="AnnotationInheritance.aj" options="-1.5">
-            <message kind="warning" line="16" text="annotatedMethodCall()"/>
-            <!-- <message kind="warning" line="17" text="annotatedMethodCall()"/> -->
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/ajdkExamples" title="ajdk: deow-ann">
-        <compile files="DeclaresWithAnnotations.aj,org/xyz/model/Model.java" options="-1.5">
-            <message kind="warning" line="27" text="Expensive operation called from within performance critical section"/>
-            <message kind="error" line="26" text="Untrusted code should not call the model classes directly"/>
-        </compile>
-    </ajc-test>    
-    
-      <ajc-test dir="java5/annotations/ajdkExamples" title="ajdk: decp-ann">
-        <compile files="DecpAnnotations.aj" options="-1.5">
-        </compile>
-        <run class="DecpAnnotations">
-            <stdout>
-                <line text="Test Foo is not secured: PASS"/>
-                <line text="Test Goo is secured: PASS"/>
-                <line text="goo credentials: none"/>
-                <line text="Test BankAccount is not secured: PASS"/>
-                <line text="Test PrivateBankAccount is not secured: PASS"/>
-                <line text="Test BusinessBankAccount is secured: PASS"/>
-            </stdout>
-        </run>
-    </ajc-test>    
-
-    <ajc-test dir="java5/annotations/ajdkExamples" title="ajdk: dec precedence">
-        <compile files="PrecedenceAnnotations.aj" options="-1.5">
-        </compile>
-        <run class="PrecedenceAnnotations">
-            <stdout>
-                <line text="@Security S2"/>
-                <line text="S1"/>
-                <line text="@Performance P2"/>
-                <line text="P1"/>
-            </stdout>
-        </run>
-    </ajc-test>  
-
-   <ajc-test dir="java5/annotations/ajdkExamples" title="ajdk: dec annotation">
-        <compile files="DeclareAnnotation.aj,org/xyz/model/Model.java" options="-1.5">
-            <message kind="warning" line="3" text="@BusinessDomain"/>
-            <message kind="warning" line="43" text="@Secured"/>
-            <message kind="warning" line="44" text="@Secured"/>
-            <message kind="warning" line="55" text="@Secured"/>
-            <message kind="warning" line="62" text="@Persisted"/>
-            <message kind="warning" line="68" text="@Persisted"/>
-            <message kind="warning" line="41" text="@Secured"/>
-            <message kind="warning" line="51" text="@Secured"/>
-        </compile>
-        <run class="DeclareAnnotation"/>
-    </ajc-test>  
-    
-    <ajc-test dir="java5/covariance/ajdk" title="ajdk: covariance">
-        <compile files="AJDKExamples.aj" options="-1.5">
-            <message kind="warning" line="43" text="call(* whoAreYou())"/>
-            <message kind="warning" line="44" text="call(* whoAreYou())"/>
-            <message kind="warning" line="43" text="call(* A.whoAreYou())"/>
-            <message kind="warning" line="44" text="call(* A.whoAreYou())"/>
-            <message kind="warning" line="43" text="call(A whoAreYou())"/>
-            <message kind="warning" line="44" text="call(A whoAreYou())"/>
-            <message kind="warning" line="44" text="call(A+ B.whoAreYou())"/>
-            <message kind="warning" line="44" text="call(B whoAreYou())"/>
-            <message kind="warning" line="44" text="call(B B.whoAreYou())"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/varargs/ajdk" title="ajdk: varargs">
-        <compile files="AJDKExamples.aj,org/xyz/Foo.java,org/xyz/Goo.java,org/xyz/Hoo.java" options="-1.5">
-            <message kind="warning" line="8" text="call vararg match"/>
-            <message kind="warning" line="14" text="execution vararg match"/>
-            <message kind="warning" line="5" text="init vararg match"/>
-            <message kind="warning" line="6" text="init vararg match"/>
-            <message kind="warning" line="27" text="single vararg"/>
-            <message kind="warning" line="28" text="single String[]"/>
-            <message kind="warning" line="18" text="single String[]"/>
-        </compile>
-        <run class="AJDKExamples">
-            <stdout>
-                <line text="Matched at call(void X.foo(int, String[]))"/>
-            </stdout>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="java5/pertypewithin/ajdk" title="ajdk: ptw">
-        <compile files="AJDKExamples.aj" options="-1.5 -showWeaveInfo">
-          <message kind="weave" text="Join point 'constructor-execution(void org.xyz.foo.B.&lt;init&gt;())' in Type 'org.xyz.foo.B' (AJDKExamples.aj:38) advised by afterReturning advice from 'org.xyz.foo.AJDKExamples' (AJDKExamples.aj:11)"/>
-          <message kind="weave" text="Join point 'constructor-execution(void org.xyz.foo.A.&lt;init&gt;())' in Type 'org.xyz.foo.A' (AJDKExamples.aj:36) advised by afterReturning advice from 'org.xyz.foo.AJDKExamples' (AJDKExamples.aj:11)"/>
-        </compile>
-        <run class="org.xyz.foo.AJDKExamples">
-            <stdout>
-            	<line text="Aspect instance constructed"/>
-            	<line text="Aspect instance constructed"/>
-                <line text="true"/>
-                <line text="true"/>
-                <line text="There are 2 As"/>
-                <line text="There are 3 Bs"/>
-            </stdout>
-        </run>
-    </ajc-test>
-
-   <!-- ======================================================================================= -->
-   <!--               declare annotation                                                        -->
-   <!-- ======================================================================================= -->
-
-   <ajc-test dir="java5/annotations/declare" title="basic declare annotation parse test">
-        <compile files="BasicParseTest.aj" options="-1.5">
-        </compile>
-    </ajc-test>
-
-   <!-- ======================================================================================= -->
-   <!--               declare annotation (@type)                                                        -->
-   <!-- ======================================================================================= -->
-
-    <ajc-test dir="java5/annotations/declare" title="declare @type 1">
-        <compile files="DecaType1.java" options="-1.5"/>
-        <run class="DecaType1">
-          <stderr>
-        	<line text="annotation is @MyAnnotation()"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/declare" title="declare @type 2">
-        <compile files="DecaType2.java" options="-1.5,-Xlint:ignore" >
-        </compile>
-        <run class="DecaType2">
-        <stderr>
-        	<line text="annotation on DecaType2 is @MyAnnotation()"/>
-        	<line text="annotation on X is @MyAnnotation()"/>
-        	<line text="annotation on MyAnnotation is @MyAnnotation()"/>
-        </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/declare" title="declare @type - with matching pointcut">
-        <compile files="DecaType3.java" options="-1.5"/>
-        <run class="DecaType3">
-        	<stderr>
-               <line text="hello world"/>
-               <line text="advice running"/>
-            </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/declare" title="declare @type - binary weaving">
-        <weave classesFiles="BaseTypes.java"
-               aspectsFiles="DecaTypeBin1.aj,Colored.java"
-               options="-1.5"  xlintfile="ignoreTypeNotExposed.properties">
-        </weave>
-        <run class="BaseTypes">
-        <stderr>
-        	<line text="Color identified on class X"/>
-        	<line text="A.m() running"/>
-        	<line text="A.m() running"/>
-        	<line text="A.m() running"/>
-        </stderr>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/declare" title="declare @type - complex annotation - binary weaving">
-        <weave classesFiles="BaseTypes.java" aspectsFiles="DecaTypeBin2.aj" options="-1.5" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="BaseTypes">
-        	<stderr>
-        		<line text="ComplexAnnotation identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="A.m() running"/>
-        		<line text="A.m() running"/>
-        	</stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/declare" title="declare @type - complex annotation - source weaving">
-        <compile files="BaseTypes.java,DecaTypeBin2.aj" options="-1.5"/>
-        <run class="BaseTypes">
-        	<stderr>
-        		<line text="ComplexAnnotation identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="A.m() running"/>
-        		<line text="A.m() running"/>
-        	</stderr>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/declare" title="declare @type - two annotations hit one type - source weaving">
-        <compile files="BaseTypes.java,DecaTypeBin3.aj" options="-1.5"/>
-        <run class="BaseTypes">
-        	<stderr>
-        		<line text="Color identified on execution(void A.m())"/>
-        		<line text="Fruit identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="A.m() running"/>
-        		<line text="A.m() running"/>
-        	</stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/declare" title="declare @type - two annotations hit one type - binary weaving">
-        <weave classesFiles="BaseTypes.java" aspectsFiles="DecaTypeBin3.aj" options="-1.5"  xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="BaseTypes">
-        	<stderr>
-        		<line text="Color identified on execution(void A.m())"/>
-        		<line text="Fruit identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="A.m() running"/>
-        		<line text="A.m() running"/>
-        	</stderr>
-        </run> 	 	
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/declare" title="declare @type - declare parents interactions (order 1) - binary weaving">
-        <weave classesFiles="BaseTypes.java" aspectsFiles="DecaDecpInteractions1.aj" options="-1.5" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="BaseTypes">
-        	<stderr>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="Color annotation identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        	</stderr>
-        </run>
-    </ajc-test>
-    <ajc-test dir="java5/annotations/declare" title="declare @type - declare parents interactions (order 1) - source weaving">
-        <compile files="BaseTypes.java,DecaDecpInteractions1.aj" options="-1.5" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="BaseTypes">
-        	<stderr>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="Color annotation identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        	</stderr>
-        </run>
-    </ajc-test>
-    
-    
-    <ajc-test dir="java5/annotations/declare" title="declare @type - declare parents interactions (order 2) - binary weaving">
-        <weave classesFiles="BaseTypes.java" aspectsFiles="DecaDecpInteractions2.aj" options="-1.5" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="BaseTypes">
-        	<stderr>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="Color annotation identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        	</stderr>
-        </run>
-    </ajc-test>
-    <ajc-test dir="java5/annotations/declare" title="declare @type - declare parents interactions (order 2) - source weaving">
-        <compile files="BaseTypes.java,DecaDecpInteractions2.aj" options="-1.5" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="BaseTypes">
-        	<stderr>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="Color annotation identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        	</stderr>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/declare" title="declare @type - declare parents interactions (order 3) - binary weaving">
-        <weave classesFiles="BaseTypes.java" aspectsFiles="DecaDecpInteractions3.aj" options="-1.5,-Xlint:ignore"/>
-        <run class="BaseTypes">
-        	<stderr>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="Color annotation identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="Color annotation identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="Color annotation identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        	</stderr>
-        </run>
-    </ajc-test>
-    <ajc-test dir="java5/annotations/declare" title="declare @type - declare parents interactions (order 3) - source weaving">
-        <compile files="BaseTypes.java,DecaDecpInteractions3.aj" options="-1.5,-Xlint:ignore"/>
-        <run class="BaseTypes">
-        	<stderr>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="Color annotation identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="Color annotation identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="Color annotation identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        	</stderr>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/declare" title="declare @type - declare parents interactions (order 4) - binary weaving">
-        <weave classesFiles="BaseTypes.java" aspectsFiles="DecaDecpInteractions4.aj" options="-1.5,-Xlint:ignore"/>
-        <run class="BaseTypes">
-        	<stderr>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="Color annotation identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="Color annotation identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="Color annotation identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        	</stderr>
-        </run>
-    </ajc-test>
-    <ajc-test dir="java5/annotations/declare" title="declare @type - declare parents interactions (order 4) - source weaving">
-        <compile files="BaseTypes.java,DecaDecpInteractions4.aj" options="-1.5,-Xlint:ignore"/>
-        <run class="BaseTypes">
-        	<stderr>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="Color annotation identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="Color annotation identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="Color annotation identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        	</stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/declare" title="declare @type - annotating an already annotated type - binary weaving">
-        <weave classesFiles="AnnotatedType.java" aspectsFiles="DecaTypeBin4.aj" options="-1.5,-Xlint:ignore"/>
-        <run class="AnnotatedType">
-        	<stderr>
-        		<line text="Color identified on execution(void AnnotatedType.m())"/>
-        		<line text="Fruit identified on execution(void AnnotatedType.m())"/>
-        		<line text="m() running"/>
-        	</stderr>
-        </run>
-    </ajc-test>
-    <ajc-test dir="java5/annotations/declare" title="declare @type - annotating an already annotated type - source weaving">
-    	<compile files="AnnotatedType.java,DecaTypeBin4.aj" options="-1.5,-Xlint:ignore"/>
-        <run class="AnnotatedType">
-        	<stderr>
-        		<line text="Color identified on execution(void AnnotatedType.m())"/>
-        		<line text="Fruit identified on execution(void AnnotatedType.m())"/>
-        		<line text="m() running"/>
-        	</stderr>
-        </run>
-    </ajc-test>
-    
-    
-    <!--ajc-test dir="java5/annotations/declare" title="declare @type - annotations with different targets - binary weaving">
-        <weave classesFiles="BaseTypes.java" aspectsFiles="DecaTypeBin5.aj" options="-1.5"  xlintfile="ignoreTypeNotExposed.properties">
-            <message kind="error" line="15" text="The annotation @ColorM is disallowed for this location"/>
-            <message kind="error" line="16" text="The annotation @ColorC is disallowed for this location"/>
-            <message kind="error" line="18" text="The annotation @ColorF is disallowed for this location"/>
-            <message kind="error" line="19" text="The annotation @ColorP is disallowed for this location"/>
-            <message kind="error" line="20" text="The annotation @ColorL is disallowed for this location"/>
-            <message kind="error" line="21" text="The annotation @ColorPkg is disallowed for this location"/>
-        </weave>
-        <run class="BaseTypes">
-        	<stderr>
-        		<line text="ColorT identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="A.m() running"/>
-        		<line text="A.m() running"/>
-        	</stderr>
-        </run>
-    </ajc-test-->
-    
-    <ajc-test dir="java5/annotations/declare" title="declare @type - annotations with different targets - source weaving">
-        <compile files="BaseTypes.java,DecaTypeBin5.aj" options="-1.5"  xlintfile="ignoreTypeNotExposed.properties">
-            <message kind="error" line="15" text="The annotation @ColorM is disallowed for this location"/>
-            <message kind="error" line="16" text="The annotation @ColorC is disallowed for this location"/>
-            <message king="error" line="17" text="A is not a valid target for annotation ColorA"/>
-            <message kind="error" line="18" text="The annotation @ColorF is disallowed for this location"/>
-            <message kind="error" line="19" text="The annotation @ColorP is disallowed for this location"/>
-            <message kind="error" line="20" text="The annotation @ColorL is disallowed for this location"/>
-            <message kind="error" line="21" text="The annotation @ColorPkg is disallowed for this location"/>
-        </compile>
-    </ajc-test>
-    
-    <!--ajc-test dir="java5/annotations/declare" title="declare @type - annotations with different targets (using type patterns) - binary weaving">
-        <weave classesFiles="BaseTypes.java" aspectsFiles="DecaTypeBin6.aj" options="-1.5" xlintfile="ignoreTypeNotExposed.properties">
-          <message kind="warning" line="15" text="A is not a valid target for annotation ColorM"/>
-          <message kind="warning" line="16" text="A is not a valid target for annotation ColorC"/>        
-          <message kind="warning" line="17" text="A is not a valid target for annotation ColorL"/>
-          <message kind="warning" line="17" text="B is not a valid target for annotation ColorL"/>
-          <message kind="warning" line="17" text="C is not a valid target for annotation ColorL"/>
-        </weave>
-        <run class="BaseTypes">
-        	<stderr>
-        		<line text="ColorT identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="ColorT identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="ColorT identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        	</stderr>
-        </run>
-    </ajc-test-->
-    
-    <ajc-test dir="java5/annotations/declare" title="declare @type - annotations with different targets (using type patterns) - source weaving">
-        <compile files="BaseTypes.java,DecaTypeBin6.aj" options="-1.5" xlintfile="ignoreTypeNotExposed.properties">
-          <message kind="error" line="15" text="The annotation @ColorM is disallowed for this location"/>
-          <message kind="error" line="16" text="The annotation @ColorC is disallowed for this location"/>        
-          <message kind="error" line="17" text="The annotation @ColorL is disallowed for this location"/>
-          <message kind="error" line="18" text="The annotation @ColorF is disallowed for this location"/>
-        </compile>
-    </ajc-test>
-    
-    
-    <ajc-test dir="java5/annotations/declare" title="declare @type - complex decp decAtType interactions - binary weaving">
-        <weave classesFiles="BaseTypes.java" aspectsFiles="DecaTypeBin7.aj" options="-1.5" xlintfile="ignoreTypeNotExposed.properties">
-        </weave>
-        <run class="BaseTypes">
-        	<stderr>
-        		<line text="Color identified on execution(void A.m())"/>
-        		<line text="Fruit identified on execution(void A.m())"/>
-        		<line text="Chocolate identified on execution(void A.m())"/>
-        		<line text="M1 at execution(void A.m())"/>
-        		<line text="M2 at execution(void A.m())"/>
-        		<line text="M3 at execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="Fruit identified on execution(void B.m())"/>
-        		<line text="Chocolate identified on execution(void B.m())"/>
-        		<line text="M1 at execution(void B.m())"/>
-        		<line text="M2 at execution(void B.m())"/>
-        		<line text="M3 at execution(void B.m())"/>
-        		<line text="B.m() running"/>
-        		<line text="Fruit identified on execution(void C.m())"/>
-        		<line text="Chocolate identified on execution(void C.m())"/>
-        		<line text="M1 at execution(void C.m())"/>
-        		<line text="M2 at execution(void C.m())"/>
-        		<line text="M3 at execution(void C.m())"/>
-        		<line text="C.m() running"/>
-        	</stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/declare" title="declare @type - complex decp decAtType interactions - source weaving">
-        <compile files="BaseTypes.java,DecaTypeBin7.aj" options="-1.5" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="BaseTypes">
-        	<stderr>
-        		<line text="Color identified on execution(void A.m())"/>
-        		<line text="Fruit identified on execution(void A.m())"/>
-        		<line text="Chocolate identified on execution(void A.m())"/>
-        		<line text="M1 at execution(void A.m())"/>
-        		<line text="M2 at execution(void A.m())"/>
-        		<line text="M3 at execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="Fruit identified on execution(void B.m())"/>
-        		<line text="Chocolate identified on execution(void B.m())"/>
-        		<line text="M1 at execution(void B.m())"/>
-        		<line text="M2 at execution(void B.m())"/>
-        		<line text="M3 at execution(void B.m())"/>
-        		<line text="B.m() running"/>
-        		<line text="Fruit identified on execution(void C.m())"/>
-        		<line text="Chocolate identified on execution(void C.m())"/>
-        		<line text="M1 at execution(void C.m())"/>
-        		<line text="M2 at execution(void C.m())"/>
-        		<line text="M3 at execution(void C.m())"/>
-        		<line text="C.m() running"/>
-        	</stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/declare" title="declare @type - trying to put annotation targetting annos on normal types - source weaving">
-        <compile files="BaseTypes.java,DecaTypeBin8.aj" options="-1.5" xlintfile="ignoreTypeNotExposed.properties">
-          <message kind="error" line="8" text="A is not a valid target for annotation ColorA"/>        
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/declare" title="declare @type - trying to put annotation targetting annos on normal types - binary weaving">
-        <weave classesFiles="BaseTypes.java" aspectsFiles="DecaTypeBin8.aj" options="-1.5" xlintfile="ignoreTypeNotExposed.properties">
-          <message kind="error" line="8" text="A is not a valid target for annotation ColorA"/>        
-        </weave>
-    </ajc-test>   
-
-    <ajc-test dir="java5/annotations/declare" title="declare @type - trying to put annotation targetting annos on normal types (uses pattern) - source weaving">
-        <compile files="BaseTypes.java,DecaTypeBin9.aj" options="-1.5" xlintfile="ignoreTypeNotExposed.properties">
-          <message kind="warning" line="8" text="A is not a valid target for annotation ColorA"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/declare" title="declare @type - trying to put annotation targetting annos on normal types (uses pattern) - binary weaving">
-        <weave classesFiles="BaseTypes.java" aspectsFiles="DecaTypeBin9.aj" options="-1.5" xlintfile="ignoreTypeNotExposed.properties">
-          <message kind="warning" line="8" text="A is not a valid target for annotation ColorA"/>
-        </weave>
-    </ajc-test>   
-    
-    <ajc-test dir="java5/annotations/declare" title="declare @type - covering enum and class element values - source weaving">
-        <compile files="EnumAndClassValues.aj,FunkyAnnotations.java" options="-1.5" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="FunkyAnnotations">
-        	<stderr>
-               <line text="hello world"/>
-            </stderr>
-        </run>
-    </ajc-test>
-    
-     <ajc-test dir="java5/annotations/declare" title="declare @type - covering enum and class element values - binary weaving">
-        <weave aspectsFiles="EnumAndClassValues.aj" classesFiles="FunkyAnnotations.java" options="-1.5 -Xdev:Pinpoint" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="FunkyAnnotations">
-        	<stderr>
-               <line text="advice running: Red"/>
-               <line text="advice running: class java.lang.Integer"/>
-               <line text="method running"/>
-            </stderr>
-        </run>
-    </ajc-test>
-    
-    
-   <!-- ======================================================================================= -->
-   <!--               declare annotation (@field)                                               -->
-   <!-- ======================================================================================= -->
-
-   <ajc-test dir="java5/annotations/declare/atfield" title="declare @field - simple source weaving">
-        <compile files="Base.java,Colored.java,AtField1.aj" options="-1.5" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="Base">
-          <stderr>
-          <line text="Colored field access at set(int Base.publicIntField)"/>
-          </stderr>
-        </run>
-   </ajc-test>
-    
-   <ajc-test dir="java5/annotations/declare/atfield" title="declare @field - simple binary weaving">
-        <weave classesFiles="Base.java,Colored.java" aspectsFiles="AtField1.aj" options="-1.5" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="Base">
-          <stderr>
-          <line text="Colored field access at set(int Base.publicIntField)"/>
-          </stderr>
-        </run>
-   </ajc-test>   
-   
-   <ajc-test dir="java5/annotations/declare/atfield" title="declare @field - two the same on one - source weaving">
-        <compile files="Base.java,Colored.java,TwoOnOneField.aj" options="-1.5" xlintfile="ignoreTypeNotExposed.properties">
-          <message kind="warning" text="int Base.publicIntField - already has an annotation of type Colored"/>
-        </compile>
-        <run class="Base">
-          <stderr>
-          <line text="Colored field access at set(int Base.publicIntField)"/>
-          </stderr>
-        </run>
-   </ajc-test>
-    
-   <ajc-test dir="java5/annotations/declare/atfield" title="declare @field - two the same on one - binary weaving">
-        <weave classesFiles="Base.java,Colored.java" aspectsFiles="TwoOnOneField.aj" options="-1.5" xlintfile="ignoreTypeNotExposed.properties">
-          <message kind="warning" text="int Base.publicIntField - already has an annotation of type Colored"/>
-        </weave>
-        <run class="Base">
-          <stderr>
-          <line text="Colored field access at set(int Base.publicIntField)"/>
-          </stderr>
-        </run>
-   </ajc-test> 
-   
-   <ajc-test dir="java5/annotations/declare/atfield" title="declare @field - two different on one - source weaving">
-        <compile files="Base.java,Colored.java,Fruit.java,TwoOnOneField2.aj" options="-1.5" xlintfile="ignoreTypeNotExposed.properties">
-        </compile>
-        <run class="Base">
-          <stderr>
-          <line text="Colored field access at set(int Base.publicIntField)"/>
-          <line text="Fruit field access at set(int Base.publicIntField)"/>
-          </stderr>
-        </run>
-   </ajc-test>
-    
-   <ajc-test dir="java5/annotations/declare/atfield" title="declare @field - two different on one - binary weaving">
-        <weave classesFiles="Base.java,Colored.java,Fruit.java" aspectsFiles="TwoOnOneField2.aj" options="-1.5" xlintfile="ignoreTypeNotExposed.properties">
-        </weave>
-        <run class="Base">
-          <stderr>
-          <line text="Colored field access at set(int Base.publicIntField)"/>
-          <line text="Fruit field access at set(int Base.publicIntField)"/>
-          </stderr>
-        </run>
-   </ajc-test> 
-   
-   <ajc-test dir="java5/annotations/declare/atfield" title="declare @field - wrong target - source weaving">
-        <compile files="Base.java,Colored.java,WrongTarget.aj" options="-1.5" xlintfile="ignoreTypeNotExposed.properties">
-           <message kind="error" line="8" text="The annotation @MethodColoring is disallowed for this location"/>
-           <message kind="error" line="9" text="The annotation @TypeColoring is disallowed for this location"/>
-           <!-- xlint warnings that were put in as part of fix for pr115252 -->
-           <message kind="warning" line="13" text="does not match because annotation @MethodColoring has @Target{ElementType.METHOD} [Xlint:unmatchedTargetKind]"/>
-           <message kind="warning" line="16" text="does not match because annotation @TypeColoring has @Target{ElementType.TYPE} [Xlint:unmatchedTargetKind]"/>
-  </compile>
-   </ajc-test>
-    
-   <ajc-test dir="java5/annotations/declare/atfield" title="declare @field - right target - source weaving">
-        <compile files="Base.java,Colored.java,RightTarget.aj" options="-1.5" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="Base">
-          <stderr>
-          <line text="Colored field access at set(int Base.publicIntField)"/>
-          </stderr>
-        </run>
-   </ajc-test>
-    
-   <ajc-test dir="java5/annotations/declare/atfield" title="declare @field - right target - binary weaving">
-        <weave classesFiles="Base.java,Colored.java" aspectsFiles="RightTarget.aj" options="-1.5" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="Base">
-          <stderr>
-          <line text="Colored field access at set(int Base.publicIntField)"/>
-          </stderr>
-        </run>
-   </ajc-test> 
-   
-   <ajc-test dir="java5/annotations/declare/atfield" title="declare @field - recursive application - source weaving">
-        <compile files="Base.java,Colored.java,Fruit.java,RecursiveFields.aj" options="-1.5" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="Base">
-          <stderr>
-          <line text="Fruit field access at set(int Base.publicIntField)"/>
-          </stderr>
-        </run>
-   </ajc-test>
-    
-   <ajc-test dir="java5/annotations/declare/atfield" title="declare @field - recursive application - binary weaving">
-        <weave classesFiles="Base.java,Colored.java,Fruit.java" aspectsFiles="RecursiveFields.aj" options="-1.5" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="Base">
-          <stderr>
-          <line text="Fruit field access at set(int Base.publicIntField)"/>
-          </stderr>
-        </run>
-   </ajc-test>
-   
-   <ajc-test dir="java5/annotations/declare/atfield" title="declare @field - recursive application (other order) - source weaving">
-        <compile files="Base.java,Colored.java,Fruit.java,RecursiveFields2.aj" options="-1.5" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="Base">
-          <stderr>
-          <line text="Fruit field access at set(int Base.publicIntField)"/>
-          </stderr>
-        </run>
-   </ajc-test>
-    
-   <ajc-test dir="java5/annotations/declare/atfield" title="declare @field - recursive application (other order) - binary weaving">
-        <weave classesFiles="Base.java,Colored.java,Fruit.java" aspectsFiles="RecursiveFields2.aj" options="-1.5" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="Base">
-          <stderr>
-          <line text="Fruit field access at set(int Base.publicIntField)"/>
-          </stderr>
-        </run>
-   </ajc-test>   
-   <!-- incorrect target type for annotation on field -->
-   
-   <!-- incorrect target type for annotation on method -->
-   <!-- two annotations on one method -->
-   <!-- two of the same annotation on one method - error -->
-   <!-- two of the same on one using pattern spec  - lint -->
-   
-<!-- need some incorrect signatures in the declare @statements - e.g. declare @constructor: public Base(int): XXX; will blow things up as it uses Base rather than new -->
-   <!-- incorrect target type for annotation on ctor -->
-   <!-- two annotations on one ctor -->
-   <!-- two of the same annotation on one ctor - error -->
-   <!-- two of the same on one using pattern spec  - lint -->
-   
-   <ajc-test dir="java5/annotations/declare/atmethodctor" title="declare @method - simple source weaving">
-        <compile files="Base.java,Colored.java,AtMethod1.aj" options="-1.5" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="Base">
-          <stderr>
-          <line text="Colored method invocation at call(void Base.m1())"/>
-          <line text="m1() running"/>
-          <line text="m2() running"/>
-          <line text="m3() running"/>
-          </stderr>
-        </run>
-   </ajc-test>
-    
-   <ajc-test dir="java5/annotations/declare/atmethodctor" title="declare @method - simple binary weaving">
-        <weave classesFiles="Base.java,Colored.java" aspectsFiles="AtMethod1.aj" options="-1.5" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="Base">
-          <stderr>
-          <line text="Colored method invocation at call(void Base.m1())"/>
-          <line text="m1() running"/>
-          <line text="m2() running"/>
-          <line text="m3() running"/>
-          </stderr>
-        </run>
-   </ajc-test>   
-
-   <ajc-test dir="java5/annotations/declare/atmethodctor" title="declare @constructor - simple source weaving">
-        <compile files="Base.java,Colored.java,AtCtor1.aj" options="-1.5" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="Base">
-          <stderr>
-          <line text="Colored constructor invocation at call(Base(int))"/>
-          <line text="m1() running"/>
-          <line text="m2() running"/>
-          <line text="m3() running"/>
-          </stderr>
-        </run>
-   </ajc-test>
-    
-   <ajc-test dir="java5/annotations/declare/atmethodctor" title="declare @constructor - simple binary weaving">
-        <weave classesFiles="Base.java,Colored.java" aspectsFiles="AtCtor1.aj" options="-1.5" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="Base">
-          <stderr>
-          <line text="Colored constructor invocation at call(Base(int))"/>
-          <line text="m1() running"/>
-          <line text="m2() running"/>
-          <line text="m3() running"/>
-          </stderr>
-        </run>
-   </ajc-test>   
-   
-
-  <!-- These tests verify both @method and @ctor behavior - they are so similar it is OK to have them together... -->
-  
-  <ajc-test dir="java5/annotations/declare/atmethodctor" title="declare @method @ctor - wrong target - source weaving">
-        <compile files="Base.java,Colored.java,WrongTarget.aj" options="-1.5" xlintfile="ignoreTypeNotExposed.properties">
-           <message kind="error" line="8"  text="The annotation @MethodColoring is disallowed for this location"/>
-           <message kind="error" line="9"  text="The annotation @TypeColoring is disallowed for this location"/>
-           <message kind="error" line="10"  text="The annotation @MethodColoring is disallowed for this location"/>
-           <message kind="error" line="11" text="The annotation @TypeColoring is disallowed for this location"/>
-        </compile>
-   </ajc-test>
-    
-   <ajc-test dir="java5/annotations/declare/atmethodctor" title="declare @method @ctor - right target - source weaving">
-        <compile files="Base.java,Colored.java,RightTarget.aj" options="-1.5" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="Base">
-          <stderr>
-          <line text="Colored ctor call at call(Base(int))"/>
-          <line text="Colored method call at call(void Base.m1())"/>
-          <line text="m1() running"/>
-          <line text="m2() running"/>
-          <line text="m3() running"/>
-          </stderr>
-        </run>
-   </ajc-test>
-    
-   <ajc-test dir="java5/annotations/declare/atmethodctor" title="declare @method @ctor - right target - binary weaving">
-        <weave classesFiles="Base.java,Colored.java" aspectsFiles="RightTarget.aj" options="-1.5" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="Base">
-          <stderr>
-          <line text="Colored ctor call at call(Base(int))"/>
-          <line text="Colored method call at call(void Base.m1())"/>
-          <line text="m1() running"/>
-          <line text="m2() running"/>
-          <line text="m3() running"/>
-          </stderr>
-        </run>
-   </ajc-test> 
-   
-<!-- check @method/@ctor/@field recursively applying, can only happen if a pattern for one of them includes an annotation -->
-   
-   
-   <ajc-test dir="java5/annotations/declare/atmethodctor" title="declare @method @ctor - two the same on one - source weaving">
-        <compile files="Base.java,Colored.java,TwoOnOneMember.aj" options="-1.5" xlintfile="ignoreTypeNotExposed.properties">
-          <message kind="warning" text="void Base.m1() - already has an annotation of type Colored"/>
-          <message kind="warning" text="void Base.&lt;init&gt;(int) - already has an annotation of type Colored"/>
-        </compile>
-   </ajc-test>
-    
-   <ajc-test dir="java5/annotations/declare/atmethodctor" title="declare @method @ctor - two the same on one - binary weaving">
-        <weave classesFiles="Base.java,Colored.java" aspectsFiles="TwoOnOneMember.aj" options="-1.5" xlintfile="ignoreTypeNotExposed.properties">
-          <message kind="warning" text="void Base.m1() - already has an annotation of type Colored"/>
-          <message kind="warning" text="void Base.&lt;init&gt;(int) - already has an annotation of type Colored"/>
-        </weave>
-   </ajc-test> 
-   
-   <ajc-test dir="java5/annotations/declare/atmethodctor" title="declare @method @ctor - two different on one - source weaving">
-        <compile files="Base.java,Colored.java,Fruit.java,TwoOnOneMember2.aj" options="-1.5" xlintfile="ignoreTypeNotExposed.properties">
-        </compile>
-        <run class="Base">
-          <stderr>
-          <line text="Colored ctor call at Base.java:11"/>
-          <line text="Fruit ctor call at Base.java:11"/>
-          <line text="Colored method call at Base.java:15"/>
-          <line text="Fruit method call at Base.java:15"/>
-          <line text="m1() running"/>
-          <line text="m2() running"/>
-          <line text="m3() running"/>
-          </stderr>
-        </run>
-   </ajc-test>
-    
-   <ajc-test dir="java5/annotations/declare/atmethodctor" title="declare @method @ctor - two different on one - binary weaving">
-        <weave classesFiles="Base.java,Colored.java,Fruit.java" aspectsFiles="TwoOnOneMember2.aj" options="-1.5" xlintfile="ignoreTypeNotExposed.properties">
-        </weave>
-        <run class="Base">
-          <stderr>
-          <line text="Colored ctor call at Base.java:11"/>
-          <line text="Fruit ctor call at Base.java:11"/>
-          <line text="Colored method call at Base.java:15"/>
-          <line text="Fruit method call at Base.java:15"/>
-          <line text="m1() running"/>
-          <line text="m2() running"/>
-          <line text="m3() running"/>
-          </stderr>
-        </run>
-   </ajc-test> 
-   
-   <ajc-test dir="java5/annotations/declare" title="declare all annotations on one class - source weaving">
-      <compile files="DeathByAnnotations.aj" options="-1.5,-emacssym" xlintfile="ignoreTypeNotExposed.properties"/>
-      <run class="p.q.DeathByAnnotations"/>
-   </ajc-test>
-   
-   <!-- ======================================================================================= -->
-   <!--               annotation binding with ITDs                                              -->
-   <!-- ======================================================================================= -->
-
-   <ajc-test dir="java5/annotations/binding" title="simple binding annotation values where itd method is annotated">
-      <compile files="BindingWithAnnotatedItds1.aj" options="-1.5"/>
-      <run class="BindingWithAnnotatedItds1">
-        <stderr>
-          <line text="Found apple at jp execution(int A.m()) (BindingWithAnnotatedItds1.aj:8)"/>
-        </stderr>
-      </run>
-   </ajc-test>
-   
-   <ajc-test dir="java5/annotations/binding" title="simple binding annotation values where itd field is annotated">
-      <compile files="BindingWithAnnotatedItds2.aj" options="-1.5"/>
-      <run class="BindingWithAnnotatedItds2">
-        <stderr>
-          <line text="Found banana at jp set(int A.i) (BindingWithAnnotatedItds2.aj:16)"/>
-          <line text="Found apple at jp set(String A.j) (BindingWithAnnotatedItds2.aj:17)"/>
-          <line text="Found orange at jp set(int[] A.k) (BindingWithAnnotatedItds2.aj:18)"/>
-        </stderr>
-      </run>
-   </ajc-test>
-
-   <ajc-test dir="java5/annotations/binding" title="simple binding annotation values where itd ctor is annotated">
-      <compile files="BindingWithAnnotatedItds3.aj" options="-1.5"/>
-      <run class="BindingWithAnnotatedItds3">
-        <stderr>
-          <line text="Found pear at jp execution(A(String)) (BindingWithAnnotatedItds3.aj:8)"/>
-          <line text="Found orange at jp execution(A(int)) (BindingWithAnnotatedItds3.aj:10)"/>
-          <line text="Found tomato at jp execution(A(boolean)) (BindingWithAnnotatedItds3.aj:12)"/>
-        </stderr>
-      </run>
-   </ajc-test>
-   
-   <!-- ======================================================================================= -->
-   <!--              declare annotation targetting ITDs                                         --> 
-   <!-- ======================================================================================= -->
-   
-   
-   <ajc-test dir="java5/annotations/binding" title="simple binding annotation values where itd method is annotated via declare">
-      <compile files="BindingWithDeclaredAnnotationItds1.aj" options="-1.5,-emacssym"/>
-      <run class="BindingWithDeclaredAnnotationItds1">
-        <stderr>
-          <line text="Found orange at jp call(int A.m()) (BindingWithDeclaredAnnotationItds1.aj:16)"/>
-          <line text="Found orange at jp execution(int A.m()) (BindingWithDeclaredAnnotationItds1.aj:8)"/>
-          <line text="Found banana at jp call(int A.n()) (BindingWithDeclaredAnnotationItds1.aj:17)"/>
-          <line text="Found banana at jp execution(int A.n()) (BindingWithDeclaredAnnotationItds1.aj:10)"/>
-          <line text="Found tomato at jp call(int A.o()) (BindingWithDeclaredAnnotationItds1.aj:18)"/>
-          <line text="Found tomato at jp execution(int A.o()) (BindingWithDeclaredAnnotationItds1.aj:12)"/>
-        </stderr>
-      </run>
-   </ajc-test>
-   
-   <ajc-test dir="java5/annotations/binding" title="simple binding annotation values where itd field is annotated via declare">
-      <compile files="BindingWithDeclaredAnnotationItds2.aj" options="-1.5,-emacssym"/>
-      <run class="BindingWithDeclaredAnnotationItds2">
-        <stderr>
-          <line text="Found orange at jp set(int A.i) (BindingWithDeclaredAnnotationItds2.aj:16)"/>
-		  <line text="Found banana at jp set(String A.j) (BindingWithDeclaredAnnotationItds2.aj:17)"/>
-		  <line text="Found apple at jp set(boolean[] A.k) (BindingWithDeclaredAnnotationItds2.aj:18)"/>
-        </stderr>
-      </run>
-   </ajc-test>
-   
-    <ajc-test dir="java5/annotations/binding" title="simple binding annotation values where itd field is annotated multiple times via declare">
-      <compile files="BindingWithDeclaredAnnotationItds3.aj" options="-1.5,-emacssym"/>
-      <run class="BindingWithDeclaredAnnotationItds3">
-        <stderr>
-			<line text="Found fruit orange at jp set(int A.i) (BindingWithDeclaredAnnotationItds3.aj:13)"/>
-			<line text="Found drink margarita at jp set(int A.i) (BindingWithDeclaredAnnotationItds3.aj:13)"/>
-        </stderr>
-      </run>
-   </ajc-test>
-   
-   <ajc-test dir="java5/annotations/binding" title="simple binding annotation values where itd ctor is annotated via declare">
-      <compile files="BindingWithDeclaredAnnotationItds4.aj" options="-1.5,-emacssym"/>
-      <run class="BindingWithDeclaredAnnotationItds4">
-        <stderr>
-          <line text="Found pear at jp execution(A(String)) (BindingWithDeclaredAnnotationItds4.aj:8)"/>
-		  <line text="Found orange at jp execution(A(int)) (BindingWithDeclaredAnnotationItds4.aj:10)"/>
-		  <line text="Found tomato at jp execution(A(boolean)) (BindingWithDeclaredAnnotationItds4.aj:12)"/>
-        </stderr>
-      </run>
-   </ajc-test>
-
-   <ajc-test dir="java5/suppressedWarnings" title="SuppressAjWarnings raised during matching">
-       <compile files="SuppressionDuringMatching.aj" options="-1.5">
-       </compile>
-   </ajc-test>
-
-   <!-- ============================================================== -->
-    
-    <ajc-test dir="options/aspectpath" title="dirs on aspectpath">
-        <compile files="MyAspect.aj" options="-d out"/>
-        <compile files="MyClass.java" options="-aspectpath out">
-            <message kind="warning" line="3" text="a method"/>
-        </compile>
-    </ajc-test>
-
-    <!-- ============================================================== -->
-    <!--   Start of generics tests                                      -->
-    <!-- ============================================================== -->
-
-    <ajc-test dir="java5/generics" title="ITD with parameterized type" vm="1.5">
-        <compile files="ITDReturningParameterizedType.aj" options="-1.5"/>
-        <run class="ITDReturningParameterizedType"/>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/binding/bugs" title="AtArgs causes a VerifyError: Unable to pop operand off an empty stack" vm="1.5">
-        <compile files="Test3.java" options="-1.5"/>
-        <run class="Test3"/>
-    </ajc-test>
-    
-    <ajc-test dir="java5/generics/bugs/pr91267" title="NPE using generic methods in aspects 1" vm="1.5">
-        <compile files="TestBug1.aj" options="-1.5"/>
-        <run class="TestBug1"/>
-    </ajc-test>
-    
-     <ajc-test dir="java5/generics/bugs/pr91267" title="NPE using generic methods in aspects 2" vm="1.5">
-        <compile files="TestBug2.aj" options="-1.5"/>
-        <run class="TestBug2"/>
-    </ajc-test>
-    
-    <ajc-test dir="java5/generics/bugs" title="Generics problem with Set" vm="1.5">
-      <compile files="PR91053.aj" options="-1.5"/>
-      <run class="PR91053"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/bugs" title="Compilation error on generic member introduction" vm="1.5">
-      <compile files="PR87282.aj" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/bugs" title="Parameterized types on introduced fields not correctly recognized" vm="1.5">
-      <compile files="PR88606.aj" options="-1.5"/>
-   </ajc-test>
- 
-   <ajc-test dir="bugs150" title="enum called Enum, annotation called Annotation, etc">
-     <compile files="PR90827.aj" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150" title="Internal compiler error">
-     <compile files="PR86832.aj" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150" title="Exploding compile time with if() statements in pointcut">
-     <compile files="PR94086.aj" options="-1.5"/>
-   </ajc-test>
-   
-   <!-- generic abstract aspects... -->
-   
-   <ajc-test dir="java5/generics/genericaspects" title="static pointcut parameterization suite">
-     <compile files="GenericAspectPointcuts.aj" options="-1.5">
-     	<message kind="warning" line="62" text="kinded-returning-ok"/>
-     	<message kind="warning" line="52" text="kinded-declaring-ok"/>
-     	<message kind="warning" line="67" text="kinded-declaring-ok"/>
-     	<message kind="warning" line="50" text="kinded-params-ok"/>
-     	<message kind="warning" line="56" text="kinded-throws-ok"/>
-     	<message kind="warning" line="64" text="and-ok"/>
-     	<message kind="warning" line="60" text="or-ok"/>
-     	<message kind="warning" line="64" text="or-ok"/>
-     	<message kind="warning" line="67" text="or-ok"/>
-     	<message kind="warning" line="1" text="not-ok"/>
-     	<message kind="warning" line="42" text="not-ok"/>
-     	<message kind="warning" line="72" text="not-ok"/>
-     	<message kind="warning" line="59" text="within-ok"/>
-     	<message kind="warning" line="64" text="withincode-ok"/>
-     	<message kind="warning" line="53" text="handler-ok"/>
-     </compile>
-   </ajc-test>
- 
-    <ajc-test dir="java5/generics/genericaspects" title="dynamic pointcut parameterization suite">
-     <compile files="GenericAspectRuntimePointcuts.aj" options="-1.5">
-     </compile>
-     <run class="GenericAspectRuntimePointcuts">
-       <stdout>
-         <line text="target-ok an X execution(void X.foo())"/>
-         <line text="@this-ok @MyAnnotation(value=my-value) execution(void X.foo())" vm="1.5,1.6,1.7,1.8"/>
-         <line text="@this-ok @MyAnnotation(value=&quot;my-value&quot;) execution(void X.foo())" vm="9+"/>
-         <line text="@target-ok @MyAnnotation(value=my-value) execution(void X.foo())" vm="1.5,1.6,1.7,1.8"/>
-         <line text="@target-ok @MyAnnotation(value=&quot;my-value&quot;) execution(void X.foo())" vm="9+"/>
-         <line text="@within-ok @MyAnnotation(value=my-value) execution(void X.foo())" vm="1.5,1.6,1.7,1.8"/>
-         <line text="@within-ok @MyAnnotation(value=&quot;my-value&quot;) execution(void X.foo())" vm="9+"/>
-         <line text="cflow-ok an X a Y set(Y X.y)"/>
-         <line text="@annotation-ok-sub @MyAnnotation(value=bar) execution(void X.bar())" vm="1.5,1.6,1.7,1.8"/>
-         <line text="@annotation-ok-sub @MyAnnotation(value=&quot;bar&quot;) execution(void X.bar())" vm="9+"/>
-         <line text="@annotation-ok @MyAnnotation(value=bar) execution(void X.bar())" vm="1.5,1.6,1.7,1.8"/>
-         <line text="@annotation-ok @MyAnnotation(value=&quot;bar&quot;) execution(void X.bar())" vm="9+"/>
-         <line text="target-ok an X execution(void X.bar())"/>
-         <line text="@this-ok @MyAnnotation(value=my-value) execution(void X.bar())" vm="1.5,1.6,1.7,1.8"/>
-         <line text="@this-ok @MyAnnotation(value=&quot;my-value&quot;) execution(void X.bar())" vm="9+"/>
-         <line text="@target-ok @MyAnnotation(value=my-value) execution(void X.bar())" vm="1.5,1.6,1.7,1.8"/>
-         <line text="@target-ok @MyAnnotation(value=&quot;my-value&quot;) execution(void X.bar())" vm="9+"/>
-         <line text="@within-ok @MyAnnotation(value=my-value) execution(void X.bar())" vm="1.5,1.6,1.7,1.8"/>
-         <line text="@within-ok @MyAnnotation(value=&quot;my-value&quot;) execution(void X.bar())" vm="9+"/>
-         <line text="@args-ok @MyAnnotation(value=my-value) execution(void Y.foo(X))" vm="1.5,1.6,1.7,1.8"/>
-         <line text="@args-ok @MyAnnotation(value=&quot;my-value&quot;) execution(void Y.foo(X))" vm="9+"/>
-         <line text="args-ok an X execution(void Y.foo(X))"/>
-         <line text="this-ok a Y execution(void Y.foo(X))"/>
-         <line text="@this-ok @MyAnnotation(value=on Y) execution(void Y.foo(X))" vm="1.5,1.6,1.7,1.8"/>
-         <line text="@this-ok @MyAnnotation(value=&quot;on Y&quot;) execution(void Y.foo(X))" vm="9+"/>
-         <line text="@target-ok @MyAnnotation(value=on Y) execution(void Y.foo(X))" vm="1.5,1.6,1.7,1.8"/>
-         <line text="@target-ok @MyAnnotation(value=&quot;on Y&quot;) execution(void Y.foo(X))" vm="9+"/>
-         <line text="@within-ok @MyAnnotation(value=on Y) execution(void Y.foo(X))" vm="1.5,1.6,1.7,1.8"/>
-         <line text="@within-ok @MyAnnotation(value=&quot;on Y&quot;) execution(void Y.foo(X))" vm="9+"/>
-         <line text="@annotation-ok-sub @MyAnnotation(value=my-value) execution(X Y.bar())" vm="1.5,1.6,1.7,1.8"/>
-         <line text="@annotation-ok-sub @MyAnnotation(value=&quot;my-value&quot;) execution(X Y.bar())" vm="9+"/>
-         <line text="@annotation-ok @MyAnnotation(value=my-value) execution(X Y.bar())" vm="1.5,1.6,1.7,1.8"/>
-         <line text="@annotation-ok @MyAnnotation(value=&quot;my-value&quot;) execution(X Y.bar())" vm="9+"/>
-         <line text="this-ok a Y execution(X Y.bar())"/>
-         <line text="@this-ok @MyAnnotation(value=on Y) execution(X Y.bar())" vm="1.5,1.6,1.7,1.8"/> 
-         <line text="@this-ok @MyAnnotation(value=&quot;on Y&quot;) execution(X Y.bar())" vm="9+"/> 
-         <line text="@target-ok @MyAnnotation(value=on Y) execution(X Y.bar())" vm="1.5,1.6,1.7,1.8"/>
-         <line text="@target-ok @MyAnnotation(value=&quot;on Y&quot;) execution(X Y.bar())" vm="9+"/>
-         <line text="@within-ok @MyAnnotation(value=on Y) execution(X Y.bar())" vm="1.5,1.6,1.7,1.8"/>
-         <line text="@within-ok @MyAnnotation(value=&quot;on Y&quot;) execution(X Y.bar())" vm="9+"/>
-         <line text="@withincode-ok @MyAnnotation(value=my-value) get(X Y.x)" vm="1.5,1.6,1.7,1.8"/>
-         <line text="@withincode-ok @MyAnnotation(value=&quot;my-value&quot;) get(X Y.x)" vm="9+"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-    <ajc-test dir="java5/generics/genericaspects" title="reference to pointcut in generic class">
-     <compile files="PointcutsInGenericClasses.aj" options="-1.5">
-         <message kind="warning" line="16" text="a match"/>
-     </compile>
-     </ajc-test>
-
-    <ajc-test dir="java5/generics/genericaspects" title="reference to non-parameterized pointcut in generic class">
-     <compile files="PointcutsInGenericClasses2.aj" options="-1.5">
-         <message kind="error" line="10" text="cannot use a raw type reference to refer to a pointcut in a generic type (use a parameterized reference instead)"/>
-     </compile>
-     </ajc-test>
-
-    <ajc-test dir="java5/generics/genericaspects" title="declare parents parameterized">
-     <compile files="DecPGenericTest.aj" options="-1.5">
-         <message kind="warning" line="16" text="success"/>
-     </compile>
-     </ajc-test>     
-     
-    <ajc-test dir="java5/generics/genericaspects" title="declare precedence parameterized">
-     <compile files="DecPrecedenceGenericTest.aj" options="-1.5 -Xdev:Pinpoint">
-     </compile>
-     <run class="DecPrecedenceGenericTest">
-         <stdout>
-             <line text="A1"/>
-             <line text="A2"/>
-         </stdout>
-     </run>
-     </ajc-test>     
-
-    <ajc-test dir="java5/generics/genericaspects" title="declare annotation parameterized">
-     <compile files="DecAnnGenericTest.aj" options="-1.5">
-         <message kind="warning" line="18" text="@type ok"/>
-         <message kind="warning" line="20" text="@field ok"/>
-         <message kind="warning" line="22" text="@constructor ok"/>
-         <message kind="warning" line="24" text="@method ok"/>
-     </compile>
-     </ajc-test>  
-
-    <ajc-test dir="java5/generics/genericaspects" title="multi-level generic abstract aspects">
-     <compile files="MultiLevelGenericTest.aj" options="-1.5">
-         <message kind="warning" line="23" text="base match"/>
-         <message kind="warning" line="23" text="middle match"/>
-         <message kind="warning" line="23" text="top match"/>
-     </compile>
-     </ajc-test> 
-   <!-- generic bugs -->
-   
-   <ajc-test dir="java5/generics/bugs" title="ITD method with generic arg">
-     <compile files="PR97763.aj" options="-1.5"/>
-     <run class="PR97763">
-       <stderr>
-         <line text="Number of entries=2"/>
-       </stderr>
-     </run>
-   </ajc-test>
-
-   <ajc-test dir="bugs150" title="NPE at ClassScope.java:660 when compiling generic class">
-     <compile files="PR95993.java" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/bugs" title="Problems resolving type name inside generic class">
-     <compile files="PR95992.java" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150" pr="100227" title="inner class with generic enclosing class">
-     <compile files="pr100227.aj" options="-1.5"/>
-     <run class="pr100227">
-	     <stderr>
-	    	 <line text="Outer.Inner.inner=2"/>
-	    	 <line text="Outer.Inner.p() executing"/>
-	    	 <line text="Generic_Outer.Inner.inner=4"/>
-	    	 <line text="Generic_Outer.Inner.p() executing"/>
-	     </stderr>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150" pr="100260" title="methods inherited from a generic parent">
-     <compile files="pr100260.aj" options="-1.5"/>
-     <run class="pr100260"/>
-   </ajc-test>
-   
-   <!-- end of generic bugs -->
-
-   <!-- generic aspects -->
-   
-   <ajc-test dir="java5/generics/genericaspects" title="generic aspects - 1">
-     <compile files="GenericAspect1.aj" options="-1.5">
-         <message kind="error" line="2" text="only abstract aspects can have type parameters"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/genericaspects" title="generic aspects - 2">
-     <compile files="GenericAspect2.aj" options="-1.5">
-       <message kind="error" line="9" text="a generic super-aspect must be fully parameterized in an extends clause"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/genericaspects" title="generic aspects - 3">
-     <compile files="GenericAspect3.aj" options="-1.5"/>
-     <run class="GenericAspect3">
-      <stderr>
-		<line text="A"/>
-		<line text="B"/>
-      </stderr>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/genericaspects" title="generic aspects - 4">
-     <compile files="ParentChildRelationship.aj" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/genericaspects" title="generic aspect with declare warning using type vars">
-     <compile files="DeclareWarningInGenericAspect.aj" options="-1.5">
-         <message kind="warning" line="16" text="this method takes a T!"/>
-     </compile>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/genericaspects" title="generic aspect with execution advice using type vars">
-     <compile files="ExecutionAdviceInGenericAspect.aj" options="-1.5">
-     </compile>
-     <run class="ExecutionAdviceInGenericAspect">
-         <stdout>
-             <line text="I matched at execution(void C.foo(String))"/>
-         </stdout>
-     </run>
-   </ajc-test>
-
-  <ajc-test dir="java5/generics/genericaspects" title="generic aspect with anonymous pointcut">
-     <compile files="AnonymousPointcutInGenericAspect.aj" options="-1.5">
-     </compile>
-     <run class="AnonymousPointcutInGenericAspect">
-         <stdout>
-             <line text="I matched at execution(void C.foo(String))"/>
-         </stdout>
-     </run>
-   </ajc-test>
-            
-  <ajc-test dir="java5/generics/genericaspects" title="generic aspect declare parents">
-     <compile files="DeclareParentsWithTypeVars.aj" options="-1.5">
-     </compile>
-     <run class="DeclareParentsWithTypeVars">
-     </run>
-   </ajc-test>
-
-  <ajc-test dir="java5/generics/genericaspects" title="generic aspect declare soft">
-     <compile files="DeclareSoftWithTypeVars.aj" options="-1.5">
-     </compile>
-     <run class="DeclareSoftWithTypeVars">
-         <stderr>
-             <line text="handled exception: io, io, it's off to work we go..."/>
-             <line text="Successfully converted to domain exception"/>
-         </stderr>
-     </run>
-   </ajc-test>
-                  
-   <!-- ajdk example -->
-   <ajc-test dir="java5/generics/genericaspects" title="generic aspects - 5 (ajdk)">
-     <compile files="Blob.java,BlobContainment.aj,ParentChildRelationship.aj" options="-1.5"/>
-     <run class="BlobContainment"/>
-   </ajc-test>
-   
-   <!-- same as above but all types in one file -->
-   <ajc-test dir="java5/generics/genericaspects" title="generic aspects - 6 (ajdk)">
-     <compile files="TheBigOne.java" options="-1.5"/>
-     <run class="TheBigOne"/>
-   </ajc-test>
-   
-   <!-- end of generic aspects -->
-   
-   <!-- generic ITDs -->
-  
-   <ajc-test dir="java5/generics/itds" title="ITDs on generic type">
-     <compile files="Parse5.java" options="-1.5">
-        <message kind="error" line="9"/>
-        <message kind="error" line="11"/>
-        <message kind="error" line="13"/>
-        <message kind="error" line="15"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="itd of non static member">
-       <compile files="A.java" options="-1.5"/>
-       <run class="A">
-         <stderr>
-           <line text="min(2,4)=>2"/>
-           <line text="max(2,4)=>4"/>
-         </stderr>
-       </run>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="itd of static member">
-       <compile files="B.java" options="-1.5"/>
-       <run class="B">
-         <stderr>
-           <line text="min(2,4)=>2"/>
-           <line text="max(2,4)=>4"/>
-         </stderr>
-       </run>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="itd using type parameter">
-       <compile files="C.java" options="-1.5"/>
-       <run class="C">
-         <stderr>
-           <line text="fillthisin..."/>
-         </stderr>
-       </run>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds" title="itd incorrectly using type parameter">
-       <compile files="D.java" options="-1.5"/>
-       <run class="D">
-         <stderr>
-           <line text="fillthisin..."/>
-         </stderr>
-       </run>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="static generic method itd">
-     <compile files="StaticGenericMethodITD.aj" options="-1.5"/>
-     <run class="StaticGenericMethodITD">
-       <stderr>
-         <line text="First=10"/>
-       </stderr>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="generic ctor itd - 1">
-     <compile files="GenericCtorITD1.aj" options="-1.5"/>
-     <run class="GenericCtorITD1"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="generic ctor itd - 2">
-     <compile files="GenericCtorITD2.aj" options="-1.5"/>
-     <run class="GenericCtorITD2"/>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds" title="generic ctor itd - 3">
-     <compile files="GenericCtorITD3.aj" options="-1.5"/>
-     <run class="GenericCtorITD3"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="parameterized method itd - 1">
-     <compile files="ParameterizedMethodITD1.aj" options="-1.5"/>
-     <run class="ParameterizedMethodITD1"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="parameterized method itd - 2">
-     <compile files="ParameterizedMethodITD2.aj" options="-1.5">
-       <message kind="error" line="9" text="The method simple(List&lt;? extends Number&gt;) in the type Base is not applicable for the arguments (List&lt;A&gt;)"/>
-     </compile>
-   </ajc-test>
-
-
-   <ajc-test dir="java5/generics/itds" title="parameterized method itd - 3">
-     <compile files="ParameterizedMethodITD3.aj" options="-1.5">
-       <message kind="error" line="9" text="The method simple(List&lt;? super A&gt;) in the type Base is not applicable for the arguments (List&lt;B&gt;)"/>
-     </compile>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds" title="parameterized method itd - 4">
-     <compile files="ParameterizedMethodITD4.aj" options="-1.5"/>
-     <run class="ParameterizedMethodITD4"/>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds" title="generic method itd - 1">
-     <compile files="GenericMethodITD1.aj" options="-1.5"/>
-     <run class="GenericMethodITD1"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="generic method itd - 2">
-     <compile files="GenericMethodITD2.aj" options="-1.5">
-     <message kind="error" line="9" text="Bound mismatch: The generic method simple(List&lt;? extends E&gt;) of type Base is not applicable for the arguments (List&lt;A&gt;). The inferred type A is not a valid substitute for the bounded parameter &lt;E extends Number&gt;"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="generic method itd - 3">
-     <compile files="GenericMethodITD3.aj" options="-1.5"/>
-     <run class="GenericMethodITD3"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="generic method itd - 4">
-     <compile files="GenericMethodITD4.aj" options="-1.5"/>
-     <run class="GenericMethodITD4"/>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds" title="generic method itd - 5">
-     <compile files="GenericMethodITD5.aj" options="-1.5">
-     <message kind="error" line="10" text="The method simple(List&lt;E&gt;, List&lt;E&gt;) in the type Base is not applicable for the arguments (List&lt;A&gt;, List&lt;B&gt;)"/>
-     </compile>
-   </ajc-test>
- 
-   <ajc-test dir="java5/generics/itds" title="generic method itd - 6">
-     <compile files="GenericMethodITD6.aj" options="-1.5"/>
-     <run class="GenericMethodITD6"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="generic method itd - 7">
-     <compile files="GenericMethodITD7.aj" options="-1.5"/>
-     <run class="GenericMethodITD7"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="generic method itd - 8">
-     <compile files="GenericMethodITD8.aj" options="-1.5">
-     <message kind="error" line="10" text="The method simple(List&lt;E&gt;, List&lt;? extends E&gt;) in the type Base is not applicable for the arguments (List&lt;Number&gt;, List&lt;String&gt;)"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="generic method itd - 9">
-     <compile files="GenericMethodITD9.aj" options="-1.5"/>
-     <run class="GenericMethodITD9"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="generic method itd - 10">
-     <compile files="GenericMethodITD10.aj" options="-1.5">
-       <message kind="error" line="10" text="Bound mismatch: The generic method crazy(List&lt;R&gt;) of type Base is not applicable for the arguments (List&lt;A&gt;). The inferred type A is not a valid substitute for the bounded parameter &lt;R extends Comparable&lt;? super R&gt;&gt;"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="generic method itd - 11">
-     <compile files="GenericMethodITD11.aj" options="-1.5"/>
-     <run class="GenericMethodITD11"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="generic method itd - 12">
-     <compile files="GenericMethodITD12.aj" options="-1.5">
-       <message kind="error" line="10" text="Bound mismatch: The generic method crazy(List&lt;R&gt;) of type Base is not applicable for the arguments (List&lt;A&gt;). The inferred type A is not a valid substitute for the bounded parameter &lt;R extends Foo&lt;? extends R&gt;&gt;"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="generic method itd - 13">
-     <compile files="GenericMethodITD13.aj" options="-1.5"/>
-     <run class="GenericMethodITD13"/>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds" title="generic method itd - 14">
-     <compile files="GenericMethodITD14.aj" options="-1.5">
-       <message kind="error" line="10" text="Bound mismatch: The generic method crazy(List&lt;R&gt;) of type Base is not applicable for the arguments (List&lt;A&gt;). The inferred type A is not a valid substitute for the bounded parameter &lt;R extends Foo&lt;? super R&gt;&gt;"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="generic method itd - 15">
-     <compile files="GenericMethodITD15.aj" options="-1.5"/>
-     <run class="GenericMethodITD15"/>
-   </ajc-test>
-   
-   <!-- visibility -->
-   
-   <ajc-test dir="java5/generics/itds/visibility" title="public itds">
-     <compile files="PublicITDs.aj" options="-1.5"/>
-     <run class="PublicITDs"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/visibility" title="private itds">
-     <compile files="PrivateITDs.aj" options="-1.5"/>
-     <run class="PrivateITDs"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/visibility" title="package itds">
-     <compile files="PackageITDs.aj" options="-1.5"/>
-     <run class="PackageITDs"/>
-   </ajc-test>
-      
-   <ajc-test dir="java5/generics/itds/visibility" title="public itds with errors">
-     <compile files="PublicITDsErrors.aj" options="-1.5">
-       <message kind="error" line="13" text="The method publicMethod2(List&lt;R&gt;, List&lt;R&gt;) in the type Base is not applicable for the arguments (List&lt;Double&gt;, List&lt;Float&gt;)"/>
-       <message kind="error" line="15" text="The constructor Base(List&lt;Double&gt;, Map&lt;Integer,String&gt;) is undefined"/>
-     </compile>
-   </ajc-test>
-   
-   <!-- targetting different types -->
-   
-   <ajc-test dir="java5/generics/itds/differingTargets" title="targetting interface">
-     <compile files="TargettingInterface.aj" options="-1.5"/>
-     <run class="TargettingInterface"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/differingTargets" title="targetting aspect">
-     <compile files="TargettingAspect.aj" options="-1.5"/>
-     <run class="TargettingAspect"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/differingTargets" title="targetting class">
-     <compile files="TargettingClass.aj" options="-1.5"/>
-     <run class="TargettingClass"/>
-   </ajc-test>
-   
-   <!-- sharing type variables between the ITD and the generic type -->
-
-   <ajc-test dir="java5/generics/itds/sharing" title="field itd using type variable from target type - 1">
-     <compile files="FieldA.aj" options="-1.5"/>
-     <run class="FieldA"/>   
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="field itd using type variable from target type - 2">
-     <compile files="FieldB.aj" options="-1.5">
-       <message kind="error" line="16" text="Incorrect number of type parameters supplied.  The generic type Base&lt;N,M&gt; has 2 type parameters, not 1."/>
-     </compile>
-   </ajc-test>
-    
-   <ajc-test dir="java5/generics/itds/sharing" title="field itd using type variable from target type - 3">
-     <compile files="FieldC.aj" options="-1.5"/>
-     <run class="FieldC"/>   
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds/sharing" title="field itd using type variable from target type - 4">
-     <compile files="FieldD.aj" options="-1.5"/>
-     <run class="FieldD"/>   
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds/sharing" title="field itd using type variable from target type - 5">
-     <compile files="FieldE.aj" options="-1.5"/>
-     <run class="FieldE"/>   
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds/sharing" title="field itd using type variable from target type - 6">
-     <compile files="FieldF.aj" options="-1.5"/>
-     <run class="FieldF"/>   
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds/sharing" title="field itd using type variable from target type - 7">
-     <compile files="FieldG.aj" options="-1.5"/>
-     <run class="FieldG"/>   
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds/sharing" title="field itd using type variable from target type - 8">
-     <compile files="FieldH.aj" options="-1.5"/>
-     <run class="FieldH"/>   
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds/sharing" title="field itd using type variable from target type - 9">
-     <compile files="FieldI.aj" options="-1.5">
-     	<message kind="error" line="7" text="Type mismatch: cannot convert from List&lt;String&gt; to List&lt;Integer&gt;"/>
-     </compile>
-   </ajc-test>
-  
-   <ajc-test dir="java5/generics/itds/sharing" title="field itd using type variable from target type -10">
-     <compile files="FieldJ.aj" options="-1.5"/>
-     <run class="FieldJ"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="field itd using type variable from target type -11">
-     <compile files="FieldK.aj" options="-1.5"/>
-     <run class="FieldK"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="field itd using type variable from target type -12">
-     <compile files="FieldL.aj" options="-1.5"/>
-     <run class="FieldL"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="field itd using type variable from target type -13">
-     <compile files="FieldM.aj" options="-1.5"/>
-     <run class="FieldM"/>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds/sharing" title="field itd using type variable from target type -14">
-     <compile files="FieldN.aj" options="-1.5">
-       <message kind="error" line="11" text="Type parameters can not be specified in the ITD target type - the target type I is not generic."/>
-     </compile>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds/sharing" title="field itd using type variable from target type -15">
-     <compile files="FieldO.aj" options="-1.5">
-       <message kind="error" line="11" text="Intertype declarations can only be made on the generic type, not on a parameterized type. The name 'String' cannot be used as a type parameter, since it refers to a real type."/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="field itd using type variable from target type -16">
-     <compile files="FieldP.aj" options="-1.5">
-       <message kind="error" line="10" text="static intertype field declarations cannot refer to type variables from the target generic type"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="field itd using type variable from target type -17">
-     <compile files="FieldQ.aj" options="-1.5"/>
-     <run class="FieldQ"/>
-   </ajc-test>
-   
-   <!-- Now intertype declared methods on generic types that use the target types type vars -->
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - A1">
-     <compile files="MethodA.aj" options="-1.5"/>
-     <run class="MethodA"/>   
-   </ajc-test>
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - A2">
-     <compile files="MethodA2.aj" options="-1.5"/>
-     <run class="MethodA2"/>   
-   </ajc-test>
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - A3">
-     <compile files="MethodA3.aj" options="-1.5"/>
-     <run class="MethodA3"/>   
-   </ajc-test>
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - A4">
-     <compile files="MethodA4.aj" options="-1.5"/>
-     <run class="MethodA4"/>   
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - B1">
-     <compile files="MethodB.aj" options="-1.5">
-       <message kind="error" line="16" text="Incorrect number of type parameters supplied.  The generic type Base&lt;N,M&gt; has 2 type parameters, not 1."/>
-     </compile>
-   </ajc-test>
-    
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - C1">
-     <compile files="MethodC.aj" options="-1.5"/>
-     <run class="MethodC"/>   
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - D1">
-     <compile files="MethodD.aj" options="-1.5"/>
-     <run class="MethodD"/>   
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - E1">
-     <compile files="MethodE.aj" options="-1.5"/>
-     <run class="MethodE"/>   
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - F1">
-     <compile files="MethodF.aj" options="-1.5"/>
-     <run class="MethodF"/>   
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - G1">
-     <compile files="MethodG.aj" options="-1.5"/>
-     <run class="MethodG"/>   
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - H1">
-     <compile files="MethodH.aj" options="-1.5"/>
-     <run class="MethodH"/>   
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - I1">
-     <compile files="MethodI.aj" options="-1.5">
-       <message kind="error" line="6" text="Type mismatch: cannot convert from List&lt;Integer&gt; to List&lt;String&gt;"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - I2">
-     <compile files="MethodI2.aj" options="-1.5">
-       <message kind="error" line="7" text="The method m(List&lt;Integer&gt;) in the type Base&lt;Integer&gt; is not applicable for the arguments (List&lt;String&gt;)"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - J1">
-     <compile files="MethodJ.aj" options="-1.5"/>
-     <run class="MethodJ"/>   
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - K1">
-     <compile files="MethodK.aj" options="-1.5"/>
-     <run class="MethodK"/>   
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - L1">
-     <compile files="MethodL.aj" options="-1.5"/>
-     <run class="MethodL"/>   
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - M1">
-     <compile files="MethodM.aj" options="-1.5"/>
-     <run class="MethodM"/>   
-   </ajc-test>
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - M2">
-     <compile files="MethodM2.aj" options="-1.5"/>
-     <run class="MethodM2"/>   
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - N1">
-     <compile files="MethodN.aj" options="-1.5">
-            <message kind="error" line="11" text="Type parameters can not be specified in the ITD target type - the target type I is not generic."/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - O1">
-     <compile files="MethodO.aj" options="-1.5">
-       <message kind="error" line="11" text="Intertype declarations can only be made on the generic type, not on a parameterized type. The name 'String' cannot be used as a type parameter, since it refers to a real type."/>
-     </compile>   
-   </ajc-test>
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - O2">
-     <compile files="MethodO2.aj" options="-1.5">
-       <message kind="error" line="11" text="Intertype declarations can only be made on the generic type, not on a parameterized type. The name 'String' cannot be used as a type parameter, since it refers to a real type."/>
-     </compile>   
-   </ajc-test>  
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - P1">
-     <compile files="MethodP.aj" options="-1.5"/>
-     <run class="MethodP"/>   
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - Q1">
-     <compile files="MethodQ.aj" options="-1.5"/>
-     <run class="MethodQ"/>   
-   </ajc-test> 
-   
-   <!-- Now intertype declared constructors on generic types that use the target types type vars -->
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="ctor itd using type variable from target type - A1">
-     <compile files="CtorA.aj" options="-1.5"/>
-     <run class="CtorA"/>   
-   </ajc-test> 
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="ctor itd using type variable from target type - B1">
-     <compile files="CtorB.aj" options="-1.5">
-        <message kind="error" line="15" text="Incorrect number of type parameters supplied.  The generic type Base&lt;N,M&gt; has 2 type parameters, not 1."/>
-     </compile>
-   </ajc-test> 
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="ctor itd using type variable from target type - C1">
-     <compile files="CtorC.aj" options="-1.5"/>
-     <run class="CtorC"/>   
-   </ajc-test> 
-     
-   <ajc-test dir="java5/generics/itds/sharing" title="ctor itd using type variable from target type - D1">
-     <compile files="CtorD.aj" options="-1.5"/>
-     <run class="CtorD"/>   
-   </ajc-test> 
-     
-   <ajc-test dir="java5/generics/itds/sharing" title="ctor itd using type variable from target type - E1">
-     <compile files="CtorE.aj" options="-1.5"/>
-     <run class="CtorE"/>   
-   </ajc-test> 
-     
-   <ajc-test dir="java5/generics/itds/sharing" title="ctor itd using type variable from target type - F1">
-     <compile files="CtorF.aj" options="-1.5"/>
-     <run class="CtorF"/>   
-   </ajc-test> 
-     
-   <ajc-test dir="java5/generics/itds/sharing" title="ctor itd using type variable from target type - G1">
-     <compile files="CtorG.aj" options="-1.5"/>
-     <run class="CtorG"/>   
-   </ajc-test> 
-     
-   <ajc-test dir="java5/generics/itds/sharing" title="ctor itd using type variable from target type - H1">
-     <compile files="CtorH.aj" options="-1.5"/>
-     <run class="CtorH"/>   
-   </ajc-test> 
-     
-   <ajc-test dir="java5/generics/itds/sharing" title="ctor itd using type variable from target type - I1">
-     <compile files="CtorI.aj" options="-1.5"/>
-     <run class="CtorI"/>   
-   </ajc-test> 
- 
-   <!-- putting it all together, fields/methods/ctors and decps -->    
-  
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - A">
-     <compile files="GenericAspectA.aj" options="-1.5"/>
-     <run class="GenericAspectA"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - B">
-     <compile files="GenericAspectB.aj" options="-1.5"/>
-     <run class="GenericAspectB"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - C">
-     <compile files="GenericAspectC.aj" options="-1.5"/>
-     <run class="GenericAspectC"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - D">
-     <compile files="GenericAspectD.aj" options="-1.5"/>
-     <run class="GenericAspectD"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - E">
-     <compile files="GenericAspectE.aj" options="-1.5"/>
-     <run class="GenericAspectE"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - F">
-     <compile files="GenericAspectF.aj" options="-1.5"/>
-     <run class="GenericAspectF"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - G">
-     <compile files="GenericAspectG.aj" options="-1.5"/>
-     <run class="GenericAspectG"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - H">
-     <compile files="GenericAspectH.aj" options="-1.5">
-       <message kind="error" line="7" text="Type java.lang.String does not meet the specification for type parameter 1 (N extends java.lang.Number) in generic type GenericAspect$SimpleI"/>
-	   <!-- see pr133307, shame about this -->
-       <!--message kind="error" line="16" text="The method m4(String) is undefined for the type Base"/-->
-     </compile>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - I">
-     <compile files="GenericAspectI.aj" options="-1.5"/>
-     <run class="GenericAspectI"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - J">
-     <compile files="GenericAspectJ.aj" options="-1.5"/>
-     <run class="GenericAspectJ"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - K">
-     <compile files="GenericAspectK.aj" options="-1.5">
-       <message kind="error" line="7" text="B does not meet the specification for type parameter 1 (L extends java.lang.Number) in generic type GenericAspect$SimpleI"/>
-       <message kind="error" line="16" text="The method m4(String) is undefined for the type Base"/>
-     </compile>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - K2">
-     <compile files="GenericAspectK2.aj" options="-1.5">
-       <message kind="error" line="13" text="The type String is not a valid substitute"/>
-     </compile>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - L">
-     <compile files="GenericAspectL.aj" options="-1.5"/>
-     <run class="GenericAspectL"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - M">
-     <compile files="GenericAspectM.aj" options="-1.5">
-	   <message kind="error" line="23" text="The method m0(Integer) in the type GenericAspect.SimpleI&lt;Integer&gt; is not applicable for the arguments (String)"/>
-	   <message kind="error" line="24" text="The method m1(List&lt;Integer&gt;) in the type GenericAspect.SimpleI&lt;Integer&gt; is not applicable for the arguments (List&lt;String&gt;)"/>
-       <message kind="error" line="25" text="Type mismatch: cannot convert from String to Integer"/>
-       <message kind="error" line="26" text="Type mismatch: cannot convert from List&lt;String&gt; to List&lt;Integer&gt;"/>
-     </compile>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - N">
-     <compile files="GenericAspectN.aj" options="-1.5"/>
-     <run class="GenericAspectN"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - O">
-     <compile files="GenericAspectO.aj" options="-1.5">
-       <message kind="error" line="24" text="Cannot make a static reference to the non-static field Bottom.parent"/>
-       <message kind="error" line="26" text="The method add(Bottom) in the type List&lt;Bottom&gt; is not applicable for the arguments (Top)"/>
-       <message kind="error" line="27" text="Cannot make a static reference to the non-static field Top.children"/>
-     </compile>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - P">
-     <compile files="GenericAspectP.aj" options="-1.5"/>
-     <run class="GenericAspectP"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - Q">
-     <compile files="GenericAspectQ.aj" options="-1.5"/>
-     <run class="GenericAspectQ"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - R">
-     <compile files="GenericAspectR.aj" options="-1.5"/>
-     <run class="GenericAspectR"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - S">
-     <compile files="GenericAspectS.aj" options="-1.5"/>
-     <run class="GenericAspectS"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - T">
-     <compile files="GenericAspectT.aj" options="-1.5"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - U">
-     <compile files="GenericAspectU.aj" options="-1.5"/>
-     <run class="GenericAspectU"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - V">
-     <compile files="GenericAspectV.aj" options="-1.5"/>
-     <run class="GenericAspectV"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - W">
-     <compile files="GenericAspectW.aj" options="-1.5"/>
-     <run class="GenericAspectW"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - X">
-     <compile files="GenericAspectX.aj" options="-1.5"/>
-     <run class="GenericAspectX"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - Y">
-     <compile files="GenericAspectY.aj" options="-1.5 -showWeaveInfo">
-        <message kind="weave" text="Join point 'method-execution(void ParentChildRelationship$ParentHasChildren.addChild(C))' in Type 'ParentChildRelationship' (GenericAspectY.aj:53) advised by before advice from 'GenericAspectY' (GenericAspectY.aj:101) [with runtime test]"/>
-		<message kind="weave" text="Extending interface set for type 'Top' (GenericAspectY.aj) to include 'ParentChildRelationship$ParentHasChildren&lt;Bottom&gt;' (GenericAspectY.aj)"/>
-		<message kind="weave" text="Type 'Top' (GenericAspectY.aj) has intertyped field from 'ParentChildRelationship' (GenericAspectY.aj:'java.util.List&lt;Bottom&gt; ParentChildRelationship$ParentHasChildren.children')"/>
-		<message kind="weave" text="Type 'Top' (GenericAspectY.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectY.aj:'java.util.List&lt;Bottom&gt; ParentChildRelationship$ParentHasChildren.getChildren()')"/>
-		<message kind="weave" text="Type 'Top' (GenericAspectY.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectY.aj:'void ParentChildRelationship$ParentHasChildren.addChild(Bottom)')"/>
-		<message kind="weave" text="Type 'Top' (GenericAspectY.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectY.aj:'void ParentChildRelationship$ParentHasChildren.removeChild(Bottom)')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ParentHasChildren' (GenericAspectY.aj) has intertyped field from 'ParentChildRelationship' (GenericAspectY.aj:'java.util.List&lt;C&gt; ParentChildRelationship$ParentHasChildren.children')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ParentHasChildren' (GenericAspectY.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectY.aj:'java.util.List&lt;C&gt; ParentChildRelationship$ParentHasChildren.getChildren()')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ParentHasChildren' (GenericAspectY.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectY.aj:'void ParentChildRelationship$ParentHasChildren.addChild(C)')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ParentHasChildren' (GenericAspectY.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectY.aj:'void ParentChildRelationship$ParentHasChildren.removeChild(C)')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ChildHasParent' (GenericAspectY.aj) has intertyped field from 'ParentChildRelationship' (GenericAspectY.aj:'P ParentChildRelationship$ChildHasParent.parent')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ChildHasParent' (GenericAspectY.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectY.aj:'P ParentChildRelationship$ChildHasParent.getParent()')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ChildHasParent' (GenericAspectY.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectY.aj:'void ParentChildRelationship$ChildHasParent.setParent(P)')"/>
-		<message kind="weave" text="Extending interface set for type 'Bottom' (GenericAspectY.aj) to include 'ParentChildRelationship$ChildHasParent&lt;Top&gt;' (GenericAspectY.aj)"/>
-		<message kind="weave" text="Type 'Bottom' (GenericAspectY.aj) has intertyped field from 'ParentChildRelationship' (GenericAspectY.aj:'Top ParentChildRelationship$ChildHasParent.parent')"/>
-		<message kind="weave" text="Type 'Bottom' (GenericAspectY.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectY.aj:'Top ParentChildRelationship$ChildHasParent.getParent()')"/>
-		<message kind="weave" text="Type 'Bottom' (GenericAspectY.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectY.aj:'void ParentChildRelationship$ChildHasParent.setParent(Top)')"/>
-     </compile>
-     <run class="GenericAspectY"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - Z">
-     <compile files="GenericAspectZ.aj" options="-1.5 -showWeaveInfo">
-        <message kind="weave" text="Join point 'method-execution(void ParentChildRelationship$ParentHasChildren.addChild(C))' in Type 'ParentChildRelationship' (GenericAspectZ.aj:53) advised by before advice from 'GenericAspectZ' (GenericAspectZ.aj:95) [with runtime test]"/>
-	    <message kind="weave" text="Join point 'method-execution(void ParentChildRelationship$ParentHasChildren.removeChild(C))' in Type 'ParentChildRelationship' (GenericAspectZ.aj:65) advised by before advice from 'GenericAspectZ' (GenericAspectZ.aj:96) [with runtime test]"/>
-
-		<message kind="weave" text="Extending interface set for type 'Top' (GenericAspectZ.aj) to include 'ParentChildRelationship$ParentHasChildren&lt;Bottom&gt;' (GenericAspectZ.aj)"/>
-		<message kind="weave" text="Type 'Top' (GenericAspectZ.aj) has intertyped field from 'ParentChildRelationship' (GenericAspectZ.aj:'java.util.List&lt;Bottom&gt; ParentChildRelationship$ParentHasChildren.children')"/>
-		<message kind="weave" text="Type 'Top' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'java.util.List&lt;Bottom&gt; ParentChildRelationship$ParentHasChildren.getChildren()')"/>
-		<message kind="weave" text="Type 'Top' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'void ParentChildRelationship$ParentHasChildren.addChild(Bottom)')"/>
-		<message kind="weave" text="Type 'Top' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'void ParentChildRelationship$ParentHasChildren.removeChild(Bottom)')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ParentHasChildren' (GenericAspectZ.aj) has intertyped field from 'ParentChildRelationship' (GenericAspectZ.aj:'java.util.List&lt;C&gt; ParentChildRelationship$ParentHasChildren.children')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ParentHasChildren' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'java.util.List&lt;C&gt; ParentChildRelationship$ParentHasChildren.getChildren()')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ParentHasChildren' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'void ParentChildRelationship$ParentHasChildren.addChild(C)')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ParentHasChildren' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'void ParentChildRelationship$ParentHasChildren.removeChild(C)')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ChildHasParent' (GenericAspectZ.aj) has intertyped field from 'ParentChildRelationship' (GenericAspectZ.aj:'P ParentChildRelationship$ChildHasParent.parent')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ChildHasParent' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'P ParentChildRelationship$ChildHasParent.getParent()')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ChildHasParent' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'void ParentChildRelationship$ChildHasParent.setParent(P)')"/>
-		<message kind="weave" text="Extending interface set for type 'Bottom' (GenericAspectZ.aj) to include 'ParentChildRelationship$ChildHasParent&lt;Top&gt;' (GenericAspectZ.aj)"/>
-		<message kind="weave" text="Type 'Bottom' (GenericAspectZ.aj) has intertyped field from 'ParentChildRelationship' (GenericAspectZ.aj:'Top ParentChildRelationship$ChildHasParent.parent')"/>
-		<message kind="weave" text="Type 'Bottom' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'Top ParentChildRelationship$ChildHasParent.getParent()')"/>
-		<message kind="weave" text="Type 'Bottom' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'void ParentChildRelationship$ChildHasParent.setParent(Top)')"/>
-
-		<!--message kind="weave" text="Extending interface set for type 'Top' (GenericAspectZ.aj) to include 'ParentChildRelationship$ParentHasChildren&lt;Bottom&gt;' (GenericAspectZ.aj)"/>
-		<message kind="weave" text="Type 'Top' (GenericAspectZ.aj) has intertyped field from 'ParentChildRelationship' (GenericAspectZ.aj:'java.util.List&lt;C&gt; ParentChildRelationship$ParentHasChildren.children')"/>
-		<message kind="weave" text="Type 'Top' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'java.util.List&lt;C&gt; ParentChildRelationship$ParentHasChildren.getChildren()')"/>
-		<message kind="weave" text="Type 'Top' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'void ParentChildRelationship$ParentHasChildren.addChild(C)')"/>
-		<message kind="weave" text="Type 'Top' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'void ParentChildRelationship$ParentHasChildren.removeChild(C)')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ParentHasChildren' (GenericAspectZ.aj) has intertyped field from 'ParentChildRelationship' (GenericAspectZ.aj:'java.util.List&lt;C&gt; ParentChildRelationship$ParentHasChildren.children')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ParentHasChildren' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'java.util.List&lt;C&gt; ParentChildRelationship$ParentHasChildren.getChildren()')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ParentHasChildren' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'void ParentChildRelationship$ParentHasChildren.addChild(C)')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ParentHasChildren' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'void ParentChildRelationship$ParentHasChildren.removeChild(C)')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ChildHasParent' (GenericAspectZ.aj) has intertyped field from 'ParentChildRelationship' (GenericAspectZ.aj:'ParentChildRelationship$ParentHasChildren ParentChildRelationship$ChildHasParent.parent')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ChildHasParent' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'ParentChildRelationship$ParentHasChildren ParentChildRelationship$ChildHasParent.getParent()')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ChildHasParent' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'void ParentChildRelationship$ChildHasParent.setParent(P)')"/>
-		<message kind="weave" text="Extending interface set for type 'Bottom' (GenericAspectZ.aj) to include 'ParentChildRelationship$ChildHasParent&lt;Top&gt;' (GenericAspectZ.aj)"/>
-		<message kind="weave" text="Type 'Bottom' (GenericAspectZ.aj) has intertyped field from 'ParentChildRelationship' (GenericAspectZ.aj:'ParentChildRelationship$ParentHasChildren ParentChildRelationship$ChildHasParent.parent')"/>
-		<message kind="weave" text="Type 'Bottom' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'ParentChildRelationship$ParentHasChildren ParentChildRelationship$ChildHasParent.getParent()')"/>
-		<message kind="weave" text="Type 'Bottom' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'void ParentChildRelationship$ChildHasParent.setParent(P)')"/-->       
-     </compile>
-     <run class="GenericAspectZ"/>
-   </ajc-test>
-      
-   <ajc-test dir="java5/generics/binaryBridging" title="binary bridge methods - two">
-     <compile files="TwoA.java" outjar="twoa.jar" options="-1.5"/>
-     <compile files="TwoB.java" outjar="twob.jar" options="-1.5"/>
-     <compile files="TwoX.java" inpath="twoa.jar;twob.jar" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd sharing type variable with generic type">
-     <compile files="Simple.aj" options="-1.5"/>
-     <run class="Simple"/>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds/sharing" title="field itd sharing type variable with generic type">
-     <compile files="Simple2.aj" options="-1.5"/>
-     <run class="Simple2"/>
-   </ajc-test>
-   
-   
-   <ajc-test dir="java5/generics/itds" title="non static generic method itd - 2">
-     <compile files="NonstaticGenericCtorITD2.aj" options="-1.5"/>
-     <run class="NonstaticGenericCtorITD2"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="reusing type variable letters">
-     <compile files="ReusingLetters.aj" options="-1.5"/>
-     <run class="ReusingLetters"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="multiple generic itds in one file">
-     <compile files="BizarroSignatures.aj" options="-1.5"/>
-     <run class="BizarroSignatures"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="generic intertype field declaration, sharing type variable">
-     <compile files="FieldITDOnGenericType.aj" options="-1.5"/>
-     <run class="FieldITDOnGenericType">
-       <stderr>
-         <line text=">42"/>
-       </stderr>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="Parsing generic ITDs - 1">
-     <compile files="Parse1.java" options="-1.5"/>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds" title="Parsing generic ITDs - 2">
-     <compile files="Parse2.java" options="-1.5"/>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds" title="Parsing generic ITDs - 3">
-     <compile files="Parse3.java" options="-1.5"/>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds" title="Parsing generic ITDs - 4">
-     <compile files="Parse4.java" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="Parsing generic ITDs - 5">
-     <compile files="Parse5.java" options="-1.5">
-       <message kind="error" line="11" text="Incorrect number of type parameters supplied.  The generic type Parse5&lt;T,S&gt; has 2 type parameters, not 3."/>
-       <message kind="error" line="13" text="Incorrect number of type parameters supplied.  The generic type Parse5&lt;T,S&gt; has 2 type parameters, not 1."/>
-       <message kind="error" line="15" text="Intertype declarations can only be made on the generic type, not on a parameterized type. The name 'String' cannot be used as a type parameter, since it refers to a real type."/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="Parsing generic ITDs - 6">
-     <compile files="Parse6.java" options="-1.5"/>
-   </ajc-test>
-   
-   <!-- end of generic ITDs -->
-   
-   <!-- generic decps -->
-   
-   <ajc-test dir="java5/generics/decp" title="generic decp - simple">
-     <compile files="Basic.aj" options="-1.5"/>
-     <run class="Basic"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/decp" title="generic decp - implementing two variants #1">
-     <compile files="Basic2.aj" options="-1.5">
-        <message kind="error" line="11" text="Cannot declare parent I&lt;java.lang.Integer&gt; onto type Basic2 since it already has I&lt;java.lang.String&gt; in its hierarchy"/>
-     </compile>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/decp" title="generic decp - implementing two variants #2">
-     <compile files="Basic2b.aj" options="-1.5">
-        <message kind="error" line="10" text="Cannot declare parent I&lt;java.lang.Integer&gt; onto type Basic2b since it already has I in its hierarchy"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/decp" title="generic decp - implementing two variants #3">
-     <compile files="Basic2c.aj" options="-1.5">
-        <message kind="error" line="10" text="Cannot declare parent I onto type Basic2c since it already has I&lt;java.lang.Double&gt; in its hierarchy"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/decp" title="generic decp - implementing two variants #4">
-     <compile files="Basic2d.aj" options="-1.5"/>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/decp/binary" title="generic decp binary - implementing two variants #1">
-     <weave classesFiles="Base1.java" aspectsFiles="Asp1.aj" options="-1.5,-showWeaveInfo">
-        <message kind="error" line="2" text="Cannot declare parent I&lt;java.lang.Integer&gt; onto type Base1 since it already has I&lt;java.lang.String&gt; in its hierarchy"/>
-     </weave>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/decp/binary" title="generic decp binary - implementing two variants #2">
-     <weave classesFiles="Base2.java" aspectsFiles="Asp2.aj" options="-1.5,-showWeaveInfo">
-        <message kind="error" line="2" text="Cannot declare parent I&lt;java.lang.Integer&gt; onto type Base2 since it already has I in its hierarchy"/>
-     </weave>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/decp/binary" title="generic decp binary - implementing two variants #3">
-     <weave classesFiles="Base3.java" aspectsFiles="Asp3.aj" options="-1.5,-showWeaveInfo">
-        <message kind="error" line="2" text="Cannot declare parent I onto type Base3 since it already has I&lt;java.lang.Double&gt; in its hierarchy"/>
-     </weave>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/decp/binary" title="generic decp binary - implementing two variants #4">
-     <weave classesFiles="Base4.java" aspectsFiles="Asp4.aj" options="-1.5,-showWeaveInfo"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/decp" title="generic decp - incorrect number of type parameters">
-     <compile files="Basic3.aj" options="-1.5">
-       <message kind="error" line="10" text="Type pattern does not match because the wrong number of type parameters are specified: Type I requires 1 parameter(s)"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/decp" title="generic decp - specifying bounds">
-     <compile files="Basic4.aj" options="-1.5"/>
-     <run class="Basic4"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/decp" title="generic decp - specifying bounds but breaking them">
-     <compile files="Basic5.aj" options="-1.5">
-       <message kind="error" line="7" text="Type java.lang.String does not meet the specification for type parameter 1 (T extends java.lang.Number) in generic type I"/>
-     </compile>
-   </ajc-test>
-     
-   <ajc-test dir="java5/generics/decp" title="generic decp - with parameterized on the target">
-     <compile files="Basic6.aj" options="-1.5,-showWeaveInfo">
-       <message kind="weave" text="Extending interface set for type 'Basic6' (Basic6.aj) to include 'K&lt;java.lang.Integer&gt;' (Basic6.aj)"/>
-     </compile>
-     <run class="Basic6"/>
-   </ajc-test>
-
-   <!-- end of generic decps -->
-   
-   <!-- generics/itds and binary weaving -->
-   
-   <ajc-test dir="java5/generics/itds/binaryweaving" vm="1.5" title="binary weaving ITDs - A">
-   	   <compile files="TestA_generictype.java" outjar="code.jar" options="-1.5"/>
-       <compile files="TestA_aspect.aj,TestA_class.java" inpath="code.jar" options="-1.5"/>
-       <run class="TestA_class"/>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds/binaryweaving" vm="1.5" title="binary weaving ITDs - B">
-   	   <compile files="TestB_generictype.java" outjar="code.jar" options="-1.5"/>
-       <compile files="TestB_aspect1.aj,TestB_aspect2.aj,TestB_class.java" inpath="code.jar" options="-1.5"/>
-       <run class="TestB_class"/>
-   </ajc-test>
-    
-   <ajc-test dir="java5/generics/itds/binaryweaving" vm="1.5" title="binary weaving ITDs - 1">
-   	   <compile files="BaseClass.java" outjar="code.jar" options="-1.5"/>
-       <compile files="A1.aj" inpath="code.jar" options="-1.5"/>
-        <run class="BaseClass">
-        <stderr>
-            <line text="Advice count=1"/>
-        </stderr>
-        </run>
-    </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/binaryweaving" vm="1.5" title="binary weaving ITDs - 2">
-   	   <compile files="BaseClass.java,A1.aj" outjar="code.jar" options="-1.5,-showWeaveInfo">
-   	     <message kind="weave" text="Type 'BaseClass' (BaseClass.java) has intertyped field from 'A1' (A1.aj:'java.util.List&lt;java.lang.String&gt; BaseClass.list1')"/>
-   	     <message kind="weave" text="Type 'BaseClass' (BaseClass.java:12) advised by after advice from 'A1' (A1.aj:7)"/>
-   	   </compile>
-       <compile files="A2.aj" inpath="code.jar" options="-1.5,-showWeaveInfo">
-         <message kind="weave" text="Type 'BaseClass' (BaseClass.java) has intertyped field from 'A1' (A1.aj:'java.util.List&lt;java.lang.String&gt; BaseClass.list1')"/>
-   	     <message kind="weave" text="Type 'BaseClass' (BaseClass.java:12) advised by after advice from 'A1' (code.jar!A1.class:7(from A1.aj))"/>
-	     <message kind="weave" text="Type 'BaseClass' (BaseClass.java) has intertyped field from 'A2' (A2.aj:'java.util.List&lt;N&gt; BaseClass.list2')"/>
-         <message kind="weave" text="Type 'BaseClass' (BaseClass.java:13) advised by after advice from 'A2' (A2.aj:8)"/>
-       </compile>
-        <run class="BaseClass">
-        <stderr>
-             <line text="Advice count=2"/>
-        </stderr>
-        </run>
-    </ajc-test>
-
-   <ajc-test dir="java5/generics/itds/binaryweaving" vm="1.5" title="binary weaving ITDs - 3">
-   	   <compile files="BaseClass.java,A1.aj,A2.aj" outjar="code.jar" options="-1.5"/>
-       <compile files="A3.aj" inpath="code.jar" options="-1.5"/>
-        <run class="BaseClass">
-        <stderr>
-             <line text="Advice count=3"/>
-        </stderr>
-        </run>
-    </ajc-test>
-
-   <!-- end of generics/itds and binary weaving -->
-   
-   <!-- generics/itds and bridge methods -->
-   
-   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="bridge methods - 1">
-   	   <compile files="Sub1.java,Super1.java,X1.aj" options="-1.5"/>
-       <run class="X1"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="bridge methods - 1 - binary">
-   	 <compile files="Sub1.java,Super1.java" outjar="code.jar" options="-1.5"/>
-   	 <compile files="X1.aj" inpath="code.jar" options ="-1.5"/>
-     <run class="X1"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="bridge methods - 2">
-   	   <compile files="Sub2.java,Super2.java,X2.aj" options="-1.5"/>
-       <run class="X2"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="bridge methods - 2 - binary">
-   	 <compile files="Sub2.java,Super2.java" outjar="code.jar" options="-1.5"/>
-   	 <compile files="X2.aj,Util.java" inpath="code.jar" options ="-1.5"/>
-     <run class="X2"/>
-   </ajc-test>
-      
-   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="bridge methods - 3">
-   	 <compile files="Sub3.java,Super3.java,X3.aj" options="-1.5"/>
-     <run class="X3"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="bridge methods - 3 - binary">
-   	 <compile files="Sub3.java,Super3.java" outjar="code.jar" options="-1.5"/>
-   	 <compile files="X3.aj" inpath="code.jar" options ="-1.5"/>
-     <run class="X3"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="bridge methods - 4">
-   	 <compile files="Sub4.java,Super4.java,X4.aj" options="-1.5"/>
-     <run class="X4"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="bridge methods - 4 - binary">
-   	 <compile files="Sub4.java,Super4.java" outjar="code.jar" options="-1.5"/>
-   	 <compile files="X4.aj" inpath="code.jar" options ="-1.5"/>
-     <run class="X4"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/binaryBridging" title="binary bridge methods - one">
-     <compile files="OneA.java" outjar="onea.jar" options="-1.5"/>
-     <compile files="OneB.java" outjar="oneb.jar" options="-1.5"/>
-     <compile files="OneX.java" inpath="onea.jar;oneb.jar" options="-1.5"/>
-   </ajc-test>
-      
-   <ajc-test dir="java5/generics/binaryBridging" title="binary bridge methods - two">
-     <compile files="TwoA.java" outjar="twoa.jar" options="-1.5"/>
-     <compile files="TwoB.java" outjar="twob.jar" options="-1.5"/>
-     <compile files="TwoX.java" inpath="twoa.jar;twob.jar" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/binaryBridging" title="binary bridge methods - three">
-     <compile files="ThreeA.java" outjar="threea.jar" options="-1.5"/>
-     <compile files="ThreeB.java" outjar="threeb.jar" options="-1.5"/>
-     <compile files="ThreeX.java" inpath="threea.jar;threeb.jar" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="abstract intertype methods and covariant returns">
-   	   <compile files="pr91381.aj" options="-1.5"/>
-       <run class="pr91381"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/bridgeMethods" title="abstract intertype methods and covariant returns - error">
-   	   <compile files="pr91381_2.aj">
-   	     <message kind="error" line="15" text="The return type is incompatible with A.foo()"/>
-   	   </compile>
-   </ajc-test>
-   
-
-   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="bridging with covariance 1 - normal">
-     <compile files="Bridging1.aj,Util.java" options="-1.5"/>
-     <run class="Bridging1">
-       <stderr>
-         <line text="Number of methods defined for D is 2"/>
-         <line text="C D.method1() [BridgeMethod]"/>
-         <line text="D D.method1()"/>
-       </stderr>
-     </run>
-   </ajc-test>  
-    
-   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="bridging with covariance 1 - itd">
-     <compile files="BridgingITD1.aj,Util.java" options="-1.5"/>
-     <run class="BridgingITD1">
-       <stderr>
-         <line text="Number of methods defined for D is 2"/>
-         <line text="C D.method1() [BridgeMethod]"/>
-         <line text="D D.method1()"/>
-       </stderr>
-     </run>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="basic bridging with type vars - 1 - normal">
-     <compile files="Bridging2.aj,Util.java" options="-1.5"/>
-     <run class="Bridging2"> 
-	     <stderr>
-	       <line text="Number of methods defined for D is 2"/>
-	       <line text="java.lang.Object D.next() [BridgeMethod]"/>
-	       <line text="java.lang.String D.next()"/>
-	     </stderr>
-     </run>
-   </ajc-test>
-   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="basic bridging with type vars - 1 - itd">
-     <compile files="BridgingITD2.aj,Util.java" options="-1.5"/>
-     <run class="BridgingITD2"> 
-	     <stderr>
-	       <line text="Number of methods defined for D is 2"/>
-	       <line text="java.lang.Object D.next() [BridgeMethod]"/>
-	       <line text="java.lang.String D.next()"/>
-	     </stderr>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="basic bridging with type vars - 2 - normal">
-     <compile files="Bridging3.aj,Util.java" options="-1.5"/>
-     <run class="Bridging3"> 
-	     <stderr>
-	       <line text="Number of methods defined for D is 2"/>
-	       <line text="java.lang.Object D.id(java.lang.Object) [BridgeMethod]"/>
-	       <line text="java.lang.String D.id(java.lang.String)"/>
-	     </stderr>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="basic bridging with type vars - 2 - itd">
-     <compile files="BridgingITD3.aj,Util.java" options="-1.5"/>
-     <run class="BridgingITD3"> 
-	     <stderr>
-	       <line text="Number of methods defined for D is 2"/>
-	       <line text="java.lang.Object D.id(java.lang.Object) [BridgeMethod]"/>
-	       <line text="java.lang.String D.id(java.lang.String)"/>
-	     </stderr>
-     </run>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="Abstract intertype method and covariant returns" pr="91381">
-     <compile files="pr91381.aj" options="-1.5,-showWeaveInfo">
-       <message kind="weave" text="Type 'A' (pr91381.aj) has intertyped method from 'pr91381' (pr91381.aj:'java.lang.Object A.foo()')"/>
-     </compile>
-     <run class="pr91381"/>
-   </ajc-test>
-   <!-- end of generics/itds and bridge methods -->
-   
-   
-   <!-- generics and  pointcuts -->
-
-   <ajc-test dir="java5/generics/pointcuts" title="handler pcd and generics / type vars">
-     <compile files="GenericInterface.java,HandlerPointcutTests.aj" options="-1.5">
-         <message kind="error" line="4" text="Syntax error on token"/>
-         <message kind="error" line="8" text="a parameterized type pattern may not be used in a handler pointcut expression"/>
-         <message kind="warning" line="8" text="no match for this type name: T"/>
-         <message kind="error" line="11" text="a parameterized type pattern may not be used in a handler pointcut expression"/>
-     </compile>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/pointcuts" title="pointcuts that dont allow type vars">
-     <compile files="PointcutsThatDontAllowTypeVars.aj" options="-1.5">
-         <message kind="error" line="3" text="Syntax error on token"/>
-         <message kind="error" line="5" text="Syntax error on token"/>
-         <message kind="error" line="7" text="Syntax error on token"/>
-         <message kind="error" line="9" text="Syntax error on token"/>
-         <message kind="error" line="11" text="Syntax error on token"/>
-         <message kind="error" line="13" text="Syntax error on token"/>
-         <message kind="error" line="15" text="Syntax error on token"/>
-         <message kind="error" line="17" text="Syntax error on token"/>
-         <message kind="error" line="19" text="Syntax error on token"/>
-         <message kind="error" line="21" text="Syntax error on token"/>
-         <message kind="error" line="23" text="Syntax error on token"/>
-         <message kind="error" line="25" text="Syntax error on token"/>
-         <message kind="error" line="27" text="Syntax error on token"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/pointcuts" title="annotation pcds with parameterized types">
-     <compile files="ParameterizedTypesInAtPCDs.aj" options="-1.5">
-         <message kind="error" line="3" text="Syntax error on token"/>
-         <message kind="error" line="5" text="Syntax error on token"/>
-         <message kind="error" line="7" text="Syntax error on token"/>
-         <message kind="error" line="9" text="Syntax error on token"/>
-         <message kind="error" line="11" text="Syntax error on token"/>
-         <message kind="error" line="13" text="Syntax error on token"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/pointcuts" title="annotation patterns with parameterized types">
-     <compile files="ParameterizedTypesInAnnotationPatterns.aj" options="-1.5">
-         <message kind="error" line="5" text="is not an annotation type"/>
-     </compile>
-   </ajc-test>
-   
-    <ajc-test dir="java5/generics/pointcuts" title="staticinitialization and parameterized types">
-     <compile files="GenericInterface.java,GenericImplementingClass.java,StaticInitializationWithParameterizedTypes.aj" options="-1.5">
-         <message kind="error" line="4" text="no static initialization join points for parameterized types, use raw type instead"/>
-         <message kind="error" line="6" text="no static initialization join points for parameterized types, use raw type instead"/>
-         <message kind="error" line="9" text="no static initialization join points for parameterized types, use raw type instead"/>
-         <message kind="error" line="11" text="no static initialization join points for parameterized types, use raw type instead"/>
-         <message kind="error" line="14" text="no static initialization join points for parameterized types, use raw type instead"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/pointcuts" title="staticinitialization and parameterized type matching">
-     <compile files="GenericInterface.java,GenericImplementingClass.java,ConcreteImplementingClass.java,ConcreteExtendingClass.java,StaticInitializationWithParameterizedTypesMatching.aj" options="-1.5">
-         <message kind="warning" line="1" text="clinit(GenericInterface&lt;Double&gt;+)"/>
-         <message kind="warning" line="3" text="clinit(GenericInterface&lt;Double&gt;+)"/>
-         <message kind="warning" line="3" text="clinit(GenericImplementingClass&lt;Double&gt;+)"/>
-         <message kind="warning" line="15" text="Type java.lang.String does not meet the specification for type parameter 1 (N extends java.lang.Number) in generic type GenericInterface"/>
-         <message kind="warning" line="19" text="Type pattern does not match because the wrong number of type parameters are specified: Type GenericInterface requires 1 parameter(s)"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/pointcuts" title="staticinitialization with generic types">
-     <compile files="GenericInterface.java,GenericImplementingClass.java,StaticInitializationWithGenericTypes.aj" options="-1.5">
-         <message kind="warning" line="1" text="one generic param, correct bounds"/>
-         <message kind="warning" line="1" text="doesn't matter what type variable name you use"/>
-         <message kind="warning" line="1" text="works with classes too"/>
-         <message kind="warning" line="4" text="Type T does not meet the specification for type parameter 1 (N extends java.lang.Number) in generic type GenericInterface"/>
-         <message kind="warning" line="20" text="Type pattern does not match because the wrong number of type parameters are specified: Type GenericImplementingClass requires 1 parameter(s)"/>
-         <message kind="warning" line="24" text="Type N extends java.lang.Number &amp; java.lang.Comparable does not meet the specification for type parameter 1 (N extends java.lang.Number) in generic type GenericImplementingClass"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/pointcuts" title="staticinitialization with generic types - advanced">
-     <compile files="StaticInitializationWithGenericTypesAdvanced.aj" options="-1.5">
-         <message kind="warning" line="76" text="simple match"/>
-         <message kind="warning" line="76" text="matches since R and R extends Object are equivalent"/>
-         <message kind="warning" line="63" text="raw type should match"/>
-         <message kind="warning" line="63" text="matches all bounds"/>
-         <message kind="warning" line="63" text="still matches with interfaces specified in a different order"/>
-         <message kind="warning" line="69" text="matches with type variable inter-dependencies"/>
-         <message kind="warning" line="76" text="matches any generic type with one unbound type var"/>
-         <message kind="warning" line="82" text="any generic type with one type var bound to Number or subtype"/>
-         <message kind="warning" line="63" text="matches a generic type with any upper bound and i/f bounds"/>
-         <message kind="warning" line="76" text="matches a generic type with any upper bound and i/f bounds"/>
-         <message kind="warning" line="82" text="matches a generic type with any upper bound and i/f bounds"/>
-         <message kind="warning" line="19" text="Type X does not meet the specification for type parameter 1 (T extends java.lang.Number &amp; java.lang.Comparable &amp; java.io.Serializable) in generic type ClassWithInterfaceBounds"/>
-         <message kind="warning" line="23" text="Type Y extends java.lang.Number does not meet the specification for type parameter 1 (T extends java.lang.Number &amp; java.lang.Comparable &amp; java.io.Serializable) in generic type ClassWithInterfaceBounds"/>
-         <message kind="warning" line="27" text="Type Z extends java.lang.Number &amp; java.lang.Comparable does not meet the specification for type parameter 1 (T extends java.lang.Number &amp; java.lang.Comparable &amp; java.io.Serializable) in generic type ClassWithInterfaceBounds"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/pointcuts" title="within pcd with various parameterizations and generic types - errors">
-     <compile files="WithinPointcutMatching.aj" options="-1.5">
-         <message kind="warning" line="4" text="no match for this type name: T"/>
-         <message kind="error" line="4" text="parameterized type pattern not supported by 'within', use a raw type pattern instead"/>
-         <message kind="error" line="5" text="parameterized type pattern not supported by 'within', use a raw type pattern instead"/>
-         <message kind="error" line="6" text="parameterized type pattern not supported by 'within', use a raw type pattern instead"/>
-      </compile>
-   </ajc-test>
-
-  <ajc-test dir="java5/generics/pointcuts" title="within pcd with various parameterizations and generic types - warnings">
-     <compile files="WithinPointcutMatchingWarnings.aj" options="-1.5">
-         <message kind="warning" line="16" text="matched set correctly"/>
-         <message kind="warning" line="18" text="matched execution correctly"/>
-         <message kind="warning" line="24" text="init matched correctly"/>
-         <message kind="warning" line="32" text="matched parameterization ok"/>
-      </compile>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/pointcuts" title="this and target with various parameterizations and generic types - errors">
-     <compile files="ThisAndTargetPointcutMatching.aj" options="-1.5">
-         <message kind="warning" line="4" text="no match for this type name: T"/>
-         <message kind="warning" line="5" text="no match for this type name: T"/>
-         <message kind="error" line="4" text="parameterized types not supported for this and target pointcuts (erasure limitation)"/>
-         <message kind="error" line="5" text="parameterized types not supported for this and target pointcuts (erasure limitation)"/>
-         <message kind="error" line="6" text="parameterized types not supported for this and target pointcuts (erasure limitation)"/>
-         <message kind="error" line="7" text="parameterized types not supported for this and target pointcuts (erasure limitation)"/>
-      </compile>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/pointcuts" title="this and target with various parameterizations and generic types - runtime">
-     <compile files="ThisAndTargetPointcutMatchingRuntime.aj" options="-1.5">
-      </compile>
-      <run class="ThisAndTargetPointcutMatchingRuntime">
-          <stdout>
-              <line text="set and this matched ok"/>
-              <line text="set and target matched ok"/>
-              <line text="call and target matched ok"/>
-              <line text="execution and this matched ok"/>
-              <line text="execution and target matched ok"/>
-              <line text="parameterized call and target matched ok"/>
-              <line text="parameterized call and this matched ok"/>
-              <line text="parameterized call and target matched ok"/>
-          </stdout>
-      </run>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/pointcuts" title="get and set with various parameterizations and generic types - errors">
-     <compile files="GetAndSetPointcutMatching.aj" options="-1.5">
-         <message kind="warning" line="4" text="no match for this type name: T"/>
-         <message kind="warning" line="5" text="no match for this type name: T"/>
-         <message kind="error" line="4" text="can't use parameterized type patterns for the declaring type of a get or set pointcut expression (use the raw type instead)"/>
-         <message kind="error" line="5" text="can't use parameterized type patterns for the declaring type of a get or set pointcut expression (use the raw type instead)"/>
-         <message kind="error" line="6" text="can't use parameterized type patterns for the declaring type of a get or set pointcut expression (use the raw type instead)"/>
-         <message kind="error" line="7" text="can't use parameterized type patterns for the declaring type of a get or set pointcut expression (use the raw type instead)"/>
-         <message kind="error" line="8" text="can't use parameterized type patterns for the declaring type of a get or set pointcut expression (use the raw type instead)"/>
-      </compile>
-   </ajc-test>
-
-  <ajc-test dir="java5/generics/pointcuts" title="get and set with various parameterizations and generic declaring types">
-     <compile files="GetAndSetPointcutMatchingDeclaringType.aj" options="-1.5">
-         <message kind="warning" line="15" text="generic/param get matching ok"/>
-         <message kind="warning" line="33" text="generic/param get matching ok"/>
-         <message kind="warning" line="12" text="generic/param set matching ok"/>
-         <message kind="warning" line="32" text="generic/param set matching ok"/>
-      </compile>
-   </ajc-test>
-
-  <ajc-test dir="java5/generics/pointcuts" title="get and set with various parameterizations and generic field types">
-     <compile files="GetAndSetPointcutMatchingFieldType.aj" options="-1.5">
-         <message kind="warning" line="13" text="raw field type matching in get ok"/>
-         <message kind="warning" line="14" text="raw field type matching in set ok"/>
-         <message kind="warning" line="49" text="erasure matching in get ok"/>
-         <message kind="warning" line="45" text="erasure matching in set ok"/>
-         <message kind="warning" line="53" text="erasure matching in get with params ok"/>
-         <message kind="warning" line="46" text="erasure matching in set with params ok"/>
-         <message kind="warning" line="72" text="parameterized type matching in set ok"/>
-         <message kind="warning" line="73" text="parameterized type matching in get ok"/>
-         <message kind="warning" line="74" text="parameterized type matching in set ok x2"/>
-         <message kind="warning" line="75" text="parameterized type matching in get ok x2"/>
-         <message kind="warning" line="83" text="wildcard set matching ok"/>
-         <message kind="warning" line="84" text="wildcard get matching ok"/>
-         <message kind="warning" line="85" text="wildcard extends set matching ok"/>
-         <message kind="warning" line="86" text="wildcard extends get matching ok"/>
-         <message kind="warning" line="87" text="wildcard super set matching ok"/>
-         <message kind="warning" line="88" text="wildcard super get matching ok"/>
-         <message kind="warning" line="73" text="the really wild show"/>
-         <message kind="warning" line="84" text="the really wild show"/>
-         <message kind="warning" line="86" text="the really wild show"/>
-         <message kind="warning" line="88" text="the really wild show"/>
-         <message kind="warning" line="53" text="the really wild show"/>
-      </compile>
-   </ajc-test>
-
-  <ajc-test dir="java5/generics/pointcuts" title="init and preinit with parameterized declaring types">
-     <compile files="InitializationPointcutMatching.aj" options="-1.5">
-         <message kind="warning" line="4" text="no match for this type name: T"/>
-         <message kind="warning" line="5" text="no match for this type name: T"/>
-         <message kind="error" line="4" text="no [pre]initialization join points for parameterized types, use raw type instead"/>
-         <message kind="error" line="5" text="no [pre]initialization join points for parameterized types, use raw type instead"/>
-         <message kind="error" line="6" text="no [pre]initialization join points for parameterized types, use raw type instead"/>
-         <message kind="error" line="7" text="no [pre]initialization join points for parameterized types, use raw type instead"/>
-         <message kind="error" line="8" text="no [pre]initialization join points for parameterized types, use raw type instead"/>
-         <message kind="error" line="9" text="invalid throws pattern: a generic class may not be a direct or indirect subclass of Throwable"/>
-      </compile>
-   </ajc-test>
-                     
-    <ajc-test dir="java5/generics/pointcuts" title="init and preinit with raw declaring type pattern">
-     <compile files="InitializationPointcutMatchingDeclaringType.aj" options="-1.5">
-         <message kind="warning" line="10" text="generic/param init matching ok"/>
-         <message kind="warning" line="10" text="generic/param preinit matching ok"/>
-      </compile>
-   </ajc-test>                     
-
-   <ajc-test dir="java5/generics/pointcuts" title="init and preinit with parameterized parameter types">
-     <compile files="InitializationPointcutMatchingParamTypes.aj" options="-1.5">
-         <message kind="warning" line="36" text="raw param type matching in init ok"/>
-         <message kind="warning" line="36" text="raw param type matching in preinit ok"/>
-         <message kind="warning" line="37" text="erasure matching in init ok"/>
-         <message kind="warning" line="37" text="erasure matching in preinit ok"/>
-         <message kind="warning" line="38" text="erasure matching in init with params ok"/>
-         <message kind="warning" line="38" text="erasure matching in preinit with params ok"/>
-         <message kind="warning" line="48" text="parameterized type matching in init ok"/>
-         <message kind="warning" line="48" text="parameterized type matching in preinit ok"/>
-         <message kind="warning" line="49" text="parameterized type matching in init ok x2"/>
-         <message kind="warning" line="49" text="parameterized type matching in preinit ok x2"/>
-         <message kind="warning" line="50" text="wildcard init matching ok"/>
-         <message kind="warning" line="50" text="wildcard preinit matching ok"/>
-         <message kind="warning" line="51" text="wildcard extends init matching ok"/>
-         <message kind="warning" line="51" text="wildcard extends preinit matching ok"/>
-         <message kind="warning" line="52" text="wildcard super init matching ok"/>
-         <message kind="warning" line="52" text="wildcard super preinit matching ok"/>
-         <message kind="warning" line="48" text="the really wild show"/>
-         <message kind="warning" line="50" text="the really wild show"/>
-         <message kind="warning" line="51" text="the really wild show"/>
-         <message kind="warning" line="52" text="the really wild show"/>
-      </compile>
-   </ajc-test>      
-
- <ajc-test dir="java5/generics/pointcuts" title="withincode with various parameterizations and generic types - errors">
-     <compile files="WithincodePointcutMatching.aj" options="-1.5">
-         <message kind="warning" line="4" text="no match for this type name: T"/>
-         <message kind="error" line="4" text="can't use parameterized type patterns for the declaring type of a withincode pointcut expression (use the raw type instead)"/>
-         <message kind="error" line="5" text="can't use parameterized type patterns for the declaring type of a withincode pointcut expression (use the raw type instead)"/>
-         <message kind="error" line="6" text="invalid throws pattern: a generic class may not be a direct or indirect subclass of Throwable"/>
-      </compile>
-   </ajc-test>
-
-    <ajc-test dir="java5/generics/pointcuts" title="withincode with various parameterizations and generic types - matching">
-     <compile files="WithinCodePointcutMatchingParamAndReturnTypes.aj" options="-1.5">
-        <message kind="warning" line="35" text="raw param type matching in withincode ok"/>
-        <message kind="warning" line="36" text="raw param type matching in withincode ok"/>
-        <message kind="warning" line="67" text="raw return type matching in withincode ok"/>
-        <message kind="warning" line="38" text="erasure type matching in withincode ok"/>
-        <message kind="warning" line="39" text="erasure type matching in withincode ok"/>
-        <message kind="warning" line="42" text="erasure type matching in withincode ok"/>
-        <message kind="warning" line="62" text="withincode and parameterized method ok"/>
-        <message kind="warning" line="62" text="withincode and generic interface ok"/>
-        <message kind="warning" line="65" text="withincode and interface control test"/>
-        <message kind="warning" line="35" text="match on parameterized args"/>
-        <message kind="warning" line="36" text="match on parameterized args"/>
-        <message kind="warning" line="67" text="match on parameterized return type"/>
-      </compile>
-   </ajc-test>
-
-    <ajc-test dir="java5/generics/pointcuts" title="withincode with overriding of inherited generic members">
-     <compile files="WithinCodeOverriding.aj" options="-1.5">
-        <message kind="warning" line="37" text="wildcard declaring type match on erasure"/>
-        <message kind="warning" line="50" text="wildcard declaring type match on erasure"/>
-        <message kind="warning" line="63" text="wildcard declaring type match on erasure"/>
-        <message kind="warning" line="37" text="base declaring type match on erasure"/>
-        <message kind="warning" line="50" text="base declaring type match on erasure"/>
-        <message kind="warning" line="63" text="base declaring type match on erasure"/>
-        <message kind="warning" line="50" text="sub type match on erasure"/>
-        <message kind="warning" line="63" text="parameterized match on erasure"/>
-        <message kind="warning" line="80" text="erasure match on base interface"/>
-        <message kind="warning" line="80" text="wildcard match on erasure"/>
-        <message kind="warning" line="80" text="parameterized match"/>
-     </compile>
-    </ajc-test>
-                                                                           
-   <ajc-test dir="java5/generics/pointcuts" title="execution pcd with raw type matching">
-     <compile files="GenericInterface.java,ConcreteImplementingClass.java,GenericImplementingClass.java,RawTypeMatching.aj" options="-1.5">
-         <message kind="warning" line="4" text="execution(* GenericInterface.*(..))"/>
-         <message kind="warning" line="5" text="execution(* GenericInterface.*(..))"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/pointcuts" title="execution pcd with raw signature matching">
-     <compile files="GenericInterface.java,ConcreteImplementingClass.java,GenericImplementingClass.java,RawSignatureMatching.aj" options="-1.5">
-         <message kind="warning" line="4" text="execution(* GenericInterface.asInt(Number))"/>
-         <message kind="warning" line="5" text="execution(* GenericInterface.asInt(Number))"/>
-     </compile>
-   </ajc-test>
-
-  <ajc-test dir="java5/generics/pointcuts" title="execution with various parameterizations and generic types - errors">
-     <compile files="ExecutionPointcutMatchingErrorCases.aj" options="-1.5">
-         <message kind="warning" line="4" text="no match for this type name: T"/>
-         <message kind="error" line="4" text="can't use parameterized type patterns for the declaring type of an execution pointcut expression (use the raw type instead)"/>
-         <message kind="error" line="5" text="can't use parameterized type patterns for the declaring type of an execution pointcut expression (use the raw type instead)"/>
-         <message kind="error" line="6" text="invalid throws pattern: a generic class may not be a direct or indirect subclass of Throwable"/>
-      </compile>
-   </ajc-test>
-
-    <ajc-test dir="java5/generics/pointcuts" title="execution with various parameterizations and generic types - matching">
-     <compile files="ExecutionPointcutMatchingParamAndReturnTypes.aj" options="-1.5">
-        <message kind="warning" line="35" text="raw param type matching in execution ok"/>
-        <message kind="warning" line="67" text="raw return type matching in execution ok"/>
-        <message kind="warning" line="38" text="erasure type matching in execution ok"/>
-        <message kind="warning" line="42" text="erasure type matching in execution ok"/>
-        <message kind="warning" line="61" text="execution and parameterized method ok"/>
-        <message kind="warning" line="61" text="execution and generic interface ok"/>
-        <message kind="warning" line="65" text="execution and interface control test"/>
-        <message kind="warning" line="35" text="match on parameterized args"/>
-        <message kind="warning" line="67" text="match on parameterized return type"/>
-      </compile>
-   </ajc-test>
-
-    <ajc-test dir="java5/generics/pointcuts" title="execution with overriding of inherited generic members">
-     <compile files="ExecutionOverriding.aj" options="-1.5">
-        <message kind="warning" line="36" text="wildcard declaring type match on erasure"/>
-        <message kind="warning" line="49" text="wildcard declaring type match on erasure"/>
-        <message kind="warning" line="62" text="wildcard declaring type match on erasure"/>
-        <message kind="warning" line="36" text="base declaring type match on erasure"/>
-        <message kind="warning" line="49" text="base declaring type match on erasure"/>
-        <message kind="warning" line="62" text="base declaring type match on erasure"/>
-        <message kind="warning" line="49" text="sub type match on erasure"/>
-        <message kind="warning" line="62" text="parameterized match on erasure"/>
-        <message kind="warning" line="79" text="erasure match on base interface"/>
-        <message kind="warning" line="79" text="wildcard match on erasure"/>
-        <message kind="warning" line="79" text="parameterized match"/>
-     </compile>
-    </ajc-test>
-
-   <ajc-test dir="java5/generics/pointcuts" title="execution pcd with generic declaring type and erased parameter types">
-     <compile files="GenericInterface.java,ConcreteImplementingClass.java,GenericImplementingClass.java,GenericDeclaringTypeWithParameterErasure.aj" options="-1.5">
-     </compile>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/pointcuts" title="execution pcd with generic signature matching">
-     <compile files="GenericInterface.java,ConcreteImplementingClass.java,GenericImplementingClass.java,GenericSignatureMatching.aj" options="-1.5">
-         <message kind="warning" line="4" text="execution&lt;T&gt;(* GenericInterface&lt;T extends Number&gt;.asInt(T))"/>
-         <message kind="warning" line="5" text="execution&lt;T&gt;(* GenericInterface&lt;T extends Number&gt;.asInt(T))"/>
-     </compile>
-   </ajc-test>
- 
-  <ajc-test dir="java5/generics/pointcuts" title="call with various parameterizations and generic types - errors">
-     <compile files="CallPointcutMatchingErrorCases.aj" options="-1.5">
-         <message kind="warning" line="4" text="no match for this type name: T"/>
-         <message kind="error" line="4" text="can't use parameterized type patterns for the declaring type of a call pointcut expression (use the raw type instead)"/>
-         <message kind="error" line="5" text="can't use parameterized type patterns for the declaring type of a call pointcut expression (use the raw type instead)"/>
-         <message kind="error" line="6" text="invalid throws pattern: a generic class may not be a direct or indirect subclass of Throwable"/>
-      </compile>
-   </ajc-test>
- 
-    <ajc-test dir="java5/generics/pointcuts" title="call with various parameterizations and generic types - matching">
-     <compile files="CallPointcutMatchingParamAndReturnTypes.aj" options="-1.5">
-        <message kind="warning" line="7" text="raw param type matching in call ok"/>
-        <message kind="warning" line="8" text="raw return type matching in call ok"/>
-        <message kind="warning" line="9" text="erasure type matching in call ok"/>
-        <message kind="warning" line="10" text="erasure type matching in call ok"/>
-        <message kind="warning" line="11" text="call and parameterized method ok"/>
-        <message kind="warning" line="11" text="call and generic interface ok"/>
-        <message kind="warning" line="12" text="call and interface control test"/>
-        <message kind="warning" line="7" text="match on parameterized args"/>
-        <message kind="warning" line="8" text="match on parameterized return type"/>
-      </compile>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/pointcuts" title="call with overriding of inherited generic members">
-     <compile files="CallOverriding.aj" options="-1.5">
-        <message kind="warning" line="8" text="wildcard declaring type match on erasure"/>
-        <message kind="warning" line="9" text="wildcard declaring type match on erasure"/>
-        <message kind="warning" line="10" text="wildcard declaring type match on erasure"/>
-        <message kind="warning" line="8" text="base declaring type match on erasure"/>
-        <message kind="warning" line="9" text="base declaring type match on erasure"/>
-        <message kind="warning" line="10" text="base declaring type match on erasure"/>
-        <message kind="warning" line="9" text="sub type match on erasure"/>
-        <message kind="warning" line="10" text="parameterized match on erasure"/>
-        <message kind="warning" line="87" text="erasure match on base interface"/>
-        <message kind="warning" line="87" text="wildcard match on erasure"/>
-        <message kind="warning" line="87" text="parameterized match"/>
-     </compile>
-    </ajc-test>
-    
-   <ajc-test dir="java5/generics/pointcuts" title="call with bridge methods">
-     <compile files="CallWithBridgeMethods.aj" options="-1.5">
-     <!-- see testcode
-         <message kind="warning" line="23" text="should match call to bridge method on L23, this is a real call!"/>
-         -->
-     </compile>
-   </ajc-test>
-    
-    
-   <ajc-test dir="java5/generics/pointcuts" title="args with raw type and generic / parameterized sigs">
-     <compile files="RawArgs.aj" options="-1.5">
-     </compile>
-     <run class="RawArgs">
-         <stdout>
-             <line text="args(List) match at call(void Generic.foo(List))"/>
-             <line text="args(List) match at call(void Generic.bar(List))"/>
-             <line text="args(List) match at call(void Generic.tada(List))"/>
-             <line text="args(List) match at call(void Generic.tada(List))"/>
-             <line text="args(List) match at call(void Generic.tada(List))"/>
-         </stdout>
-     </run>
-   </ajc-test>
-
-  <ajc-test dir="java5/generics/pointcuts" title="args with parameterized type and generic / parameterized sigs">
-     <compile files="ArgsParameterized.aj" options="-1.5">
-        <message kind="warning" line="28" text="unchecked match of List&lt;String&gt; with List"/>
-     </compile>
-     <run class="ArgsParameterized">
-         <stdout>
-            <line text="args(List&lt;String&gt; matched at call(void Generic.foo(List))"/>
-            <line text="args(List&lt;String&gt; matched at call(void Generic.bar(List))"/>
-            <line text="args(List&lt;String&gt; matched at call(void Generic.tada(List))"/>
-            <line text="args(List&lt;String&gt; matched at call(void Generic.something(List))"/>
-            <line text="args(List&lt;String&gt; matched at call(void MustBeString.listit(List))"/>
-         </stdout>
-     </run>
-   </ajc-test>
-
-  <ajc-test dir="java5/generics/pointcuts" title="args with parameterized type and wildcards">
-     <compile files="ArgsParameterizedWithWildcards.aj" options="-1.5">
-        <message kind="warning" line="10" text="unchecked match of List&lt;Double&gt; with List when argument is an instance of List"/>
-        <message kind="warning" line="10" text="unchecked match of List&lt;Double&gt; with List&lt;? extends Double&gt; when argument is an instance of List"/>
-        <message kind="warning" line="10" text="unchecked match of List&lt;Double&gt; with List&lt;? extends Number&gt; when argument is an instance of List"/>
-        <message kind="warning" line="10" text="unchecked match of List&lt;Double&gt; with List&lt;?&gt; when argument is an instance of List"/>
-     </compile>
-     <run class="ArgsParameterizedWithWildcards">
-         <stdout>
-            <line text="List&lt;Double&gt; matched at execution(void C.rawList(List))"/>
-            <line text="List&lt;Double&gt; matched at execution(void C.listOfSomething(List))"/>
-            <line text="List&lt;Double&gt; matched at execution(void C.listOfSomeNumber(List))"/>
-            <line text="List&lt;Double&gt; matched at execution(void C.listOfDouble(List))"/>
-            <line text="List&lt;Double&gt; matched at execution(void C.listOfSomeDouble(List))"/>
-         </stdout>
-     </run>
-   </ajc-test>
-
-  <ajc-test dir="java5/generics/pointcuts" title="args with generic wildcard">
-     <compile files="ArgsListOfSomething.aj" options="-1.5 -Xlint:ignore">
-     </compile>
-     <run class="ArgsListOfSomething">
-         <stdout>
-            <line text="List&lt;?&gt; matches execution(void ArgsListOfSomething.rawList(List))"/>
-            <line text="List&lt;?&gt; matches execution(void ArgsListOfSomething.listOfString(List))"/>
-            <line text="List&lt;?&gt; matches execution(void ArgsListOfSomething.listOfSomething(List))"/>
-            <line text="List&lt;?&gt; matches execution(void ArgsListOfSomething.listOfSomethingExtends(List))"/>
-            <line text="List&lt;?&gt; matches execution(void ArgsListOfSomething.listOfSomethingSuper(List))"/>
-            <line text="wild map matches execution(void ArgsListOfSomething.mapit(Map))"/>
-            <line text="exact wild map matches execution(void ArgsListOfSomething.mapit(Map))"/>
-            <line text="super type exact matches execution(void ArgsListOfSomething.setOf(HashSet))"/>
-            <line text="super wild type matches execution(void ArgsListOfSomething.setOf(HashSet))"/>
-         </stdout>
-     </run>
-   </ajc-test>
-
-  <ajc-test dir="java5/generics/pointcuts" title="args with generic wildcard extends">
-     <compile files="ArgsListOfSomethingExtends.aj" options="-1.5">
-         <message kind="warning" line="27" text="unchecked match of List&lt;? extends Number&gt; with List"/>
-         <message kind="warning" line="27" text="unchecked match of List&lt;? extends Number&gt; with List&lt;?&gt;"/>
-     </compile>
-     <run class="ArgsListOfSomethingExtends">
-         <stdout>
-            <line text="List&lt;? extends Number&gt; matches execution(void ArgsListOfSomethingExtends.rawList(List))"/>
-            <line text="List&lt;? extends Number&gt; matches execution(void ArgsListOfSomethingExtends.listOfNumber(List))"/>
-            <line text="List&lt;? extends Number&gt; matches execution(void ArgsListOfSomethingExtends.listOfDouble(List))"/>
-            <line text="List&lt;? extends Number&gt; matches execution(void ArgsListOfSomethingExtends.listOfSomething(List))"/>
-            <line text="List&lt;? extends Number&gt; matches execution(void ArgsListOfSomethingExtends.listOfSomethingExtends(List))"/>
-         </stdout>
-     </run>
-   </ajc-test>
-   
-  <ajc-test dir="java5/generics/pointcuts" title="args with generic wildcard super">
-     <compile files="ArgsListOfSomethingSuper.aj" options="-1.5">
-         <message kind="warning" line="32" text="unchecked match of List&lt;? super Number&gt; with List"/>
-         <message kind="warning" line="32" text="unchecked match of List&lt;? super Number&gt; with List&lt;?&gt;"/>
-         <message kind="warning" line="32" text="unchecked match of List&lt;? super Number&gt; with List&lt;? extends Number&gt;"/>
-     </compile>
-     <run class="ArgsListOfSomethingSuper">
-         <stdout>
-            <line text="List&lt;? super Number&gt; matches execution(void ArgsListOfSomethingSuper.rawList(List))"/>
-            <line text="List&lt;? super Number&gt; matches execution(void ArgsListOfSomethingSuper.listOfObject(List))"/>
-            <line text="List&lt;? super Number&gt; matches execution(void ArgsListOfSomethingSuper.listOfNumber(List))"/>
-            <line text="List&lt;? super Number&gt; matches execution(void ArgsListOfSomethingSuper.listOfSomething(List))"/>
-            <line text="List&lt;? super Number&gt; matches execution(void ArgsListOfSomethingSuper.listOfSomethingSuper(List))"/>
-            <line text="List&lt;? super Number&gt; matches execution(void ArgsListOfSomethingSuper.listOfSomethingExtendsNumber(List))"/>
-          </stdout>
-     </run>
-   </ajc-test>
-      
-   <ajc-test dir="java5/generics/pointcuts" title="generic method matching">
-     <compile files="GenericMethods.aj" options="-1.5">
-         <message kind="warning" line="19" text="static generic method match"/>
-         <message kind="warning" line="34" text="static generic method match"/>
-         <message kind="warning" line="24" text="instance generic method match"/>         
-         <message kind="warning" line="39" text="instance generic method match"/>         
-     </compile>
-   </ajc-test>
-    
-   <ajc-test dir="java5/generics/pointcuts" title="generic wildcards in signature matching">
-     <compile files="GenericWildcardsInSignatureMatching.aj" options="-1.5">
-         <message kind="warning" line="5" text="set of a list"/>
-         <message kind="warning" line="7" text="exact nested wildcard match"/>
-         <message kind="warning" line="7" text="wildcard nested wildcard match"/>
-         <message kind="warning" line="11" text="super"/>
-         <message kind="warning" line="15" text="super wild match"/>
-     </compile>
-   </ajc-test>
-    
-   <!-- end of generics and pointcuts tests -->
-
-    <ajc-test dir="java5/generics/afterAdvice" title="after throwing with parameterized throw type">
-        <compile files="AfterThrowing.aj" options="-1.5">
-            <message kind="error" line="6" text="cannot convert from List&lt;String&gt; to Throwable"/>
-        </compile>
-    </ajc-test>
-
-
-   <ajc-test dir="java5/generics/afterAdvice" title="after returning with raw type and generic / parameterized sigs">
-     <compile files="AfterReturningRawType.aj" options="-1.5">
-     </compile>
-     <run class="AfterReturningRawType">
-         <stdout>
-             <line text="returning(List) match at call(List Generic.foo(List))"/>
-             <line text="returning(List) match at call(List Generic.bar(List))"/>
-             <line text="returning(List) match at call(List Generic.tada(List))"/>
-             <line text="returning(List) match at call(List Generic.tada(List))"/>
-             <line text="returning(List) match at call(List Generic.tada(List))"/>
-         </stdout>
-     </run>
-   </ajc-test>
-
- <ajc-test dir="java5/generics/afterAdvice" title="after returning with parameterized type and generic / parameterized sigs">
-     <compile files="AfterReturningParameterized.aj" options="-1.5">
-        <message kind="warning" line="28" text="unchecked match of List&lt;String&gt; with List"/>
-     </compile>
-     <run class="AfterReturningParameterized">
-         <stdout>
-            <line text="returning(List&lt;String&gt; matched at call(List Generic.foo(List))"/>
-            <line text="returning(List&lt;String&gt; matched at call(List Generic.bar(List))"/>
-            <line text="returning(List&lt;String&gt; matched at call(List Generic.tada(List))"/>
-            <line text="returning(List&lt;String&gt; matched at call(List Generic.something(List))"/>
-            <line text="returning(List&lt;String&gt; matched at call(List MustBeString.listit(List))"/>
-         </stdout>
-     </run>
-   </ajc-test>   
-   
-   <ajc-test dir="java5/generics/afterAdvice" title="after returning with parameterized type and wildcards">
-     <compile files="AfterReturningParameterizedWithWildcards.aj" options="-1.5">
-        <message kind="warning" line="10" text="unchecked match of List&lt;Double&gt; with List when argument is an instance of List"/>
-        <message kind="warning" line="10" text="unchecked match of List&lt;Double&gt; with List&lt;? extends Double&gt; when argument is an instance of List"/>
-        <message kind="warning" line="10" text="unchecked match of List&lt;Double&gt; with List&lt;? extends Number&gt; when argument is an instance of List"/>
-        <message kind="warning" line="10" text="unchecked match of List&lt;Double&gt; with List&lt;?&gt; when argument is an instance of List"/>
-     </compile>
-     <run class="AfterReturningParameterizedWithWildcards">
-         <stdout>
-            <line text="List&lt;Double&gt; matched at call(List C.rawList(List))"/>
-            <line text="List&lt;Double&gt; matched at call(List C.listOfSomething(List))"/>
-            <line text="List&lt;Double&gt; matched at call(List C.listOfSomeNumber(List))"/>
-            <line text="List&lt;Double&gt; matched at call(List C.listOfDouble(List))"/>
-            <line text="List&lt;Double&gt; matched at call(List C.listOfSomeDouble(List))"/>
-         </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/afterAdvice" title="after returning with generic wildcard">
-     <compile files="AfterReturningListOfSomething.aj" options="-1.5">
-       <!-- warning is unchecked match of List<?> from line 28 onto line 15. -->
-       <!-- some sets may be lists unless the set is final, so as a cast is allowed, the match is allowed -->
-       <message kind="warning" line="28"/>
-       <message kind="warning" line="44"/>
-       <message kind="warning" line="48"/>
-     </compile>
-     <run class="AfterReturningListOfSomething">
-         <stdout>
-            <line text="List&lt;?&gt; matches execution(List AfterReturningListOfSomething.rawList(List))"/>
-            <line text="List&lt;?&gt; matches execution(List AfterReturningListOfSomething.listOfString(List))"/>
-            <line text="List&lt;?&gt; matches execution(List AfterReturningListOfSomething.listOfSomething(List))"/>
-            <line text="List&lt;?&gt; matches execution(List AfterReturningListOfSomething.listOfSomethingExtends(List))"/>
-            <line text="List&lt;?&gt; matches execution(List AfterReturningListOfSomething.listOfSomethingSuper(List))"/>
-            <line text="wild map matches execution(Map AfterReturningListOfSomething.mapit(Map))"/>
-            <line text="exact wild map matches execution(Map AfterReturningListOfSomething.mapit(Map))"/>
-            <line text="super type exact matches execution(HashSet AfterReturningListOfSomething.setOf(HashSet))"/>
-            <line text="super wild type matches execution(HashSet AfterReturningListOfSomething.setOf(HashSet))"/>
-         </stdout>
-     </run>
-   </ajc-test>   
-
-   <ajc-test dir="java5/generics/afterAdvice" title="after returning with generic wildcard extends">
-     <compile files="AfterReturningListOfSomethingExtends.aj" options="-1.5">
-         <message kind="warning" line="27" text="unchecked match of List&lt;? extends Number&gt; with List"/>
-         <message kind="warning" line="27" text="unchecked match of List&lt;? extends Number&gt; with List&lt;?&gt;"/>
-     </compile>
-     <run class="AfterReturningListOfSomethingExtends">
-         <stdout>
-            <line text="List&lt;? extends Number&gt; matches execution(List AfterReturningListOfSomethingExtends.rawList(List))"/>
-            <line text="List&lt;? extends Number&gt; matches execution(List AfterReturningListOfSomethingExtends.listOfNumber(List))"/>
-            <line text="List&lt;? extends Number&gt; matches execution(List AfterReturningListOfSomethingExtends.listOfDouble(List))"/>
-            <line text="List&lt;? extends Number&gt; matches execution(List AfterReturningListOfSomethingExtends.listOfSomething(List))"/>
-            <line text="List&lt;? extends Number&gt; matches execution(List AfterReturningListOfSomethingExtends.listOfSomethingExtends(List))"/>
-         </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/afterAdvice" title="after returning with generic wildcard super">
-     <compile files="AfterReturningListOfSomethingSuper.aj" options="-1.5">
-         <message kind="warning" line="32" text="unchecked match of List&lt;? super Number&gt; with List"/>
-         <message kind="warning" line="32" text="unchecked match of List&lt;? super Number&gt; with List&lt;?&gt;"/>
-         <message kind="warning" line="32" text="unchecked match of List&lt;? super Number&gt; with List&lt;? extends Number&gt;"/>
-     </compile>
-     <run class="AfterReturningListOfSomethingSuper">
-         <stdout>
-            <line text="List&lt;? super Number&gt; matches execution(List AfterReturningListOfSomethingSuper.rawList(List))"/>
-            <line text="List&lt;? super Number&gt; matches execution(List AfterReturningListOfSomethingSuper.listOfObject(List))"/>
-            <line text="List&lt;? super Number&gt; matches execution(List AfterReturningListOfSomethingSuper.listOfNumber(List))"/>
-            <line text="List&lt;? super Number&gt; matches execution(List AfterReturningListOfSomethingSuper.listOfSomething(List))"/>
-            <line text="List&lt;? super Number&gt; matches execution(List AfterReturningListOfSomethingSuper.listOfSomethingSuper(List))"/>
-            <line text="List&lt;? super Number&gt; matches execution(List AfterReturningListOfSomethingSuper.listOfSomethingExtendsNumber(List))"/>
-          </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test title="ajdk notebook: erasure matching examples" dir="java5/generics/ajdk">
-       <compile files="ErasureMatching.aj" options="-1.5">
-           <message kind="warning" line="18" text="static generic method match"/>
-           <message kind="warning" line="21" text="instance generic method match"/>
-           <message kind="warning" line="31" text="method in generic type match"/>
-           <message kind="warning" line="28" text="field in generic type match"/>
-       </compile>
-   </ajc-test>
-   
-   <ajc-test title="ajdk notebook: simple parameterized type matching examples" dir="java5/generics/ajdk">
-       <compile files="SimpleParameterizedTypeExamples.aj" options="-1.5">
-           <message kind="warning" line="34" text="get myStrings 1"/>           
-           <message kind="warning" line="34" text="get myStrings 2"/>           
-           <message kind="warning" line="38" text="get myStrings 1"/>           
-           <message kind="warning" line="38" text="get myStrings 2"/>           
-           <message kind="warning" line="35" text="get myFloats 1"/>           
-           <message kind="warning" line="35" text="get myFloats 2"/>           
-           <message kind="warning" line="35" text="get myFloats 3"/>           
-           <message kind="warning" line="34" text="getter 1"/>           
-           <message kind="warning" line="35" text="getter 1"/>           
-           <message kind="warning" line="34" text="getter 2"/>           
-           <message kind="warning" line="35" text="getter 2"/>           
-           <message kind="warning" line="34" text="getter 3"/>           
-           <message kind="warning" line="35" text="getter 4"/>           
-           <message kind="warning" line="25" text="call 1"/>           
-           <message kind="warning" line="25" text="call 2"/>           
-        </compile>
-   </ajc-test>
-   
-   <ajc-test title="ajdk notebook: mixed parameterized types and generic methods" dir="java5/generics/ajdk">
-       <compile files="MixedParameterizedAndTypeVariables.aj" options="-1.5">
-           <message kind="warning" line="13" text="erasure match"/>
-           <message kind="warning" line="13" text="mixed match"/>
-           <message kind="warning" line="13" text="params only match"/>
-       </compile>
-   </ajc-test>
-
-   <ajc-test title="ajdk notebook: signature matching with generic wildcards" dir="java5/generics/ajdk">
-       <compile files="SignatureWildcards.aj" options="-1.5">
-           <message kind="warning" line="13" text="any list"/>
-           <message kind="warning" line="15" text="any list"/>
-           <message kind="warning" line="17" text="any list"/>
-           <message kind="warning" line="13" text="only foo"/>
-           <message kind="warning" line="15" text="some list"/>
-           <message kind="warning" line="13" text="any list with upper bound"/>
-           <message kind="warning" line="15" text="any list with upper bound"/>
-       </compile>
-   </ajc-test>
-
-   <ajc-test title="ajdk notebook: bridge method examples" dir="java5/generics/ajdk">
-       <compile files="BridgeMethodExamples.aj" options="-1.5">
-           <message kind="warning" line="17" text="double match"/>
-           <message kind="warning" line="25" text="double match"/>
-           <message kind="warning" line="9" text="match"/>
-           <message kind="warning" line="11" text="match"/>
-       </compile>
-   </ajc-test>
-   
-   <ajc-test title="ajdk notebook: args examples" dir="java5/generics/ajdk">
-       <compile files="ArgsExamples.aj" options="-1.5">
-           <message kind="warning" line="15" text="unchecked match of List&lt;Double&gt; with List&lt;? extends Number&gt; when argument is an instance of List at join point method-execution(void C.goo(List&lt;? extends Number&gt;)) [Xlint:uncheckedArgument]"/>
-           <message kind="warning" line="53" text="unchecked match"/>
-       </compile>
-       <run class="ArgsExamples">
-           <stdout>
-               <line text="args(List)"/>
-               <line text="args List of String"/>
-               <line text="args(List)"/>
-               <line text="args List of Double"/>
-               <line text="args(List)"/>
-               <line text="args List of Double"/>
-           </stdout>
-       </run>
-   </ajc-test>   
-   
-   <ajc-test title="ajdk notebook: after returning examples" dir="java5/generics/ajdk">
-       <compile files="AfterReturningExamples.aj" options="-1.5">
-           <message kind="warning" line="20" text="unchecked match of List&lt;Double&gt; with List&lt;? extends Number&gt;"/>
-       </compile>
-       <run class="AfterReturningExamples">
-           <stdout>
-               <line text="execution(List C.foo(List))"/>
-               <line text="raw s1"/>
-               <line text="raw s2"/>
-               <line text="execution(List C.bar(List))"/>
-               <line text="raw 5.0"/>
-               <line text="raw 10.0"/>
-               <line text="a1 5.0"/>
-               <line text="a1 10.0"/>
-               <line text="a2 5.0"/>
-               <line text="a2 10.0"/>
-               <line text="a3 5.0"/>
-               <line text="a3 10.0"/>
-               <line text="execution(List C.goo(List))"/>
-               <line text="raw 5.0"/>
-               <line text="raw 10.0"/>
-               <line text="a1 5.0"/>
-               <line text="a1 10.0"/>
-               <line text="a3 5.0"/>
-               <line text="a3 10.0"/>          
-            </stdout>
-       </run>
-   </ajc-test>   
- 
-   <ajc-test title="ajdk notebook: args and wildcards examples" dir="java5/generics/ajdk">
-       <compile files="WildcardArgsExamples.aj" options="-1.5">
-           <message kind="warning" line="6" text="unchecked match of List&lt;? extends Number&gt; with List"/>
-       </compile>
-       <run class="WildcardArgsExamples">
-           <stdout>
-               <line text="advice match at call(void C.foo(Object))"/>
-               <line text="advice match at call(void C.foo(Object))"/>
-               <line text="advice match 2 at call(void C.goo1(List))"/>
-               <line text="advice match 2 at call(void C.goo2(List))"/>
-               <line text="advice match 2 at call(void C.goo4(List))"/>
-           </stdout>
-       </run>
-   </ajc-test>  
-
-   <ajc-test title="ajdk notebook: pointcut in generic class example" dir="java5/generics/ajdk">
-       <compile files="PointcutInGenericClassExample.aj" options="-1.5">
-           <message kind="warning" line="23" text="parameterized with C"/>
-           <message kind="warning" line="29" text="parameterized with D"/>
-       </compile>
-   </ajc-test>  
-
-   <!-- ============================================================== -->
-   <!--     End of generics tests                                      -->
-   <!-- ============================================================== -->
-   
-   <ajc-test dir="bugs150/pr98901" title="public method with declare @method">
-     <compile files="Case01.aj" options="-1.5 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B01">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150" title="Compiler error due to a wrong exception check in try blocks">
-     <compile files="pr82989.aj" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr98901" title="public method on the aspect that declares @method on it">
-     <compile files="Case02.aj" options="-1.5 -Xlint:error"/>
-     <run class="B02">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr98901" title="public annotated method">
-     <compile files="Case03.aj" options="-1.5 -Xlint:error"/>
-     <run class="B03">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-<ajc-test dir="bugs150/pr98901" title="public ITD method with declare @method">
-     <compile files="Case04.aj" options="-1.5 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B04">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-
-<ajc-test dir="bugs150/pr98901" title="public annotated ITD method">
-     <compile files="Case05.aj" options="-1.5 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B05">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-<ajc-test dir="bugs150/pr98901" title="public ITD-on-itself method with declare @method">
-     <compile files="Case06.aj" options="-1.5 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B06">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-<ajc-test dir="bugs150/pr98901" title="public annotated ITD-on-itself method">
-     <compile files="Case07.aj" options="-1.5 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B07">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-<ajc-test dir="bugs150/pr98901" title="public method on an Interface with declare @method">
-     <compile files="Case08.aj" options="-1.5 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B08">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-
-<ajc-test dir="bugs150/pr98901" title="public annotated method on an Interface">
-     <compile files="Case09.aj" options="-1.5 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B09">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-<ajc-test dir="bugs150/pr98901" title="public ITD method onto an Interface with declare @method">
-     <compile files="Case10.aj" options="-1.5 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B10">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-<ajc-test dir="bugs150/pr98901" title="public annotated ITD method onto an Interface">
-     <compile files="Case11.aj" options="-1.5 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B11">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-<ajc-test dir="bugs150/pr98901" title="public abstract method with declare @method">
-     <compile files="Case12.aj" options="-1.5 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B12">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-
-<ajc-test dir="bugs150/pr98901" title="public abstract method on the aspect that declares @method on it">
-     <compile files="Case13.aj" options="-1.5 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B13">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-<ajc-test dir="bugs150/pr98901" title="public abstract annotated method">
-     <compile files="Case14.aj" options="-1.5 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B14">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-<ajc-test dir="bugs150/pr98901" title="public abstract ITD method with declare @method">
-     <compile files="Case15.aj" options="-1.5 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B15">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-
-<ajc-test dir="bugs150/pr98901" title="public abstract annotated ITD method">
-     <compile files="Case16.aj" options="-1.5 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B16">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-<ajc-test dir="bugs150/pr98901" title="public abstract ITD-on-itself method with declare @method">
-     <compile files="Case17.aj" options="-1.5 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B17">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-<ajc-test dir="bugs150/pr98901" title="public abstract annotated ITD-on-itself method">
-     <compile files="Case18.aj" options="-1.5 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B18">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-<ajc-test dir="bugs150/pr98901" title="public abstract method on an Interface with declare @method">
-     <compile files="Case19.aj" options="-1.5 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B19">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-
-<ajc-test dir="bugs150/pr98901" title="public abstract annotated method on an Interface">
-     <compile files="Case20.aj" options="-1.5 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B20">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-<ajc-test dir="bugs150/pr98901" title="public abstract ITD method onto an Interface with declare @method">
-     <compile files="Case21.aj" options="-1.5 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B21">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-<ajc-test dir="bugs150/pr98901" title="public abstract annotated ITD method onto an Interface">
-     <compile files="Case22.aj" options="-1.5 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B22">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-<ajc-test dir="bugs150/pr98901" title="public field with declare @field">
-     <compile files="Case23.aj" options="-1.5 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B23">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-  
-
-<ajc-test dir="bugs150/pr98901" title="public field on the aspect that declares @field on it">
-     <compile files="Case24.aj" options="-1.5 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B24">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-<ajc-test dir="bugs150/pr98901" title="public annotated field">
-     <compile files="Case25.aj" options="-1.5 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B25">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-    <ajc-test dir="bugs150/pr98901" title="public ITD field with declare @field">
-     <compile files="Case26.aj" options="-1.5 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B26">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-
-    <ajc-test dir="bugs150/pr98901" title="public annotated ITD field">
-     <compile files="Case27.aj" options="-1.5 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B27">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-    <ajc-test dir="bugs150/pr98901" title="public ITD-on-itself field with declare @field">
-     <compile files="Case28.aj" options="-1.5 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B28">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-    <ajc-test dir="bugs150/pr98901" title="public annotated ITD-on-itself field">
-     <compile files="Case29.aj" options="-1.5 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B29">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150" title="Unable to build shadows">
-     <compile files="pr109728.java" options="-1.5"/>
-   </ajc-test>
-
-   <ajc-test dir="bugs150/pr110788" title="bad generic decp - 1">
-     <compile files="Case1.java" options="-1.5">
-       <message kind="error" line="10" text="Cannot declare parent B&lt;java.lang.Number&gt; onto type C since it already has A&lt;java.lang.String&gt; in its hierarchy"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr110788" title="bad generic decp - 2">
-     <compile files="Case2.java" options="-1.5">
-       <message kind="error" line="8" text="Cannot declare parent A&lt;java.lang.Number&gt; onto type C since it already has A&lt;java.lang.String&gt; in its hierarchy"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr110788" title="bad generic decp - 3">
-     <compile files="Case3.java" options="-1.5"/>
-   </ajc-test>
-
-   <ajc-test dir="bugs150/pr110788" title="bad generic decp - 4">
-     <compile files="Case4.java" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr110927" title="cant create signature attribute">
-     <compile files="Case1.java" options="-1.5"/>
-   </ajc-test>   
-
-   <ajc-test dir="bugs150/pr72834" title="broken dispatch">
-     <compile files="Trouble.java">
-       <message kind="error" line="7" text="package visible abstract inter-type declarations are not allowed"/>
-       <message kind="error" line="9" text="The method getName() is undefined for the type A"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr73856" title="missing accessor">
-     <compile files="MissingAccessor.java"/>
-     <run class="MissingAccessor"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr90143" title="cant call super methods">
-     <compile files="A.aj"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150" title="cunning declare parents">
-     <compile files="pr92311.aj"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150" title="ITD varargs problem">
-     <compile files="pr110906.aj" options="-1.5"/>
-     <run class="pr110906">
-       <stdout>
-           <line text="a"/>
-           <line text="a"/>
-           <line text="a"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150" title="generic itds and abstract method error">
-     <compile files="pr102357.aj"/>
-     <run class="pr102357"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150" title="unexpected error unboundFormalInPC">
-     <compile files="pr112027.aj"/>
-   </ajc-test>
-
-   <ajc-test dir="bugs150" title="ITD varargs in constructor">
-     <compile files="pr111481.aj" options="-1.5"/>
-	 <run class="pr111481">
-       <stdout>
-           <line text="a"/>
-           <line text="a"/>
-       </stdout>
-      </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr112602" title="ClassCastException with generic wildcard">
-     <compile files="GenericInterface.java,Implementation.java" options="-1.5,-emacssym"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr110307" title="Cant provide default implementation via ITD - 1">
-     <compile files="Case1.java" options="-1.5">
-       <message kind="warning" line="27" text="no match for this type name: Branch [Xlint:invalidAbsoluteTypeName]"/>
-       <message kind="error" line="26" text="can't bind type name 'Branch'"/>
-       <message kind="error" line="27" text="can't bind type name 'Revision'"/>
-       <message kind="error" line="33" text="List cannot be resolved to a type"/>
-       <message kind="error" line="38" text="List cannot be resolved to a type"/>
-       <message kind="error" line="39" text="List cannot be resolved to a type"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr110307" title="Cant provide default implementation via ITD - 2">
-     <compile files="Case2.java" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr110307" title="Cant provide default implementation via ITD - 3">
-     <compile files="Case3.java" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr110307" title="Cant provide default implementation via ITD - 4">
-     <compile files="Case4.java" options="-1.5"/>
-   </ajc-test>
-
-   <ajc-test dir="bugs150/pr110307" title="Cant provide default implementation via ITD - 5">
-     <compile files="Case5.java" options="-1.5">
-       <!-- might possibly need more diagnostics in this case to explain what has happened -->
-       <message kind="error" line="10" text="can't override java.util.List&lt;java.lang.String&gt; I.foo() with java.util.List&lt;java.lang.Integer&gt; A.foo() return types don't match"/>
-       <message kind="error" line="15" text="can't override java.util.List&lt;java.lang.String&gt; I.foo() with java.util.List&lt;java.lang.Integer&gt; A.foo() return types don't match"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr110307" title="Cant provide default implementation via ITD - 6">
-     <compile files="Case6.java" options="-1.5">
-       <message kind="error" line="8" text="N cannot be resolved to a type"/>
-       <!--message kind="error" line="7" text="T cannot be resolved to a type"/-->
-     </compile>
-   </ajc-test>
-
-   <ajc-test dir="bugs150/pr110307" title="Cant provide default implementation via ITD - 7">
-     <compile files="Case7.java" options="-1.5"/>
-     <run class="Case7">
-       <stderr> 
-         <line text="in=hello out=hello"/>
-         <line text="in=35 out=35"/>
-         <line text="in=[] out=[]"/>
-       </stderr>
-     </run>
-   </ajc-test>  
-   
-   <!-- generic ITDs -->
-   
-   <ajc-test dir="java5/generics/itds/design" title="generic itds - design A">
-     <compile files="DesignA.java" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/design" title="generic itds - design B">
-     <compile files="DesignB.java" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/design" title="generic itds - design C">
-     <compile files="DesignC.java" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/design" title="generic itds - design D">
-     <compile files="DesignD.java" options="-1.5"/>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds/design" title="generic itds - design E">
-     <compile files="DesignE.java" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/design" title="generic itds - design F">
-     <compile files="DesignF.java" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/design" title="generic itds - design G">
-     <compile files="DesignG.java" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr116626" title="NPE in WeavingAdaptor">
-     <compile files="com/foo/bar/Test.java, TestAspect.aj" options="-1.5"/>
-     <run class="com.foo.bar.Test" ltw="aop.xml"
-     >
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr119657" title="IllegalAccessError with around advice on interface method call">
-     <compile files="services/account/StockQuoteServiceTest.java, services/accountdata/StockAccount.java, services/stockquote/StockQuoteService.java, services/stockquote/StockQuoteServiceImpl.java, services/account/AccountReport.java, accounts/recovery/Recovery.aj"/>
-     <run class="services.account.StockQuoteServiceTest">
-       <stdout>
-           <line text="Recovery.around() call(float services.stockquote.StockQuoteService.getQuote(String))"/>
-       </stdout>
-     </run>
-     <run class="services.account.StockQuoteServiceTest" ltw="aop.xml">
-       <stdout>
-           <line text="Recovery.around() call(float services.stockquote.StockQuoteService.getQuote(String))"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr119657" title="IllegalAccessError with around advice on interface method call not self">
-     <compile files="services/account/StockQuoteServiceTest.java, services/accountdata/StockAccount.java, services/stockquote/StockQuoteService.java, services/stockquote/StockQuoteServiceImpl.java, services/account/AccountReport.java, accounts/recovery/RecoveryNotSelf.aj"/>
-     <run class="services.account.StockQuoteServiceTest">
-       <stdout>
-           <line text="RecoveryNotSelf.around() call(float services.stockquote.StockQuoteService.getQuote(String))"/>
-       </stdout>
-     </run>
-     <run class="services.account.StockQuoteServiceTest" ltw="aop-notself.xml">
-       <stdout>
-           <line text="RecoveryNotSelf.around() call(float services.stockquote.StockQuoteService.getQuote(String))"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr119657" title="IllegalAccessError with around advice on interface method call using -XterminateAfterCompilation and LTW">
-     <compile files="services/account/StockQuoteServiceTest.java, services/accountdata/StockAccount.java, services/stockquote/StockQuoteService.java, services/stockquote/StockQuoteServiceImpl.java, services/account/AccountReport.java"/>
-     <compile files="accounts/recovery/Recovery.aj" options="-XterminateAfterCompilation"/>
-     <run class="services.account.StockQuoteServiceTest" ltw="aop.xml">
-       <stdout>
-           <line text="Recovery.around() call(float services.stockquote.StockQuoteService.getQuote(String))"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr119657" title="IllegalAccessError with around advice on interface method call using LTW">
-     <compile files="services/account/StockQuoteServiceTest.java, services/accountdata/StockAccount.java, services/stockquote/StockQuoteService.java, services/stockquote/StockQuoteServiceImpl.java, services/account/AccountReport.java"/>
-     <compile files="accounts/recovery/Recovery.aj"/>
-     <run class="services.account.StockQuoteServiceTest" ltw="aop.xml">
-       <stdout>
-           <line text="Recovery.around() call(float services.stockquote.StockQuoteService.getQuote(String))"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr119657" title="IllegalAccessError with around advice on interface method call not self using LTW">
-     <compile files="services/account/StockQuoteServiceTest.java, services/accountdata/StockAccount.java, services/stockquote/StockQuoteService.java, services/stockquote/StockQuoteServiceImpl.java, services/account/AccountReport.java"/>
-     <compile files="accounts/recovery/RecoveryNotSelf.aj" options="-1.4"/>
-     <run class="services.account.StockQuoteServiceTest" ltw="aop-notself.xml">
-       <stdout>
-           <line text="RecoveryNotSelf.around() call(float services.stockquote.StockQuoteService.getQuote(String))"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr119657" title="IllegalAccessError with around advice on interface method call self and not self using LTW">
-     <compile files="services/account/StockQuoteServiceTest.java, services/accountdata/StockAccount.java, services/stockquote/StockQuoteService.java, services/stockquote/StockQuoteServiceImpl.java, services/account/AccountReport.java"/>
-     <compile files="accounts/recovery/Recovery.aj, accounts/recovery/RecoveryNotSelf.aj"/>
-     <run class="services.account.StockQuoteServiceTest" ltw="aop-selfandnotself.xml">
-       <stdout>
-           <line text="Recovery.around() call(float services.stockquote.StockQuoteService.getQuote(String))"/>
-           <line text="RecoveryNotSelf.around() call(float services.stockquote.StockQuoteService.getQuote(String))"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr119657" title="IllegalAccessError with around advice on interface method call using LTW and -XnoInline">
-     <compile files="services/account/StockQuoteServiceTest.java, services/accountdata/StockAccount.java, services/stockquote/StockQuoteService.java, services/stockquote/StockQuoteServiceImpl.java, services/account/AccountReport.java"/>
-     <compile files="accounts/recovery/Recovery.aj"/>
-     <run class="services.account.StockQuoteServiceTest" ltw="aop-noinline.xml">
-       <stdout>
-           <line text="Recovery.around() call(float services.stockquote.StockQuoteService.getQuote(String))"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr121385" title="override protected pointcut in aop.xml concrete aspect">
-     <compile files="Hello.java"/>
-     <compile files="World.aj, ConcreteWorld.aj" options="-1.4"/>
-     <run class="Hello" ltw="aop.xml">
-       <stdout>
-           <line text="around start!"/>
-           <line text="Hello"/>
-           <line text="around start!"/>
-           <line text="World"/>
-           <line text="around end!"/>
-           <line text="around end!"/>
-       </stdout>
-     </run>
-   </ajc-test>
-
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/annotationgen.xml b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/annotationgen.xml
deleted file mode 100644
index 3a8bda2ad..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/annotationgen.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-<!-- @AspectJ v1.5.0 Tests -->
-
-    <!-- ================================================================= -->
-    <!-- Adrian's tests for generation of @AspectJ annotations from ajc                                   -->
-    <!-- ================================================================= -->
-
-    <ajc-test dir="java5/ataspectj/annotationGen" title="annotation gen for simple aspect">
-        <compile files="SimpleAspect.aj" options="-1.5"/>
-        <run class="SimpleAspect"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj/annotationGen" title="annotation gen for simple annotated aspect">
-        <compile files="SimpleAnnotatedAspect.aj" options="-1.5"/>
-        <run class="SimpleAnnotatedAspect"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj/annotationGen" title="annotation gen for simple aspect pre 1.5">
-        <compile files="Simple14Aspect.aj" options="-1.4"/>
-        <compile files="Simple14AspectTest.java" options="-1.5"/>
-        <run class="Simple14AspectTest"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj/annotationGen" title="annotation gen for privileged aspect">
-        <compile files="PrivilegedAspect.aj" options="-1.5"/>
-        <run class="PrivilegedAspect"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj/annotationGen" title="annotation gen for perthis aspect">
-        <compile files="PerThisAspect.aj" options="-1.5"/>
-        <run class="PerThisAspect"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj/annotationGen" title="annotation gen for pertarget aspect">
-        <compile files="PerTargetAspect.aj" options="-1.5"/>
-        <run class="PerTargetAspect"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj/annotationGen" title="annotation gen for percflow aspect">
-        <compile files="PerCflowAspect.aj" options="-1.5"/>
-        <run class="PerCflowAspect"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj/annotationGen" title="annotation gen for percflowbelow aspect">
-        <compile files="PerCflowbelowAspect.aj" options="-1.5"/>
-        <run class="PerCflowbelowAspect"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj/annotationGen" title="annotation gen for pertypewithin aspect">
-        <compile files="PerTypeWithinAspect.aj" options="-1.5"/>
-        <run class="PerTypeWithinAspect"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj/annotationGen" title="annotation gen for inner aspect of aspect">
-        <compile files="InnerAspectAspect.aj" options="-1.5"/>
-        <run class="InnerAspectAspect"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj/annotationGen" title="annotation gen for inner aspect of class">
-        <compile files="InnerAspectClass.aj" options="-1.5"/>
-        <run class="InnerAspectClass"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj/annotationGen" title="annotation gen for advice declarations">
-        <compile files="BasicAdvice.aj" options="-1.5"/>
-        <run class="BasicAdvice"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj/annotationGen" title="annotation gen for simple pointcut">
-        <compile files="SimplePointcut.aj" options="-1.5"/>
-        <run class="SimplePointcut"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj/annotationGen" title="annotation gen for pointcut modifiers">
-        <compile files="PointcutModifiers.aj" options="-1.5"/>
-        <run class="PointcutModifiers"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj/annotationGen" title="annotation gen for pointcut params">
-        <compile files="PointcutsWithParams.aj" options="-1.5"/>
-        <run class="PointcutsWithParams"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj/annotationGen" title="annotation gen for pointcut refs">
-        <compile files="ReferencePointcuts.aj" options="-1.5"/>
-        <run class="ReferencePointcuts"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj/annotationGen" title="before ann with non-void return">
-        <compile files="BeforeWithBadReturn.java" options="-1.5">
-            <message kind="error" line="7" text="This advice must return void"/>
-            <message kind="error" line="7" text="This method must return a result of type String"/>
-        </compile>
-    </ajc-test>
-
-     <ajc-test dir="java5/ataspectj/annotationGen" title="two anns on same element">
-        <compile files="TwoForThePriceOfOne.java" options="-1.5">
-            <message kind="error" line="7" text="The annotation @Pointcut is disallowed for this location"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj/annotationGen" title="bad pcut in after advice">
-        <compile files="AfterReturningWithBadPCut.java" options="-1.5">
-            <message kind="error" line="6" text="Syntax error on token &quot;excution(* *.*(..))&quot;"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj/annotationGen" title="bad parameter binding in advice">
-        <compile files="BadParameterBinding.java" options="-1.5">
-            <message kind="warning" line="11" text="no match for this type name: bpb"/>
-            <message kind="warning" line="15" text="no match for this type name: TheUnknownType"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj/annotationGen" title="simple pointcut no params">
-        <compile files="APointcut.java" options="-1.5"/>
-        <run class="APointcut"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj/annotationGen" title="pointcut medley">
-        <compile files="PointcutAssortment.java" options="-1.5">
-            <message kind="error" line="9" text="Methods annotated with @Pointcut must return void"/>
-            <message kind="error" line="9" text="This method must return a result of type String"/>
-            <message kind="error" line="15" text="Pointcuts without an if() expression should have an empty method body"/>
-            <message kind="error" line="28" text="Duplicate annotation @Pointcut"/>
-            <message kind="error" line="29" text="Duplicate annotation @Pointcut"/>
-            <message kind="error" line="11" text="can't find referenced pointcut foo"/>
-            <message kind="warning" line="32" text="no match for this type name: foo [Xlint:invalidAbsoluteTypeName]"/>
-         </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj/annotationGen" title="advice in a class">
-        <compile files="AdviceInAClass.java" options="-1.5">
-            <message kind="error" line="6" text="Advice must be declared inside an aspect type"/>
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="java5/ataspectj/annotationGen" title="ann gen for deows">
-        <compile files="Deow.aj" options="-1.5">
-        </compile>
-        <run class="Deow"/>
-    </ajc-test>          
-
-   <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=""/>
-    </ajc-test>          
-
-   <ajc-test dir="java5/ataspectj/annotationGen" title="ann gen for decp">
-        <compile files="DeclareParentsTest.aj" options="-1.5, -outxml">
-        </compile>
-        <run class="DeclareParentsTest" ltw=""/>
-    </ajc-test>          
-    
-      <ajc-test dir="java5/ataspectj/annotationGen" title="ann gen for decp 2">
-        <compile files="DeclareParentsTestAdvanced.aj" options="-1.5, -outxml">
-        </compile>
-        <run class="a.b.c.DeclareParentsTestAdvanced" ltw=""/>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/annotationGen" title="ann gen for decs">
-        <compile files="DeclareSoftTest.aj" options="-1.5">
-        </compile>
-        <run class="DeclareSoftTest"/>
-    </ajc-test>     
-    
-    <ajc-test dir="java5/ataspectj/annotationGen" title="ann gen for dec precedence">
-        <compile files="DeclarePrecedenceTest.aj" options="-1.5">
-        </compile>
-        <run class="DeclarePrecedenceTest"/>
-    </ajc-test>     
-    
-     <ajc-test dir="java5/ataspectj/annotationGen" title="ann gen for dec annotation">
-        <compile files="DeclareAnnotationTest.aj" options="-1.5">
-        </compile>
-        <run class="DeclareAnnotationTest"/>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/annotationGen" title="ann gen for itds">
-        <compile files="ITDTest.aj" options="-1.5, -outxml -Xlint:ignore -makeAjReflectable">
-        </compile>
-        <run class="a.b.c.ITDTest" ltw=""/>
-    </ajc-test>    
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/coverage/coverage.xml b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/coverage/coverage.xml
deleted file mode 100644
index f0ad3f4d3..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/coverage/coverage.xml
+++ /dev/null
@@ -1,320 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<!-- AspectJ v1.5.0 Tests -->
-
-<suite>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@Aspect extending Aspect">
-        <compile files="Test001.java" options="-1.5">
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@Aspect with codestyle pointcut">
-        <compile files="Test002.java" options="-1.5">
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="Codestyle Aspect with @Pointcut">
-        <compile files="Test003.java" options="-1.5">
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@Pointcut declared on codestyle advice">		
-        <compile files="Test004.java" options="-1.5">
-        <message kind="error" line="9" text="Only @AdviceName AspectJ annotation allowed on advice"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@Aspect class extending @Aspect class">
-        <compile files="Test005.java" options="-1.5">
-            <message kind="error" line="9" text="cannot extend a concrete aspect"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="class with @Before extending @Aspect class">
-        <compile files="Test006.java" options="-1.5">
-        <message kind="error" line="10" text="a class cannot extend an aspect"/>
-        <message kind="error" line="12" text="Advice must be declared inside an aspect type"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@Before declared on codestyle advice">
-        <compile files="Test007.java" options="-1.5">
-        <message kind="error" line="8" text="Duplicate annotation @Before"/>
-        <message kind="error" line="9" text="Only @AdviceName AspectJ annotation allowed on advice"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@Pointcut not returning void">
-        <compile files="Test008.java" options="-1.5">
-            <message kind="error" line="10" text="Pointcuts should have an empty method body"/>
-            <message kind="error" line="10" text="Methods annotated with @Pointcut must return void"/>
-         </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@Pointcut on @Aspect class constructor">
-        <compile files="Test009.java" options="-1.5">
-        <message kind="error" line="7" text="The annotation @Pointcut is disallowed for this location"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@Aspect on interface">
-        <compile files="Test010.java" options="-1.5">
-        <message kind="error" line="6" text="only classes can have an @Aspect annotation"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@Pointcut on non-aspect class method">
-        <compile files="Test011.java" options="-1.5">
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@Before on non-aspect class method">
-        <compile files="Test012.java" options="-1.5">
-        <message kind="error" line="6" text="Syntax error on token &quot;&quot;"/>
-        <message kind="error" line="7" text="Advice must be declared inside an aspect type"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@Pointcut on Interface method">
-        <compile files="Test013.java" options="-1.5">
-        <message kind="error" line="8" text="pointcuts can only be declared in a class or an aspect"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@Pointcut with garbage string">
-        <compile files="Test014.java" options="-1.5">
-        <message kind="error" line="7" text="String literal is not properly closed by a double-quote"/>
-        <message kind="error" line="8" text="Syntax error, insert &quot;}&quot; to complete BlockStatements"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@Pointcut with non-empty method body">
-        <compile files="Test015.java" options="-1.5">
-        <message kind="error" line="8" text="Pointcuts should have an empty method body"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@Pointcut with throws clause">
-        <compile files="Test016.java" options="-1.5">
-        <message kind="error" line="8" text="pointcuts cannot throw exceptions!"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@Aspect used badly">
-        <compile files="Test017.java" options="-1.5">
-        <message kind="error" line="5" text="Syntax error, insert &quot;interface JavaIdentifier&quot; to complete InterfaceHeader"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@Before declared on @Aspect class constructor">
-        <compile files="Test018.java" options="-1.5">
-        <message kind="error" line="7" text="The annotation @Before is disallowed for this location"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@AfterReturning with wrong number of args">
-        <compile files="Test019.java" options="-1.5">
-        <message kind="error" line="7" text="formal unbound in pointcut"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@Before on non-public method">
-        <compile files="Test020.java" options="-1.5">
-        <message kind="error" line="7" text="advice must be public"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@Before on method not returning void">
-        <compile files="Test021.java" options="-1.5">
-        <message kind="error" line="7" text="This advice must return void"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@Pointcut with wrong number of args">
-        <compile files="Test022.java" options="-1.5">
-        <message kind="error" line="8" text="formal unbound in pointcut"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@DeclareParents with interface extending interface">
-        <compile files="Test023.java" options="-1.5">
-        <message kind="error" line="11" text="@DeclareParents must be called before a class implementing a single interface"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@DeclareParents with interface extending interface">
-        <compile files="Test024.java" options="-1.5">
-        <message kind="error" line="13" text="@DeclareParents must be called before a class implementing a single interface"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@DeclareParents used outside of an Aspect">
-        <compile files="Test025.java" options="-1.5">
-        <message kind="error" line="9" text="@DeclareParents must be called inside an aspect"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@DeclareParents on an @Aspect">
-        <compile files="Test026.java" options="-1.5">
-        <message kind="error" line="11" text="@DeclareParents must be called before a class implementing a single interface"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@DeclareParents on an @Aspect with @DeclarePrecidence">
-        <compile files="Test027.java" options="-1.5">
-        <message kind="error" line="12" text="@DeclareParents must be called before a class implementing a single interface"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@DeclareWarning with a non-final String">
-        <compile files="Test028.java" options="-1.5">
-        <message kind="error" line="6" text="@DeclareWarning must be called before a static final String"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@DeclareWarning with a static final Object (that is a String)">
-        <compile files="Test029.java" options="-1.5">
-        <message kind="error" line="7" text="Is this an error?"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@DeclareWarning with a static final Integer">
-        <compile files="Test030.java" options="-1.5">
-        <message kind="error" line="6" text="@DeclareWarning must be called before a static final String"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@Around given an extension of ProceedingJoinPoint">
-        <compile files="Test031.java" options="-1.5">
-        <message kind="error" line="11" text="formal unbound in pointcut"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="calling @Before advice explicitly as a method">
-        <compile files="Test032.java" options="-1.5">
-        <message kind="error" line="14" text="Advice should never be called explicitly"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@Before on Interface method">
-        <compile files="Test033.java" options="-1.5">
-        <message kind="error" line="7" text="advice must be public"/>
-        <message kind="error" line="7" text="Advice must be declared inside an aspect type"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@Aspect Aspect double declaration">
-        <compile files="Test034.java" options="-1.5">
-        <message kind="error" line="5" text="The annotation @Aspect is only allowed before a class definition"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@Before and @After on one method">
-        <compile files="Test035.java" options="-1.5">
-        <message kind="error" line="7" text="The annotation @After is disallowed for this location"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@Before twice on one method">
-        <compile files="Test036.java" options="-1.5">
-        <message kind="error" line="6" text="Duplicate annotation @Before"/>
-        <message kind="error" line="7" text="Duplicate annotation @Before"/>
-        <message kind="error" line="7" text="The annotation @Before is disallowed for this location"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@Before advice with empty string">
-        <compile files="Test037.java" options="-1.5">
-            <message kind="error" line="6" text="Syntax error on token &quot;&quot;"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="isPrivileged=truu misspelling">
-        <compile files="Test038.java" options="-1.5">
-        <message kind="error" line="5" text="The attribute isPrivileged is undefined for the annotation type Aspect"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@Pointcut with an empty string">
-        <compile files="Test039.java" options="-1.5">
-            <message kind="error" line="11" text="Syntax error on token &quot;&quot;"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@Before with &amp;&amp; in string">
-        <compile files="Test040.java" options="-1.5">
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@AdviceName given an empty string">
-        <compile files="Test041.java" options="-1.5">
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@AdviceName used on @Before advice">
-        <compile files="Test042.java" options="-1.5">
-        <message kind="error" line="6" text="AdviceName annotation cannot be used for advice defined using annotation style"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="The Moody example">
-        <compile files="Test043.java" options="-1.5">
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj/coverage"
-		pr="" title="@DeclareWarning">
-        <compile files="Test044.java" options="-1.5">
-        <message kind="warning" line="13" text="This call is warned"/>
-        </compile>
-    </ajc-test>
-    
-    
-    
-    
-    
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/ltw.xml b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/ltw.xml
deleted file mode 100644
index a72fa4ebf..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/ltw.xml
+++ /dev/null
@@ -1,349 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-<suite>
-
-    <ajc-test dir="java5/ataspectj" title="RunThemAllWithJavacCompiledAndLTW">
-        <ant file="ajc-ant.xml" target="RunThemAllWithJavacCompiledAndLTW" verbose="true"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="AjcLTW PerClauseTest -XterminateAfterCompilation">
-        <compile
-                files="ataspectj/PerClauseTest.java,ataspectj/PerClauseTestAspects.java,ataspectj/TestHelper.java"
-                options="-1.5 -XterminateAfterCompilation"/>
-        <ant file="ajc-ant.xml" target="ltw.PerClauseTest" verbose="true"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="AjcLTW PerClauseTest -Xreweavable">
-        <compile
-                files="ataspectj/PerClauseTest.java,ataspectj/PerClauseTestAspects.java,ataspectj/TestHelper.java"
-                options="-1.5"/>
-        <ant file="ajc-ant.xml" target="ltw.PerClauseTest" verbose="true"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="JavaCAjcLTW PerClauseTest">
-        <compile
-                files="ataspectj/PerClauseTest.java,ataspectj/TestHelper.java,ataspectj/PerClauseTestAspects.java"
-                options="-1.5 -XterminateAfterCompilation"/>
-        <comment>
-            aspectOf methods will be pushed in, ignore warning for adviceDidNotMatch but still do the logic for them
-            since such just added methods are an interesting case (percflow ajc$perCflowStack advice)
-        </comment>
-        <compile
-                files="ataspectj/PerClauseTestAspects.java"
-                options="-1.5 -Xdev:NoAtAspectJProcessing">
-            <message kind="warning"/>
-        </compile>
-        <ant file="ajc-ant.xml" target="ltw.PerClauseTest" verbose="true"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="AjcLTW AroundInlineMungerTest -XterminateAfterCompilation">
-        <compile
-                files="ataspectj/AroundInlineMungerTest.java,ataspectj/AroundInlineMungerTestAspects.java,ataspectj/TestHelper.java"
-                options="-1.5 -XterminateAfterCompilation"/>
-        <ant file="ajc-ant.xml" target="ltw.AroundInlineMungerTest" verbose="true"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="AjcLTW AroundInlineMungerTest -Xreweavable">
-        <compile
-                files="ataspectj/AroundInlineMungerTest.java,ataspectj/AroundInlineMungerTestAspects.java,ataspectj/TestHelper.java"
-                options="-1.5"/>
-        <ant file="ajc-ant.xml" target="ltw.AroundInlineMungerTest" verbose="true"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="AjcLTW AroundInlineMungerTest">
-        <compile
-                files="ataspectj/AroundInlineMungerTestAspects.java"
-                options="-1.5 -Xlint:ignore"/>
-        <compile
-                files="ataspectj/AroundInlineMungerTest.java,ataspectj/TestHelper.java"
-                options="-1.5"/>
-        <ant file="ajc-ant.xml" target="ltw.AroundInlineMungerTest" verbose="true"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="AjcLTW AroundInlineMungerTest -XnoInline -Xreweavable">
-        <compile
-                files="ataspectj/AroundInlineMungerTestAspects.java"
-                options="-1.5 -Xlint:ignore -XnoInline"/>
-        <compile
-                files="ataspectj/AroundInlineMungerTest.java,ataspectj/TestHelper.java"
-                options="-1.5 -XnoInline"/>
-        <ant file="ajc-ant.xml" target="ltw.AroundInlineMungerTest" verbose="true"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="AjcLTW AroundInlineMungerTest2">
-        <compile
-                files="ataspectj/AroundInlineMungerTestAspects2.aj"
-                options="-1.5 -Xlint:ignore"/>
-        <compile
-                files="ataspectj/AroundInlineMungerTest2.aj,ataspectj/TestHelper.java"
-                options="-1.5"/>
-        <ant file="ajc-ant.xml" target="ltw.AroundInlineMungerTest2" verbose="true"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="LTW DumpTest none">
-        <compile
-                files="ataspectj/DumpTest.java,ataspectj/DumpTestTheDump.java,ataspectj/TestHelper.java"
-                options="-1.5"/>
-        <run class="ataspectj.DumpTest" ltw="ataspectj/aop-dumpnone.xml"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="LTW DumpTest">
-        <compile
-                files="ataspectj/EmptyAspect.aj"
-                options="-1.5 -Xlint:ignore"/>
-        <compile
-                files="ataspectj/DumpTest.java,ataspectj/DumpTestTheDump.java,ataspectj/TestHelper.java"
-                options="-1.5"/>
-        <run class="ataspectj.DumpTest" ltw="ataspectj/aop-dump.xml"/>
-    </ajc-test>
-    
-    <ajc-test dir="java5/ataspectj" title="LTW DumpTest before and after">
-        <compile
-                files="ataspectj/EmptyAspect.aj"
-                options="-1.5 -Xlint:ignore"/>
-        <compile
-                files="com/foo/bar/Test.java, com/foo/bar/Test$$EnhancerByCGLIB$$12345.java"
-                options="-1.5"/>
-        <run class="com.foo.bar.Test$$EnhancerByCGLIB$$12345" ltw="ataspectj/aop-dumpbeforeandafter.xml">
-        	<stdout>
-        		<line text="Test$$EnhancerByCGLIB$$12345.main()"/>
-        		<line text="Test.main()"/>
-            </stdout>
-        	<stderr>
-                <line text="info AspectJ Weaver Version"/>
-                <line text="info register classloader"/>
-                <line text="info using"/>
-				<line text="info register aspect ataspectj.EmptyAspect"/>
-        		<line text="debug not weaving 'com.foo.bar.Test$$EnhancerByCGLIB$$12345'"/>
-        		<line text="debug weaving 'com.foo.bar.Test'"/>
-            </stderr>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="LTW DumpTest closure">
-        <compile
-                files="ataspectj/DumpTest.java,ataspectj/DumpTestTheDump.java,ataspectj/TestAroundAspect.aj"
-                options="-1.5"/>
-        <run class="ataspectj.DumpTest" ltw="ataspectj/aop-dumpclosure.xml"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="LTW DumpTest proxy">
-        <compile
-                files="ataspectj/EmptyAspect.aj"
-                options="-1.5 -Xlint:ignore"/>
-        <compile
-                files="ataspectj/TestProxyGenerator.java,ataspectj/TestInterface.java"
-                options="-1.5"/>
-        <ant file="ajc-ant.xml" target="ltw.DumpProxyTest" verbose="true"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="LTW DumpTest JSP">
-        <compile
-                files="ataspectj/EmptyAspect.aj"
-                options="-1.5 -Xlint:ignore"/>
-        <compile
-                files="com/ibm/_jsp/_abc123_xyz890.java"
-                options="-1.5"/>
-        <run class="com.ibm._jsp._abc123_xyz890" ltw="ataspectj/aop-dumpjsp.xml"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="Ajc Aspect1 LTW Aspect2 -Xreweavable">
-        <compile
-                files="ataspectj/ltwreweavable/Main.java,ataspectj/ltwreweavable/Aspect1.java,ataspectj/ltwreweavable/Advisable.java"
-                options="-1.5"
-                outjar="main1.jar"/>
-        <ant file="ajc-ant.xml" target="ltw.Aspect2MainTest" verbose="true"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="LTW Log silent">
-    	<compile
-    		files="ataspectj/ltwlog/Main.java"
-    		options="-1.5"
-    	/>
-    	<compile
-    		files="ataspectj/ltwlog/Aspect1.java"
-    		options="-1.5 -XterminateAfterCompilation"
-    	>
-        </compile>	
-        <run class="ataspectj.ltwlog.Main" ltw="ataspectj/ltwlog/aop-silent.xml">
-        	<stdout>
- 				<line text="execution(Main.target())"/>
-            </stdout>
-        	<stderr>
-            </stderr>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="LTW Log verbose">
-    	<compile
-    		files="ataspectj/ltwlog/Main.java"
-    		options="-1.5"
-    	/>
-    	<compile
-    		files="ataspectj/ltwlog/Aspect1.java"
-    		options="-1.5 -XterminateAfterCompilation"
-    	>
-        </compile>	
-        <run class="ataspectj.ltwlog.Main" ltw="ataspectj/ltwlog/aop-verbose.xml">
-        	<stdout>
- 				<line text="execution(Main.target())"/>
-            </stdout>
-        	<stderr>
-                <line text="info AspectJ Weaver Version"/>
-                <line text="info register classloader"/>
-                <line text="info using"/>
-				<line text="info register aspect ataspectj.ltwlog.Aspect1"/>
-				<line text="debug weaving 'ataspectj.ltwlog.Main'"/>
-				<line text="debug weaving 'ataspectj.ltwlog.Aspect1'"/>
-            </stderr>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="LTW Log verbose and showWeaveInfo">
-    	<compile
-    		files="ataspectj/ltwlog/Main.java"
-    		options="-1.5"
-    	/>
-    	<compile
-    		files="ataspectj/ltwlog/Aspect1.java"
-    		options="-1.5 -XterminateAfterCompilation"
-    	>
-        </compile>	
-        <run class="ataspectj.ltwlog.Main" ltw="ataspectj/ltwlog/aop-verboseandshow.xml">
-        	<stdout>
- 				<line text="execution(Main.target())"/>
-            </stdout>
-        	<stderr>
-                <line text="info AspectJ Weaver Version"/>
-                <line text="info register classloader"/>
-                <line text="info using"/>
-				<line text="info register aspect ataspectj.ltwlog.Aspect1"/>
-				<line text="debug weaving 'ataspectj.ltwlog.Main'"/>
-				<line text="weaveinfo Join point 'method-execution(void ataspectj.ltwlog.Main.target())' in Type 'ataspectj.ltwlog.Main' (Main.java:22) advised by before advice from 'ataspectj.ltwlog.Aspect1' (Aspect1.java)"/>
-				<line text="debug weaving 'ataspectj.ltwlog.Aspect1'"/>
-            </stderr>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="LTW Log messageHandlerClass">
-    	<compile
-    		files="ataspectj/ltwlog/Main.java, ataspectj/ltwlog/MessageHolder.java"
-    		options="-1.5"
-    	/>
-    	<compile
-    		files="ataspectj/ltwlog/Aspect1.java"
-    		options="-1.5 -XterminateAfterCompilation"
-    	>
-        </compile>	
-        <run class="ataspectj.ltwlog.Main" ltw="ataspectj/ltwlog/aop-messagehandler.xml">
-        	<stdout>
-				<line text="MessageHolder.MessageHolder()"/>
- 				<line text="execution(Main.target())"/>
-            </stdout>
-        	<stderr>
-            </stderr>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="LTW Unweavable">
-        <ant file="ajc-ant.xml" target="ltw.Unweavable" verbose="true"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="LTW Decp">
-        <!-- ajc compile them to test reweable as well -->
-        <compile
-                files="ataspectj/DeclareParentsInterfaceTest.java,ataspectj/DeclareParentsImplementsTest.java,ataspectj/TestHelper.java"
-                options="-1.5"
-                />
-        <!--<run class="ataspectj.DeclareParentsInterfaceTest" ltw="ataspectj/aop-decptest.xml"/>-->
-        <ant file="ajc-ant.xml" target="ltw.Decp" verbose="true">
-        	<stderr>
-                <line text="weaveinfo Extending interface set for type 'ataspectj.DeclareParentsInterfaceTest$Target' (DeclareParentsInterfaceTest.java) to include 'ataspectj.DeclareParentsInterfaceTest$Marker' (DeclareParentsInterfaceTest.java)"/>
-                <line text="weaveinfo Join point 'method-execution(void ataspectj.DeclareParentsInterfaceTest$Target.target())' in Type 'ataspectj.DeclareParentsInterfaceTest$Target' (DeclareParentsInterfaceTest.java:27) advised by before advice from 'ataspectj.DeclareParentsInterfaceTest$TestAspect' (DeclareParentsInterfaceTest.java)"/>
-                <line text="weaveinfo Extending interface set for type 'ataspectj.DeclareParentsImplementsTest$Target' (DeclareParentsImplementsTest.java) to include 'ataspectj.DeclareParentsImplementsTest$Introduced' (DeclareParentsImplementsTest.java)"/>
-                <line text="weaveinfo Type 'ataspectj.DeclareParentsImplementsTest$Target' (DeclareParentsImplementsTest.java) has intertyped method from 'ataspectj.DeclareParentsImplementsTest$TestAspect' (DeclareParentsImplementsTest.java:'void ataspectj.DeclareParentsImplementsTest$Introduced.intro()')"/>
-                <line text="weaveinfo Join point 'method-execution(void ataspectj.DeclareParentsImplementsTest$Implementation.intro())' in Type 'ataspectj.DeclareParentsImplementsTest$Implementation' (DeclareParentsImplementsTest.java:47) advised by before advice from 'ataspectj.DeclareParentsImplementsTest$TestAspect' (DeclareParentsImplementsTest.java)"/>
-            </stderr>
-        </ant>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="LTW Decp2">
-        <!-- ajc compile them but with only one aspect -->
-        <compile
-                files="ataspectj/DeclareParentsImplementsReweavableTest.java,ataspectj/TestHelper.java"
-                options="-1.5"
-                />
-        <!-- compile the other aspect alone (won't be applied) -->
-        <ant file="ajc-ant.xml" target="ltw.Decp2" verbose="true"/>
-    </ajc-test>
-
-
-    <ajc-test dir="java5/ataspectj" title="Compile time aspects declared to ltw weaver">
-        <compile
-                files="ataspectj/ltwlog/MessageHolder.java,ataspectj/ltwreweavable/MainReweavableLogging.java,ataspectj/ltwreweavable/AspectReweavableLogging.java,ataspectj/ltwreweavable/Advisable.java,ataspectj/ltwreweavable/EmptyAtAspect.java"
-                options="-1.5"
-                outjar="main1.jar"/>
-        <ant file="ajc-ant.xml" target="Compile time aspects declared to ltw weaver" verbose="true"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="Concrete@Aspect">
-        <compile
-            files="ataspectj/ConcreteAtAspectTest.java,ataspectj/TestHelper.java"
-            options="-1.5 -XterminateAfterCompilation"
-            />
-        <run class="ataspectj.ConcreteAtAspectTest" ltw="ataspectj/aop-concreteataspect.xml"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="ConcreteAspect">
-        <compile
-            files="ataspectj/ConcreteAspectTest.aj,ataspectj/TestHelper.java"
-            options="-1.5 -Xdev:NoAtAspectJProcessing -XterminateAfterCompilation"
-            />
-        <run class="ataspectj.ConcreteAspectTest" ltw="ataspectj/aop-concreteaspect.xml"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="ConcretePrecedenceAspect">
-        <compile
-            files="ataspectj/ConcretePrecedenceAspectTest.java,ataspectj/TestHelper.java"
-            options="-1.5 -Xdev:NoAtAspectJProcessing -XterminateAfterCompilation"
-            />
-        <run class="ataspectj.ConcretePrecedenceAspectTest" ltw="ataspectj/aop-concreteprecedenceaspect.xml"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="AspectOfWhenAspectNotInInclude">
-        <compile
-            files="ataspectj/bugs/AspectOfWhenAspectNotInIncludeTest.java,ataspectj/TestHelper.java"
-            options="-1.5 -XterminateAfterCompilation"/>
-        <run class="ataspectj.bugs.AspectOfWhenAspectNotInIncludeTest" ltw="ataspectj/bugs/aop-aspectofwhenaspectnotinincludetest.xml"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="AspectOfWhenAspectExcluded">
-        <compile
-            files="ataspectj/bugs/AspectOfWhenAspectNotInIncludeTest.java,ataspectj/TestHelper.java"
-            options="-1.5 -XterminateAfterCompilation"/>
-        <run class="ataspectj.bugs.AspectOfWhenAspectNotInIncludeTest" ltw="ataspectj/bugs/aop-aspectofwhenaspectexcludedtest.xml"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="AspectOfWhenNonAspectExcluded">
-        <compile
-            files="ataspectj/bugs/NotAspect.java"
-            options="-1.5 -XterminateAfterCompilation"/>
-        <run class="ataspectj.bugs.NotAspect" ltw="ataspectj/bugs/aop-aspectofwhennonaspectexcludedtest.xml"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="AppContainer">
-        <compile
-            files="ataspectj/hierarchy/AppContainerTest.java,ataspectj/hierarchy/app/SubApp.java,ataspectj/TestHelper.java"
-            options="-1.5 -XterminateAfterCompilation"
-            />
-        <ant file="ajc-ant.xml" target="ltw.AppContainer" verbose="true"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="CflowBelowStack">
-        <compile
-            files="ataspectj/bugs/CflowBelowStackTest.java,ataspectj/TestHelper.java"
-            options="-1.5 -verbose "/>
-        <run class="ataspectj.bugs.CflowBelowStackTest" ltw="ataspectj/bugs/aop-cflowbelowstacktest.xml"/>
-    </ajc-test>
-
-
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/misuse.xml b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/misuse.xml
deleted file mode 100644
index 9aec9d7a4..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/misuse.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<!-- AspectJ v1.5.0 Tests -->
-
-<suite>
-
-    <ajc-test dir="java5/ataspectj"
-        pr="" title="@Aspect class extending @Aspect class">
-        <compile files="ataspectj/misuse/Test005.java" options="-1.5 -Xdev:NoAtAspectJProcessing">
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj"
-        pr="" title="class with @Before extending @Aspect class">
-        <compile files="ataspectj/misuse/Test006.java" options="-1.5 -Xdev:NoAtAspectJProcessing">
-            <message kind="error" line="11" text="class 'Test006B' can not extend aspect"/>
-        </compile>
-    </ajc-test>
-
-    <comment>a warning. We ignore the pointcut (TBD) - line is enclosing class (TBD Andy do better ?)</comment>
-    <ajc-test dir="java5/ataspectj"
-        pr="" title="@Pointcut not returning void">
-        <compile files="ataspectj/misuse/Test008.java" options="-1.5 -Xdev:NoAtAspectJProcessing">
-            <message kind="warning" line="9" text="Found @Pointcut on a method not returning 'void' or not 'public static boolean'"/>
-        </compile>
-    </ajc-test>
-
-<!--    <ajc-test dir="java5/ataspectj"-->
-<!--        pr="" title="@Aspect on interface">-->
-<!--        <compile files="ataspectj/misuse/Test010.java" options="-1.5 -Xdev:NoAtAspectJProcessing">-->
-<!--            <message kind="warning" line="7" text="Found @Aspect on an interface type 'ataspectj.misuse.Test010'"/>-->
-<!--        </compile>-->
-<!--    </ajc-test>-->
-
-    <comment>line is enclosing class - TBD</comment>
-    <ajc-test dir="java5/ataspectj"
-        pr="" title="@Pointcut with garbage string">
-        <compile files="ataspectj/misuse/Test014.java" options="-1.5 -Xdev:NoAtAspectJProcessing -Xlint:ignore">
-            <message kind="error" line="7" text="Invalid pointcut 'call%dddd"/>
-            <message kind="error" text="can't find referenced pointcut"/>
-            <message kind="error" text="can't find pointcut"/>
-            <message kind="error" text="@AfterThrowing: either 'value' or 'poincut' must be provided, not both"/>
-            <message kind="error" text="@AfterReturning: either 'value' or 'poincut' must be provided, not both"/>
-            <message kind="error" text="@DeclareWarning used on a non String constant field"/>
-            <message kind="error" text="@DeclareError used on a non String constant field"/>
-        </compile>
-    </ajc-test>
-
-        <comment>line is enclosing class - TBD</comment>
-    <ajc-test dir="java5/ataspectj"
-        pr="" title="@Pointcut with throws clause">
-        <compile files="ataspectj/misuse/Test016.java" options="-1.5 -Xdev:NoAtAspectJProcessing">
-            <message kind="warning" line="7" text="Found @Pointcut on a method throwing exception"/>
-        </compile>
-    </ajc-test>
-
-    <comment>very dirty hack - can't get this location to work properly so added match all error..</comment>
-    <comment>amc - with new checks for binding of returning this was giving a different message, so I 
-             tweaked the test slightly by swapping the order of the args</comment>
-    <ajc-test dir="java5/ataspectj"
-        pr="" title="@AfterReturning with wrong number of args">
-        <compile files="ataspectj/misuse/Test019.java" options="-1.5 -Xdev:NoAtAspectJProcessing -Xlint:ignore">
-            <message kind="error" line="1" text="the parameter x is not bound"/>
-            <message kind="error" line="1" text="formal unbound in pointcut"/>
-        </compile>
-    </ajc-test>
-
-    <comment>line number is enclosing type</comment>
-    <ajc-test dir="java5/ataspectj"
-        pr="" title="@Before on non-public method">
-        <compile files="ataspectj/misuse/Test020.java" options="-1.5 -Xdev:NoAtAspectJProcessing -Xlint:ignore">
-            <message kind="error" line="7" text="Found @AspectJ annotation on a non public advice 'someCall()V'"/>
-        </compile>
-    </ajc-test>
-
-    <comment>line number is enclosing type</comment>
-    <ajc-test dir="java5/ataspectj"
-        pr="" title="@Before on method not returning void">
-        <compile files="ataspectj/misuse/Test021.java" options="-1.5 -Xdev:NoAtAspectJProcessing -Xlint:ignore">
-            <message kind="error" line="7" text="Found @AspectJ annotation on a non around advice not returning void 'someCall()I'"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj"
-        pr="" title="@Before with PJP">
-        <compile files="ataspectj/misuse/Test100.java" options="-1.5 -Xdev:NoAtAspectJProcessing -Xlint:ignore">
-            <message kind="error" text="use of ProceedingJoinPoint is allowed only on around advice"/>
-        </compile>
-    </ajc-test>
-
-    <!--
-ALEX: todo
-    <ajc-test dir="java5/ataspectj/coverage"
-        pr="" title="@Pointcut with wrong number of args">
-        <compile files="ataspectj/misuse/Test022.java" options="-1.5 -Xdev:NoAtAspectJProcessing">
-            <message kind="error" line="8" text="int x is not declared in the pointcut parameters"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj/coverage"
-        pr="" title="@Around given an extension of ProceedingJoinPoint">
-        <compile files="ataspectj/misuse/Test031.java" options="-1.5 -Xdev:NoAtAspectJProcessing">
-            <message kind="error" line="9" text="Is this an error?"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj/coverage"
-        pr="" title="calling @Before advice explicitly as a method">
-        <compile files="ataspectj/misuse/Test032.java" options="-1.5 -Xdev:NoAtAspectJProcessing">
-            <message kind="error" line="14" text="Advice should never be called explicitly"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj/coverage"
-        pr="" title="@Before on Interface method">
-        <compile files="ataspectj/misuse/Test033.java" options="-1.5 -Xdev:NoAtAspectJProcessing">
-            <message kind="error" line="4" text="The annotation @Before is disallowed for this location"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj/coverage"
-        pr="" title="@Before and @After on one method">
-        <compile files="ataspectj/misuse/Test035.java" options="-1.5 -Xdev:NoAtAspectJProcessing">
-            <message kind="error" line="7" text="A method may only be declared as advice once"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj/coverage"
-        pr="" title="@Before advice with empty string">
-        <compile files="ataspectj/misuse/Test037.java" options="-1.5 -Xdev:NoAtAspectJProcessing">
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj/coverage"
-        pr="" title="@Pointcut with an empty string">
-        <compile files="ataspectj/misuse/Test039.java" options="-1.5 -Xdev:NoAtAspectJProcessing">
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj/coverage"
-        pr="" title="@Before with AND in string">
-        <compile files="ataspectj/misuse/Test040.java" options="-1.5 -Xdev:NoAtAspectJProcessing">
-        </compile>
-    </ajc-test>
--->
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/syntax.xml b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/syntax.xml
deleted file mode 100644
index 69055af39..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/syntax.xml
+++ /dev/null
@@ -1,202 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-<suite>
-
-    <ajc-test dir="java5/ataspectj" title="SimpleBefore">
-        <compile files="SimpleBefore.java" options="-1.5 -showWeaveInfo -XnoInline">
-            <message kind="weave" text="(SimpleBefore.java:23) advised by before advice from 'SimpleBefore$X' (SimpleBefore.java:33)"/>
-        </compile>
-        <run class="SimpleBefore"/>
-        <compile files="SimpleBefore.java" options="-1.5 -showWeaveInfo -XnoInline -Xdev:NoAtAspectJProcessing">
-            <message kind="weave" text="(SimpleBefore.java:23) advised by before advice from 'SimpleBefore$X' (SimpleBefore.java:33)"/>
-        </compile>
-        <run class="SimpleBefore"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="SimpleAfter">
-        <compile files="SimpleAfter.java" options="-1.5 -showWeaveInfo -XnoInline">
-            <message kind="weave" text="(SimpleAfter.java:13) advised by after advice from 'SimpleAfter$X'"/>
-        </compile>
-        <run class="SimpleAfter"/>
-        <compile files="SimpleAfter.java" options="-1.5 -showWeaveInfo -XnoInline -Xdev:NoAtAspectJProcessing">
-            <message kind="weave" text="(SimpleAfter.java:13) advised by after advice from 'SimpleAfter$X'"/>
-        </compile>
-        <run class="SimpleAfter"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="singletonAspectBindings">
-        <compile files="ataspectj/SingletonAspectBindingsTest.java,ataspectj/TestHelper.java" options="-1.5 -emacssym -XnoInline"/>
-        <run class="ataspectj.SingletonAspectBindingsTest"/>
-        <compile files="ataspectj/SingletonAspectBindingsTest.java,ataspectj/TestHelper.java" options="-1.5 -emacssym -XnoInline -Xdev:NoAtAspectJProcessing"/>
-        <run class="ataspectj.SingletonAspectBindingsTest"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="singletonAspectBindings2">
-        <compile files="ataspectj/SingletonAspectBindingsTest2.aj,ataspectj/TestHelper.java" options="-1.5 -emacssym -XnoInline"/>
-        <run class="ataspectj.SingletonAspectBindingsTest2"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="CflowTest">
-        <compile files="ataspectj/CflowTest.java,ataspectj/TestHelper.java" options="-1.5"/>
-        <run class="ataspectj.CflowTest"/>
-        <compile files="ataspectj/CflowTest.java,ataspectj/TestHelper.java" options="-1.5 -Xdev:NoAtAspectJProcessing"/>
-        <run class="ataspectj.CflowTest"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="PointcutReferenceTest">
-        <compile files="ataspectj/PointcutReferenceTest.java,ataspectj/TestHelper.java" options="-1.5"/>
-        <run class="ataspectj.PointcutReferenceTest"/>
-        <compile files="ataspectj/PointcutReferenceTest.java,ataspectj/TestHelper.java" options="-1.5 -Xdev:NoAtAspectJProcessing"/>
-        <run class="ataspectj.PointcutReferenceTest"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="XXJoinPointTest">
-        <compile files="ataspectj/XXJoinPointTest.java,ataspectj/TestHelper.java" options="-1.5"/>
-        <run class="ataspectj.XXJoinPointTest"/>
-        <compile files="ataspectj/XXJoinPointTest.java,ataspectj/TestHelper.java" options="-1.5 -Xdev:NoAtAspectJProcessing"/>
-        <run class="ataspectj.XXJoinPointTest"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="PrecedenceTest">
-        <compile files="ataspectj/PrecedenceTest.java,ataspectj/TestHelper.java" options="-1.5"/>
-        <run class="ataspectj.PrecedenceTest"/>
-        <compile files="ataspectj/PrecedenceTest.java,ataspectj/TestHelper.java" options="-1.5 -Xdev:NoAtAspectJProcessing"/>
-        <run class="ataspectj.PrecedenceTest"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="AfterXTest">
-        <compile files="ataspectj/AfterXTest.java,ataspectj/TestHelper.java" options="-1.5"/>
-        <run class="ataspectj.AfterXTest"/>
-        <compile files="ataspectj/AfterXTest.java,ataspectj/TestHelper.java" options="-1.5 -Xdev:NoAtAspectJProcessing"/>
-        <run class="ataspectj.AfterXTest"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="IfPointcutTest">
-        <compile files="ataspectj/IfPointcutTest.java,ataspectj/TestHelper.java" options="-1.5 -Xdev:NoAtAspectJProcessing"/>
-        <run class="ataspectj.IfPointcutTest"/>
-        <compile files="ataspectj/IfPointcutTest.java,ataspectj/TestHelper.java" options="-1.5"/>
-        <run class="ataspectj.IfPointcutTest"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="IfPointcut2Test">
-        <compile files="ataspectj/IfPointcut2Test.java,ataspectj/TestHelper.java" options="-1.5 -Xdev:NoAtAspectJProcessing"/>
-        <run class="ataspectj.IfPointcut2Test"/>
-        <compile files="ataspectj/IfPointcut2Test.java,ataspectj/TestHelper.java" options="-1.5"/>
-        <run class="ataspectj.IfPointcut2Test"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="BindingTest">
-        <compile files="ataspectj/BindingTest.java,ataspectj/TestHelper.java" options="-1.5"/>
-        <run class="ataspectj.BindingTest"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="BindingTest no inline">
-        <compile files="ataspectj/BindingTest.java,ataspectj/TestHelper.java" options="-1.5 -XnoInline"/>
-        <run class="ataspectj.BindingTest"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="PerClause">
-        <compile files="ataspectj/PerClauseTest.java,ataspectj/PerClauseTestAspects.java,ataspectj/TestHelper.java" options="-1.5 -Xdev:NoAtAspectJProcessing"/>
-        <run class="ataspectj.PerClauseTest"/>
-        <compile files="ataspectj/PerClauseTest.java,ataspectj/PerClauseTestAspects.java,ataspectj/TestHelper.java" options="-1.5"/>
-        <run class="ataspectj.PerClauseTest"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="AroundInlineMunger -XnoInline">
-        <compile files="ataspectj/AroundInlineMungerTest.java,ataspectj/AroundInlineMungerTestAspects.java,ataspectj/TestHelper.java" options="-1.5 -XnoInline -Xdev:NoAtAspectJProcessing -Xlint:ignore"/>
-        <run class="ataspectj.AroundInlineMungerTest"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="AroundInlineMunger">
-      <compile files="ataspectj/AroundInlineMungerTest.java,ataspectj/AroundInlineMungerTestAspects.java" options="-1.5 -Xdev:NoAtAspectJProcessing -Xlint:ignore"/>
-      <run class="ataspectj.AroundInlineMungerTest">
-        <stdout>
-          <line text="AroundInlineMungerTestAspects.Open.aroundCount=3"/>
-          <line text="AroundInlineMungerTestAspects.Open.beforeCount=6"/>
-        </stdout>
-      </run>
-      <!-- 
-        <compile files="ataspectj/AroundInlineMungerTest.java,ataspectj/AroundInlineMungerTestAspects.java,ataspectj/TestHelper.java" options="-1.5 -Xdev:NoAtAspectJProcessing -Xlint:ignore"/>
-        <run class="ataspectj.AroundInlineMungerTest"/>
- 	  -->
-     </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="AroundInlineMunger2">
-      <compile files="ataspectj/AroundInlineMungerTest2.aj,ataspectj/AroundInlineMungerTestAspects2.aj" options="-1.5 -Xlint:ignore"/>
-      <run class="ataspectj.AroundInlineMungerTest2">
-        <stdout>
-          <line text="AroundInlineMungerTestAspects2.Open.aroundCount=3"/>
-          <line text="AroundInlineMungerTestAspects2.Open.beforeCount=6"/>
-        </stdout>
-      </run>
-      <!-- 
-        <compile files="ataspectj/AroundInlineMungerTest2.aj,ataspectj/AroundInlineMungerTestAspects2.aj,ataspectj/TestHelper.java" options="-1.5 -Xlint:ignore"/>
-        <run class="ataspectj.AroundInlineMungerTest2"/>
-        -->
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="Deow">
-        <compile files="ataspectj/DeowTest.java" options="-1.5">
-            <message kind="warning" line="28" text="call hello"/>
-            <message kind="error" line="29" text="call hi"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="singletonInheritance">
-        <compile files="ataspectj/SingletonInheritanceTest.java,ataspectj/TestHelper.java" options="-1.5 -XnoInline"/>
-        <run class="ataspectj.SingletonInheritanceTest"/>
-        <compile files="ataspectj/SingletonInheritanceTest.java,ataspectj/TestHelper.java" options="-1.5 -XnoInline -Xdev:NoAtAspectJProcessing"/>
-        <run class="ataspectj.SingletonInheritanceTest"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="perClauseInheritance">
-        <compile files="ataspectj/PerClauseInheritanceTest.java,ataspectj/TestHelper.java" options="-1.5 -XnoInline"/>
-        <run class="ataspectj.PerClauseInheritanceTest"/>
-        <compile files="ataspectj/PerClauseInheritanceTest.java,ataspectj/TestHelper.java" options="-1.5 -XnoInline -Xdev:NoAtAspectJProcessing"/>
-        <run class="ataspectj.PerClauseInheritanceTest"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="MultipleBinding">
-        <compile files="ataspectj/MultipleBindingTest.java,ataspectj/TestHelper.java" options="-1.5 -Xdev:NoAtAspectJProcessing -XnoInline"/>
-        <run class="ataspectj.MultipleBindingTest"/>
-        <compile files="ataspectj/MultipleBindingTest.java,ataspectj/TestHelper.java" options="-1.5 -Xdev:NoAtAspectJProcessing"/>
-        <run class="ataspectj.MultipleBindingTest"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="Bug104212">
-        <compile files="ataspectj/Bug104212.java,ataspectj/TestHelper.java" options="-1.5"/>
-        <run class="ataspectj.Bug104212"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="DeclareParentsInterface">
-        <compile files="ataspectj/DeclareParentsInterfaceTest.java,ataspectj/TestHelper.java" options="-showWeaveInfo -1.5 -Xdev:NoAtAspectJProcessing -Xlint:ignore">
-            <message kind="weave" text="Extending interface set for type 'ataspectj.DeclareParentsInterfaceTest$Target' (DeclareParentsInterfaceTest.java) to include 'ataspectj.DeclareParentsInterfaceTest$Marker' (DeclareParentsInterfaceTest.java)"/>
-            <message kind="weave" text="Join point "/>
-        </compile>
-        <run class="ataspectj.DeclareParentsInterfaceTest"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="DeclareParentsImplements">
-        <compile files="ataspectj/DeclareParentsImplementsTest.java,ataspectj/TestHelper.java" options="-showWeaveInfo -1.5 -Xdev:NoAtAspectJProcessing -Xlint:ignore">
-            <message kind="weave" text="Join point "/>
-            <message kind="weave" text="Extending interface set for type 'ataspectj.DeclareParentsImplementsTest$Target' (DeclareParentsImplementsTest.java) to include 'ataspectj.DeclareParentsImplementsTest$Introduced' (DeclareParentsImplementsTest.java)"/>
-            <message kind="weave" text="Type 'ataspectj.DeclareParentsImplementsTest$Target' (DeclareParentsImplementsTest.java) has intertyped method from 'ataspectj.DeclareParentsImplementsTest$TestAspect' (DeclareParentsImplementsTest.java:'void ataspectj.DeclareParentsImplementsTest$Introduced.intro()')"/>
-        </compile>
-        <run class="ataspectj.DeclareParentsImplementsTest"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="AbstractAspectNPE">
-        <compile files="ataspectj/bugs/AbstractAspectNPEParent.java,ataspectj/bugs/AbstractAspectNPEChild.java"
-            options="-1.5 -showWeaveInfo">
-            <message kind="weave" text="Join point 'method-execution(void ataspectj.bugs.AbstractAspectNPEParent.main"/>            
-        </compile>
-    </ajc-test>
-
-
-    <ajc-test dir="java5/ataspectj" title="AbstractInherited">
-        <compile files="ataspectj/bugs/AbstractInherited.java"
-            options="-1.5 -showWeaveInfo">
-            <message kind="weave" text="Join point "/>
-        </compile>
-    </ajc-test>
-
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWTests.java
index ff9e59339..cd6e28f64 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWTests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWTests.java
@@ -27,7 +27,7 @@ public class LTWTests extends org.aspectj.testing.XMLBasedAjcTestCase {
   }
 
   protected File getSpecFile() {
-    return new File("../tests/src/org/aspectj/systemtest/ajc150/ltw/ltw.xml");
+	    return getClassResource("ltw.xml");
   }
   
   public void testInclusionAndPattern() {
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/ltw-tests.xml b/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/ltw-tests.xml
deleted file mode 100644
index 0dcdbf142..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/ltw-tests.xml
+++ /dev/null
@@ -1,670 +0,0 @@
-
-<!-- Load-time weaving tests -->
-<ajc-test dir="ltw"
-	title="Ensure 1st aspect is rewoven when weaving 2nd aspect"
-	keywords="reweavable">
-	<compile files="Main.java, Aspect1.aj" outjar="main1.jar"
-		options="-showWeaveInfo -verbose -1.4">
-		<message kind="weave"
-			text="method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)" />
-	</compile>
-	<compile classpath="main1.jar" files="Aspect2.aj"
-		outjar="aspect2.jar" options="-showWeaveInfo -verbose -1.4">
-	</compile>
-	<run class="Main" ltw="aop-ltwreweavable.xml">
-		<stdout>
-			<line text="Main.main" />
-			<line text="Main.test1" />
-			<line text="Main.test2" />
-		</stdout>
-		<stderr>
-			<line
-				text="weaveinfo Join point 'method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)" />
-			<line
-				text="weaveinfo Join point 'method-execution(void Main.test2())' in Type 'Main' (Main.java:21) advised by before advice from 'Aspect2' (Aspect2.aj:16)" />
-			<line text="Aspect1.before_test1" />
-			<line text="Aspect2.before_test2" />
-		</stderr>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw"
-	title="Ensure valid aop.xml file is generated" keywords="-outxml">
-	<compile files="Main.java" outjar="main.jar">
-	</compile>
-	<compile classpath="main.jar"
-		files="Aspect1.aj, Aspect2.aj, pakkage/Aspect3.aj"
-		outxmlfile="META-INF/aop.xml" options="-1.4">
-	</compile>
-	<run class="Main" ltw="">
-		<stdout>
-			<line text="Main.main" />
-			<line text="Main.test1" />
-			<line text="Main.test2" />
-		</stdout>
-		<stderr>
-			<line text="Aspect1.before_test1" />
-			<line text="Aspect2.before_test2" />
-			<line text="pakkage.Aspect3.before_test2" />
-		</stderr>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw"
-	title="Ensure valid aop.xml is generated for -outjar"
-	keywords="-outxml">
-	<compile files="Main.java" outjar="main.jar">
-	</compile>
-	<compile classpath="main.jar"
-		files="Aspect1.aj, Aspect2.aj, pakkage/Aspect3.aj"
-		outjar="aspects.jar" options="-1.4 -outxml">
-	</compile>
-	<run class="Main" ltw="">
-		<stdout>
-			<line text="Main.main" />
-			<line text="Main.test1" />
-			<line text="Main.test2" />
-		</stdout>
-		<stderr>
-			<line text="Aspect1.before_test1" />
-			<line text="Aspect2.before_test2" />
-			<line text="pakkage.Aspect3.before_test2" />
-		</stderr>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw"
-	title="Ensure no weaving without visible aop.xml" keywords="reweavable">
-	<compile files="TestMain.java, Main.java">
-	</compile>
-	<run class="TestMain" ltw="">
-		<stdout>
-			<line text="Main.main" />
-			<line text="Main.test1" />
-			<line text="Main.test2" />
-		</stdout>
-		<stderr>
-			<line text="info AspectJ Weaver Version" />
-			<line
-				text="info register classloader org.aspectj.weaver.loadtime.WeavingURLClassLoader" />
-			<line
-				text="info no configuration found. Disabling weaver for class loader org.aspectj.weaver.loadtime.WeavingURLClassLoader" />
-		</stderr>
-	</run>
-</ajc-test>
-
-<!-- type discarding tests, investigating call munging -->
-
-<ajc-test dir="ltw/callMunging"
-	title="discarding woven types - 1">
-	<compile files="A.java,B.java,T.java,Main.java"
-		outjar="classes.jar" />
-	<compile files="X.java" outjar="aspects.jar"
-		classpath="classes.jar" options="-Xlint:ignore" />
-	<run class="Main" ltw="aop.xml">
-		<stdout>
-			<line text="into:main" />
-			<line text="A.method() running" />
-			<line text="advice running" />
-			<line text="T.m1() running" />
-			<line text="B.method() running" />
-			<line text="advice running" />
-			<line text="T.m2() running" />
-			<line text="leave:main" />
-		</stdout>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw/callMunging/case1"
-	title="aggressive ltw - decp">
-	<compile files="A.java,T.java,Main.java" outjar="classes.jar" />
-	<compile files="X.java" outjar="aspects.jar"
-		classpath="classes.jar" options="-Xlint:ignore" />
-	<run class="Main" ltw="aop.xml">
-		<stdout>
-			<line text="into:main" />
-			<line text="A.method() running" />
-			<line text="advice running" />
-			<line text="T.m1() running" />
-			<line text="leave:main" />
-		</stdout>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw/callMunging/case1"
-	title="aggressive ltw - decp - deactivate">
-	<compile files="A.java,T.java,Main.java" outjar="classes.jar" />
-	<compile files="X.java" outjar="aspects.jar"
-		classpath="classes.jar" options="-Xlint:ignore" />
-	<run class="Main" ltw="aop2.xml">
-		<stdout>
-			<line text="into:main" />
-			<line text="A.method() running" />
-			<line text="T.m1() running" />
-			<line text="leave:main" />
-		</stdout>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw/callMunging/case1"
-	title="aggressive ltw - hierarchy">
-	<compile files="T.java,HierMain.java" outjar="classes.jar" />
-	<compile files="A.java" outjar="sub.hiddenjar"
-		classpath="classes.jar" />
-	<compile files="X.java" outjar="aspects.jar"
-		classpath="classes.jar" options="-Xlint:ignore" />
-	<run class="HierMain" ltw="aop.xml">
-		<stdout>
-			<line text="into:main" />
-			<line text="A.method() running" />
-			<line text="advice running" />
-			<line text="T.m1() running" />
-			<line text="leave:main" />
-		</stdout>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw/callMunging/case3"
-	title="aggressive ltw - decp - 2">
-	<compile files="A.java,T.java,S.java,Main.java"
-		outjar="classes.jar" />
-	<compile files="X.java" outjar="aspects.jar"
-		classpath="classes.jar" options="-Xlint:ignore" />
-	<run class="Main" ltw="aop.xml">
-		<stdout>
-			<line text="into:main" />
-			<line text="A.method() running" />
-			<line text="advice running" />
-			<line text="T.m1() running" />
-			<line text="leave:main" />
-		</stdout>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw/callMunging/case2"
-	title="aggressive ltw - deca">
-	<compile files="A.java,T.java,Main.java,MarkerAnnotation.java"
-		outjar="classes.jar" options="-1.5" />
-	<compile files="X.java" outjar="aspects.jar"
-		classpath="classes.jar" options="-1.5 -Xlint:ignore" />
-	<run class="Main" ltw="aop.xml">
-		<stdout>
-			<line text="into:main" />
-			<line text="A.method() running" />
-			<line text="advice running" />
-			<line text="T.m1() running" />
-			<line text="leave:main" />
-		</stdout>
-	</run>
-</ajc-test>
-
-
-
-<!-- end of discarding type tests -->
-
-<ajc-test dir="ltw"
-	title="Define concrete sub-aspect using aop.xml" keywords="aop.xml">
-	<compile files="Main.java" outjar="main.jar">
-	</compile>
-	<!-- was in next section classpath="main1.jar" -->
-	<compile files="AbstractSuperAspect.aj" outjar="aspect.jar"
-		options="-1.4">
-	</compile>
-	<run class="Main" ltw="aop-defineaspect.xml">
-		<stdout>
-			<line text="Main.main" />
-			<line text="Main.test1" />
-			<line text="Main.test2" />
-		</stdout>
-		<stderr>
-			<line text="info AspectJ Weaver Version" />
-			<line text="info register classloader" />
-			<line text="info using" />
-			<line text="info define aspect ConcreteAspect" />
-			<line text="debug weaving 'ConcreteAspect'" />
-			<line text="debug generating class 'ConcreteAspect'" />
-			<line text="debug weaving 'Main'" />
-			<line text="AbstractSuperAspect.before_test1" />
-		</stderr>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw"
-	title="Use abstract aspect for ITD using aop.xml"
-	keywords="abstract aspect, ITD">
-	<compile files="TestITDMethod.java">
-	</compile>
-	<compile files="AbstractAspect.aj" options="-1.4">
-		<message kind="warning"
-			text="this affected type is not exposed to the weaver: TestITDMethod" />
-	</compile>
-	<run class="TestITDMethod" options="test"
-		ltw="aop-abstractaspect.xml">
-		<stdout>
-			<line text="TestITDMethod.main" />
-		</stdout>
-		<stderr>
-			<line
-				text="weaveinfo Type 'TestITDMethod' (TestITDMethod.java) has intertyped method from 'AbstractAspect' (AbstractAspect.aj:'void TestITDMethod.test()')" />
-			<line text="AbstractAspect_TestITDMethod.test" />
-		</stderr>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw"
-	title="Ensure a subset of inherited aspects is used for weaving"
-	keywords="aspects, include">
-	<compile files="Main.java" outjar="main.jar">
-	</compile>
-	<compile classpath="main.jar"
-		files="Aspect1.aj, Aspect2.aj, pakkage/Aspect3.aj"
-		outjar="aspects.jar" options="-outxml -1.4">
-	</compile>
-	<run class="Main" ltw="aop-aspectsinclude.xml">
-		<stdout>
-			<line text="Main.main" />
-			<line text="Main.test1" />
-			<line text="Main.test2" />
-		</stdout>
-		<stderr>
-			<line text="pakkage.Aspect3.before_test2" />
-		</stderr>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw"
-	title="Ensure weaver lint warning issued when an aspect is not used for weaving"
-	keywords="aspects, include, lint">
-	<compile files="Main.java" outjar="main.jar">
-	</compile>
-	<compile classpath="main.jar"
-		files="Aspect1.aj, Aspect2.aj, pakkage/Aspect3.aj"
-		outjar="aspects.jar" options="-outxml -1.4">
-	</compile>
-	<run class="Main" ltw="aop-aspectsincludewithlintwarning.xml">
-		<stdout>
-			<line text="Main.main" />
-			<line text="Main.test1" />
-			<line text="Main.test2" />
-		</stdout>
-		<stderr ordered="no">
-			<line
-				text="warning aspect Aspect1 exluded for class loader org.aspectj.weaver.loadtime.WeavingURLClassLoader [Xlint:aspectExcludedByConfiguration]" />
-			<line
-				text="warning aspect Aspect2 exluded for class loader org.aspectj.weaver.loadtime.WeavingURLClassLoader [Xlint:aspectExcludedByConfiguration]" />
-			<line text="pakkage.Aspect3.before_test2" />
-		</stderr>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw" title="Empty Xlint.properties file"
-	keywords="xlint, ltw">
-	<compile files="Main.java">
-	</compile>
-	<run class="Main" ltw="aop-xlintfile.xml"
-		xlintfile="Xlint-empty.properties">
-		<stderr>
-		</stderr>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw" title="Set Xset properties enabled"
-	keywords="xSet, ltw">
-	<compile files="Main.java,Aspect1.aj">
-	</compile>
-	<run class="Main" ltw="aop-xset-verbose.xml"
-		xlintfile="Xlint-empty.properties">
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw" title="Set Xset properties disabled"
-	keywords="xSet, ltw">
-	<compile files="Main.java,Aspect1.aj">
-	</compile>
-	<run class="Main" ltw="aop-xset-verbose.xml"
-		xlintfile="Xlint-empty.properties">
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw"
-	title="Warning with missing Xlint.properties file"
-	keywords="xlint, ltw">
-	<compile files="Main.java">
-	</compile>
-	<run class="Main" ltw="aop-xlintfile.xml">
-		<stderr>
-			<line
-				text="warning Cannot access resource for -Xlintfile:Xlint-empty.properties" />
-		</stderr>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw/hier"
-	title="separate compilation with ltw: declare parents and call"
-	keywords="ltw">
-	<compile files="util/A.aj,util/T.aj" />
-	<compile
-		files="child/Executor.aj,child/Advisor.aj,top/SimpleMain.aj"
-		options="-1.4">
-		<message kind="warning"
-			text="this affected type is not exposed to the weaver: util.A" />
-	</compile>
-	<run class="top.SimpleMain" ltw="aop-single.xml">
-		<stdout>
-			<line text="T call" />
-		</stdout>
-		<stderr>
-			<line
-				text="weaveinfo Join point 'method-call(void util.A.foo())' in Type 'child.Executor' (Executor.aj:18) advised by before advice from 'child.Advisor' (Advisor.aj:20)" />
-			<line
-				text="weaveinfo Extending interface set for type 'util.A' (A.aj) to include 'util.T' (Advisor.aj)" />
-			<line
-				text="weaveinfo Extending interface set for type 'child.Advisor' (Advisor.aj) to include 'util.T' (Advisor.aj)" />
-		</stderr>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw"
-	title="Warning when advice doesn't match suppressed for LTW"
-	keywords="xlint, ltw">
-	<compile files="Main.java">
-	</compile>
-	<compile files="Aspect3.aj" options="-1.4">
-	</compile>
-	<run class="Main" ltw="aop-nomatch.xml">
-		<stderr>
-			<line text="info AspectJ Weaver Version" />
-			<line text="info register classloader" />
-			<line text="info using" />
-			<line text="info register aspect Aspect3" />
-			<line text="debug weaving 'Main'" />
-		</stderr>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw"
-	title="Override suppressing of warning when advice doesn't match using -Xlintfile"
-	keywords="xlint, ltw">
-	<compile files="Main.java">
-	</compile>
-	<compile files="Aspect3.aj" options="-1.4">
-	</compile>
-	<run class="Main" ltw="aop-nomatchxlintfile.xml"
-		xlintfile="Xlint-nomatch.properties">
-		<stderr>
-			<line text="info AspectJ Weaver Version" />
-			<line text="info register classloader" />
-			<line text="info using" />
-			<line text="info register aspect Aspect3" />
-			<line text="can not build thisJoinPoint lazily for this advice" />
-			<line text="debug weaving 'Main'" />
-		</stderr>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw"
-	title="Warning when advice doesn't match using -Xlint:default"
-	keywords="xlint, ltw">
-	<compile files="Main.java">
-	</compile>
-	<compile files="Aspect3.aj" options="-1.4">
-	</compile>
-	<run class="Main" ltw="aop-nomatchxlint.xml">
-		<stderr>
-			<line text="info AspectJ Weaver Version" />
-			<line text="info register classloader" />
-			<line text="info using" />
-			<line text="info register aspect Aspect3" />
-			<line text="can not build thisJoinPoint lazily for this advice" />
-			<line text="debug weaving 'Main'" />
-		</stderr>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw"
-	title="Override suppressing of warning when advice doesn't match using -Xlint:warning"
-	keywords="xlint, ltw">
-	<compile files="Main.java">
-	</compile>
-	<compile files="Aspect3.aj" options="-1.4">
-	</compile>
-	<run class="Main" ltw="aop-nomatchxlint.xml">
-		<stderr>
-			<line text="info AspectJ Weaver Version" />
-			<line text="info register classloader" />
-			<line text="info using" />
-			<line text="info register aspect Aspect3" />
-			<line text="can not build thisJoinPoint lazily for this advice" />
-			<line text="debug weaving 'Main'" />
-		</stderr>
-	</run>
-</ajc-test>
-
-<!-- based on "Ensure 1st aspect is rewoven when weaving 2nd aspect" -->
-<ajc-test dir="ltw" title="Nonstandard jar file extensions"
-	pr="137235">
-	<compile files="folder.jar/Main.java, folder.jar/Aspect1.aj"
-		outjar="folder.jar/main1.zip" options="-showWeaveInfo -1.4">
-		<message kind="weave"
-			text="method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)" />
-	</compile>
-	<compile classpath="$sandbox/folder.jar/main1.zip"
-		files="Aspect2.aj" outjar="aspect2Jar" options="-showWeaveInfo -1.4">
-	</compile>
-	<run class="Main" ltw="aop-ltwreweavable.xml"
-		classpath="$sandbox/folder.jar/main1.zip,$sandbox/aspect2Jar">
-		<stdout>
-			<line text="Main.main" />
-			<line text="Main.test1" />
-			<line text="Main.test2" />
-		</stdout>
-		<stderr>
-			<line
-				text="weaveinfo Join point 'method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)" />
-			<line
-				text="weaveinfo Join point 'method-execution(void Main.test2())' in Type 'Main' (Main.java:21) advised by before advice from 'Aspect2' (Aspect2.aj:16)" />
-			<line text="Aspect1.before_test1" />
-			<line text="Aspect2.before_test2" />
-		</stderr>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw" title="Odd zip on classpath" pr="137235">
-	<compile files="folder.jar/Main.java, folder.jar/Aspect1.aj"
-		outjar="folder.jar/main1.archive" options="-showWeaveInfo">
-		<message kind="weave"
-			text="method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)" />
-	</compile>
-	<compile classpath="$sandbox/folder.jar/main1.archive"
-		files="Aspect2.aj" outjar="aspect2Jar" options="-showWeaveInfo -1.4">
-	</compile>
-	<run class="Main" ltw="aop-ltwreweavable.xml"
-		classpath="$sandbox/folder.jar/main1.archive,$sandbox/aspect2Jar">
-		<stdout>
-			<line text="Main.main" />
-			<line text="Main.test1" />
-			<line text="Main.test2" />
-		</stdout>
-		<stderr>
-			<line
-				text="weaveinfo Join point 'method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)" />
-			<line
-				text="weaveinfo Join point 'method-execution(void Main.test2())' in Type 'Main' (Main.java:21) advised by before advice from 'Aspect2' (Aspect2.aj:16)" />
-			<line text="Aspect1.before_test1" />
-			<line text="Aspect2.before_test2" />
-		</stderr>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw" title="JDK14 LTW with XML" keywords="ltw">
-	<compile files="HelloWorldWithException.java"
-		options="-outjar hello.jar" />
-	<compile files="ExceptionHandler.aj"
-		options="-outxml -outjar handler.jar -1.4" />
-	<ant file="ant.xml" target="JDK14 LTW with XML" verbose="true">
-		<stdout>
-			<line text="Hello World!" />
-		</stdout>
-		<stderr>
-			<line text="TraceFactory.instance=" />
-		</stderr>
-	</ant>
-</ajc-test>
-
-<ajc-test dir="ltw" title="JDK14 LTW with ASPECTPATH"
-	keywords="ltw">
-	<compile files="HelloWorldWithException.java"
-		options="-outjar hello.jar" />
-	<compile files="ExceptionHandler.aj"
-		options="-outjar handler.jar" />
-	<ant file="ant.xml" target="JDK14 LTW with ASPECTPATH"
-		verbose="true">
-		<stdout>
-			<line text="Hello World!" />
-		</stdout>
-		<stderr>
-			<line text="TraceFactory.instance=" />
-		</stderr>
-	</ant>
-</ajc-test>
-
-<ajc-test dir="ltw" title="TestServer with HelloWorld"
-	keywords="ltw,server">
-	<compile files="HelloWorldWithException.java"
-		options="-outjar hello.jar" />
-	<compile files="ExceptionHandler.aj"
-		options="-outxml -outjar handler.jar -1.4" />
-	<ant file="ant-server.xml" target="TestServer with HelloWorld"
-		verbose="true">
-		<stdout>
-			<line text="Starting ..." />
-			<line text="Running HelloWorld" />
-			<line text="Hello World!" />
-			<line text="Stopping ..." />
-		</stdout>
-	</ant>
-</ajc-test>
-<!-- <ajc-test dir="ltw" title="TestServer with Parent and Child" keywords="ltw,server"> 
-	<compile files="Parent.java" options="-outjar parent.jar"/> <compile files="Child.java" 
-	options="-classpath parent.jar -outjar child.jar"/> <ant file="ant-server.xml" 
-	target="TestServer with Parent and Child" verbose="true"> <stdout> <line 
-	text="Starting ..."/> <line text="Running Child"/> <line text="Parent"/> 
-	<line text="Child"/> <line text="Stopping ..."/> </stdout> </ant> </ajc-test> -->
-<ajc-test dir="ltw" title="TestServer with Parent and Child"
-	keywords="ltw,server">
-	<compile files="HelloWorldWithException.java"
-		options="-outjar child.jar" />
-	<compile files="ExceptionHandler.aj"
-		options="-outxml -outjar parent.jar -1.4" />
-	<ant file="ant-server.xml"
-		target="TestServer with Parent and Child" verbose="true">
-		<stdout>
-			<line text="Starting ..." />
-			<line text="Running HelloWorld" />
-			<line text="Hello World!" />
-			<line text="Stopping ..." />
-		</stdout>
-	</ant>
-</ajc-test>
-
-<ajc-test dir="ltw"
-	title="override default path using -Dorg.aspectj.weaver.loadtime.configuration"
-	keywords="ltw">
-	<compile files="HelloWorldWithException.java"
-		options="-outjar hello.jar" />
-	<compile files="ExceptionHandler.aj"
-		options="-outxml -outjar handler.jar -1.4" />
-	<compile files="Tracing.aj"
-		options="-outxml -outjar tracing.jar -1.4" />
-	<ant file="ant.xml"
-		target="override default path using -Dorg.aspectj.weaver.loadtime.configuration"
-		verbose="true">
-		<stdout>
-			<line text="Hello World!" />
-		</stdout>
-	</ant>
-</ajc-test>
-
-<ajc-test dir="ltw/inclExcl" title="Inclusion and patterns"
-	keywords="ltw">
-	<compile files="pkg/sub/Foo.aj, pkg/Main.aj"
-		options="-outjar base.jar" />
-	<compile files="tracing/Tracer.aj" options="-1.4" />
-	<run class="pkg.Main" ltw="aop-include.xml">
-		<stderr>
-			<line text="execution(void pkg.Main.foo())" />
-			<line text="Main.class" />
-		</stderr>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw/inclExcl" title="Exclusion and patterns"
-	keywords="ltw">
-	<compile files="pkg/sub/Foo.aj, pkg/Main.aj"
-		options="-outjar base.jar" />
-	<compile files="tracing/Tracer.aj" options="-1.4" />
-	<run class="pkg.Main" ltw="aop-exclude.xml">
-		<stderr>
-			<line text="execution(void pkg.sub.Foo.foo())" />
-		</stderr>
-	</run>
-</ajc-test>
-<ajc-test dir="ltw/inclExcl" title="And patterns aspects"
-	keywords="ltw">
-	<compile files="pkg/sub/Foo.aj, pkg/Main.aj"
-		options="-outjar base.jar" />
-	<compile
-		files="tracing/Tracer.aj, tracing/staticinit/Tracer.aj, tracing/staticinit/sub/Tracer.aj"
-		options="-1.4" />
-	<run class="pkg.Main" ltw="aop-aspectinclexcl.xml">
-		<stderr>
-			<line text="staticinitialization(pkg.Main.&lt;clinit&gt;)" />
-			<line text="staticinitialization(pkg.sub.Foo.&lt;clinit&gt;)" />
-		</stderr>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw" title="simple LTW" keywords="ltw">
-	<compile files="HelloWorldWithException.java" />
-	<compile files="ExceptionHandler.aj" options="-outxml -1.4" />
-	<ant file="ant.xml" target="simple LTW" verbose="true">
-		<stdout>
-			<line text="Hello World!" />
-		</stdout>
-	</ant>
-</ajc-test>
-
-<ajc-test dir="ltw" title="dump on error" keywords="ltw">
-	<compile files="HelloWorldWithException.java" />
-	<compile files="ExceptionHandler.aj" options="-outxml -1.4" />
-	<ant file="ant.xml" target="dump on error" verbose="true">
-		<stdout>
-			<line text="Hello World!" />
-		</stdout>
-	</ant>
-</ajc-test>
-
-<ajc-test dir="bugs153/pr155033" title="multiple dump on error"
-	keywords="ltw">
-	<compile files="Annotation.java" options="-1.5" />
-	<compile
-		files="MultipleDumpTest.java, Class1.java, Class2.java, Class3.java"
-		options="-1.5" />
-	<compile files="Aspect.aj" options="-1.5 -outxml -Xlint:ignore" />
-	<!-- <run class="MultipleDumpTest" ltw="aop-multipledumponerror.xml"> <stdout> 
-		<line text="? AbortingMessageHandler.AbortingMessageHandler()"/> </stdout> 
-		</run> -->
-	<ant file="ant.xml" target="multiple dump on error" verbose="true">
-		<stdout>
-			<line text="? MultipleDumpTest.main()" />
-			<line text="? Class1.main()" />
-			<line text="? Aspect.before()" />
-			<line text="? Class2.main()" />
-			<line text="? Aspect.before()" />
-			<line text="? Class3.main()" />
-			<line text="? Aspect.before()" />
-		</stdout>
-	</ant>
-</ajc-test>
-    
-    
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/ltw.xml b/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/ltw.xml
deleted file mode 100644
index 311872c09..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/ltw.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[
-<!ENTITY tests SYSTEM "../tests/src/org/aspectj/systemtest/ajc150/ltw/ltw-tests.xml">
-]>
-
-<!-- Load-time weaving tests -->
-
-<suite>
-
-&tests;
-
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc151/ajc151.xml b/tests/src/test/java/org/aspectj/systemtest/ajc151/ajc151.xml
deleted file mode 100644
index 279c56e04..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc151/ajc151.xml
+++ /dev/null
@@ -1,414 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<!-- AspectJ v1.5.1 Tests -->
-<suite>
-
-    <!-- atDecp begin -->
-   
-    <!-- something simple -->
-    <ajc-test dir="bugs151/atDecp/case1" title="atDecp - simple">
-      <compile files="MainClass.java" options="-1.5 -showWeaveInfo">
-        <message kind="weave" text="Extending interface set for type 'moody.AnnotationMoodImplementor' (MainClass.java) to include 'moody.AnnotationMoodIndicator$Moody' (MainClass.java)"/>
-	    <message kind="weave" text="Type 'moody.AnnotationMoodImplementor' (MainClass.java) has intertyped method from 'moody.AnnotationMoodIndicator' (MainClass.java:'moody.Mood moody.AnnotationMoodIndicator$Moody.getMood()')"/>
-	    <message kind="weave" text="Type 'moody.AnnotationMoodImplementor' (MainClass.java) has intertyped method from 'moody.AnnotationMoodIndicator' (MainClass.java:'void moody.AnnotationMoodIndicator$Moody.setMood(moody.Mood)')"/>
-      </compile>
-      <run class="moody.MainClass">
-         <stderr>
-           <line text="ami0's mood is HAPPY"/>
-           <line text="ami1's mood is now JOLLY"/>
-           <line text="ami0's mood is still HAPPY"/>
-         </stderr>
-      </run>
-    </ajc-test>
-    
-    <!-- applying parent based on annotation -->
-    <ajc-test dir="bugs151/atDecp/case2" title="atDecp - annotation">
-      <compile files="MainClass.java" options="-1.5 -showWeaveInfo">
-        <message kind="weave" text="Extending interface set for type 'moody.AnnotationMoodImplementor' (MainClass.java) to include 'moody.AnnotationMoodIndicator$Moody' (MainClass.java)"/>
-	    <message kind="weave" text="Type 'moody.AnnotationMoodImplementor' (MainClass.java) has intertyped method from 'moody.AnnotationMoodIndicator' (MainClass.java:'moody.Mood moody.AnnotationMoodIndicator$Moody.getMood()')"/>
-	    <message kind="weave" text="Type 'moody.AnnotationMoodImplementor' (MainClass.java) has intertyped method from 'moody.AnnotationMoodIndicator' (MainClass.java:'void moody.AnnotationMoodIndicator$Moody.setMood(moody.Mood)')"/>
-      </compile>
-      <run class="moody.MainClass">
-         <stderr>
-           <line text="ami0's mood is HAPPY"/>
-           <line text="ami1's mood is now JOLLY"/>
-           <line text="ami0's mood is still HAPPY"/>
-         </stderr>
-      </run>
-    </ajc-test>
-    
-    <!-- when interface is binary -->
-    <ajc-test dir="bugs151/atDecp/case3" title="atDecp - binary interface">
-      <compile files="Mood.java,Moody.java" outjar="moody.jar" options="-1.5"/>
-      <compile files="MainClass.java" classpath="moody.jar" options="-1.5 -showWeaveInfo">
-        <message kind="weave" text="Extending interface set for type 'theapp.AnnotationMoodImplementor' (MainClass.java) to include 'moody.Moody' (MainClass.java)"/>
-        <message kind="weave" text="Type 'theapp.AnnotationMoodImplementor' (MainClass.java) has intertyped method from 'theapp.AnnotationMoodIndicator' (MainClass.java:'moody.Mood moody.Moody.getMood()')"/>
-        <message kind="weave" text="Type 'theapp.AnnotationMoodImplementor' (MainClass.java) has intertyped method from 'theapp.AnnotationMoodIndicator' (MainClass.java:'void moody.Moody.setMood(moody.Mood)')"/>
-      </compile>
-      <run class="theapp.MainClass">
-         <stderr>
-           <line text="ami0's mood is HAPPY"/>
-           <line text="ami1's mood is now JOLLY"/>
-           <line text="ami0's mood is still HAPPY"/>
-         </stderr>
-      </run>
-    </ajc-test>
-    
-    <!-- when interface is binary and implementation is not an inner  -->
-    <ajc-test dir="bugs151/atDecp/case4" title="atDecp - binary interface - 2">
-      <compile files="Mood.java,Moody.java" outjar="moody.jar" options="-1.5"/>
-      <compile files="MainClass.java,AnnotationMoodImplementor.java,TheAspect.java,MoodyImpl.java" classpath="moody.jar" options="-1.5 -showWeaveInfo">
-        <message kind="weave" text="Extending interface set for type 'theapp.AnnotationMoodImplementor' (AnnotationMoodImplementor.java) to include 'moody.Moody' (TheAspect.java)"/>
-        <message kind="weave" text="Type 'theapp.AnnotationMoodImplementor' (AnnotationMoodImplementor.java) has intertyped method from 'theapp.AnnotationMoodIndicator' (TheAspect.java:'moody.Mood moody.Moody.getMood()')"/>
-        <message kind="weave" text="Type 'theapp.AnnotationMoodImplementor' (AnnotationMoodImplementor.java) has intertyped method from 'theapp.AnnotationMoodIndicator' (TheAspect.java:'void moody.Moody.setMood(moody.Mood)')"/>
-      </compile>
-      <run class="theapp.MainClass">
-         <stderr>
-           <line text="ami0's mood is HAPPY"/>
-           <line text="ami1's mood is now JOLLY"/>
-           <line text="ami0's mood is still HAPPY"/>
-         </stderr>
-      </run>
-    </ajc-test>
-    
-    <!-- atDecp end -->
-
-
-    <ajc-test dir="bugs151/pr126560" title="@AJ deow doesn't throw an invalidAbsoluteTypeName when specify type in the same package">
-        <compile files="pkg1/C.java, pkg1/A.java" options="-1.5">
-          <message kind="error" line="8" text="error"/>
-          <message kind="warning" line="5" text="warning"/>
-	    </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs151/pr126560" title="@AJ deow doesn't throw an invalidAbsoluteTypeName when specify type in the same file">
-        <compile files="pkg2/InOneFile.java" options="-1.5">
-          <message kind="warning" line="14" text="call hello"/>
-          <message kind="error" line="15" text="call hi"/>
-	    </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs151/pr98901" title="annotations and itds">
-     <compile files="Failing.java" options="-1.5"/>
-     <run class="Failing">
-       <stderr>
-          <line text="On TestInterface:@TestAnnotation(value=true)"/>
-          <line text="On Failing:@TestAnnotation(value=true)"/>
-       </stderr>
-     </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs151/pr98901" title="annotations and itds - 2">
-     <compile files="Failing2.java" options="-1.5"/>
-     <run class="Failing2">
-       <stderr>
-          <line text="On TestInterface:@TestAnnotation(value=true)"/>
-          <line text="On Failing2:@TestAnnotation(value=true)"/>
-       </stderr>
-     </run>
-    </ajc-test>
-
-    <ajc-test dir="bugs151/pr132926" pr="132926" title="crashing on annotation type resolving with asm - 1">
-     <compile files="InputAnnotation.java,AffectedType.java" options="-1.5"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs151/pr132926" pr="132926" title="crashing on annotation type resolving with asm - 2">
-     <compile files="InputAnnotation.java" outjar="foo.jar" options="-1.5"/>
-     <compile files="AffectedType.java" classpath="foo.jar" options="-1.5"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs151/pr132926" pr="132926" title="crashing on annotation type resolving with asm - 3">
-     <compile files="InputAnnotation2.java" outjar="foo.jar" options="-1.5"/>
-     <compile files="AffectedType.java" classpath="foo.jar" options="-1.5">
-     	<message kind="error" line="9" text="AffectedType is not a valid target for annotation InputAnnotation, this annotation can only be applied to these element types {METHOD}"/>
-     </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs151/pr133307" title="circular generics">
-      <compile files="Broken.aj" options="-1.5"/>
-    </ajc-test>  
-    
-    <ajc-test dir="bugs151/pr123553" title="generic advice parameters">
-        <compile files="A.java" options="-1.5"/>
-        <run class="A"/>
-    </ajc-test>  
-    
-    <ajc-test dir="bugs151/pr133298" title="doubly annotating a method with declare">
-      <compile files="DecA.java" options="-1.5"/>
-      <run class="DecA">
-        <stderr>
-          <line text="There are 2 annotations on public void m()"/>
-          <line text="1) One"/>
-          <line text="2) Two"/>
-		  <line text="There are 2 annotations on public Target(int):"/>
-		  <line text="1) Four"/>
-		  <line text="2) Three"/>
-		  <line text="There are 2 annotations on public int x:"/>
-		  <line text="1) Five"/>
-		  <line text="2) Six"/>
-        </stderr>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs151/pr133298" title="doubly annotating a method with declare - 2">
-      <compile files="DecA2.java" options="-1.5"/>
-      <run class="DecA2">
-        <stderr>
-          <line text="There are 2 annotations on public void Target.m()"/>
-          <line text="1) One"/>
-          <line text="2) Two"/>
-          <line text="There are 2 annotations on public void A.m()"/>
-          <line text="1) One"/>
-          <line text="2) Two"/>
-        </stderr>
-      </run>
-    </ajc-test>
-    
-     <ajc-test dir="bugs151/pr129566" title="arrayindexoutofbounds">
-        <compile files="SkipList.java" options="-1.5"/>
-    </ajc-test>  
-    
-    <ajc-test dir="bugs151" title="member types in generic types">
-        <compile files="pr122458.aj" options="-1.5 -emacssym"/>
-    </ajc-test>  
-    
-    <ajc-test dir="bugs151/pr127299" title="missing import gives funny message">
-        <compile files="ModelErrorConversion.aj" options="-1.5"/>
-    </ajc-test>
-      
-    <ajc-test dir="bugs151/pr122742" title="@AJ VerifyError with @AfterThrowing and thisJoinPoint argument">
-    	<compile files="AfterThrowingTest.java" options="-1.5"/>
-    	<run class="AfterThrowingTest">
-    	</run>
-    </ajc-test>
-
-    <ajc-test dir="bugs151/pr122742" title="@AJ VerifyError with @AfterReturning and thisJoinPoint argument">
-    	<compile files="AfterReturningTest.java" options="-1.5"/>
-    	<run class="AfterReturningTest">
-    	</run>
-    </ajc-test>
-   
-    <ajc-test dir="bugs151/pr120527" title="incorrect unused interface message">
-        <compile files="Bugs.aj" options="-warn:unusedPrivate"/>
-    </ajc-test>  
-    
-    <ajc-test dir="bugs151/pr123901" title="inlinevisitor NPE">
-        <compile files="A.java,B.java" options="-1.5">
-          <message kind="error" line="5" text="A cannot be resolved or is not a field"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs151" title="member types in generic types - 2">
-        <compile files="pr122458_2.aj" options="-1.5 -emacssym"/>
-        <run class="pr122458_2"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs151/pr123695" title="Internal nullptr exception with complex declare annotation">
-        <compile files="InjectName.java,Main.java,MarkMyMethods.java,MarkMyMethodsAspect.java,NameAspect.java,Named.java,Read.java,Write.java" options="-1.5"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs151/pr124105" title="hasMember problems with packages">
-        <compile files="com/test/IOption.java,com/test/IXOption.java,com/test/IYOption.java,com/test/IZOption.java,com/test/MyBrokenXOption.java,com/test/MyXOption.java,com/test/OptionAspect.aj,com/test/OptionType.java" options="-1.5 -XhasMember">
-          <message kind="error" line="4" text="IOption implementations must provide a constructor which accepts an OptionType"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs151/pr124803" title="generics and different numbers of type variables">
-        <compile files="Test.java,TestAspect.java" options="-1.5 -showWeaveInfo">
-          <message kind="weave" text="Join point 'method-execution(void Test.foo(java.lang.Number))' in Type 'Test' (Test.java:12) advised by after advice from 'TestAspect' (TestAspect.java:4)"/>
-        </compile>
-        <run class="Test">
-          <stderr>
-             <line text="Aspects:execution(void Test.foo(Number))"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs151/pr124803" title="generics and different numbers of type variables - classes">
-        <compile files="Test2.java,TestAspect2.java" options="-1.5 -showWeaveInfo">
-          <message kind="weave" text="Join point 'method-execution(void Test2.foo(java.lang.Number))' in Type 'Test2' (Test2.java:12) advised by after advice from 'TestAspect2' (TestAspect2.java:4)"/>
-	      <message kind="weave" text="Join point 'method-execution(void Generic1.foo(java.lang.Number))' in Type 'Generic1' (Test2.java:2) advised by after advice from 'TestAspect2' (TestAspect2.java:4) [with runtime test]"/>
-        </compile>
-        <run class="Test2">
-          <stderr>
-             <line text="Aspects:execution(void Test2.foo(Number))"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs151/pr124808" title="parameterized collection fields matched via pointcut">
-        <compile files="Test.java,TestAspect.java" options="-1.5"/>
-        <run class="Test">
-          <stderr>
-             <line text="GO Aspects!  get(Set Test.ints)"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs151" title="calling inherited generic method from around advice">
-        <compile files="pr124999.aj" options="-1.5"/>
-        <run class="pr124999"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs151/pr124654" title="generic aspects and annotations">
-        <compile files="GenericAnnotation.java,TestSubAspect.java" options="-1.5"/>
-        <run class="TestSubAspect">
-          <stderr>
-            <line text="Reference pointcut advice. interface MyAnnotation"/>
-            <line text="Inlined pointcut advice. interface MyAnnotation"/>
-            <line text="run running"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs151" title="incorrectly referencing pointcuts">
-        <compile files="pr122452.aj" options="-1.5">
-          <message kind="warning" line="2" text="no match for this type name: Point [Xlint:invalidAbsoluteTypeName]"/>
-          <message kind="warning" line="3" text="no match for this type name: related.Hello [Xlint:invalidAbsoluteTypeName]"/>
-          <message kind="error" line="4" text="Syntax error on token &quot;*&quot;, &quot;(&quot; expected"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs151" title="incorrectly referencing pointcuts - 2">
-        <compile files="pr122452_2.aj" options="-1.5">
-          <message kind="error" line="2" text="Syntax error on token &quot;*&quot;, &quot;(&quot; expected"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs151/pr125080" title="mixing numbers of type parameters">
-        <compile files="Test.java" options="-1.5"/>
-        <run class="ConcreteAspect"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs151/pr125080" title="mixing numbers of type parameters - 2">
-        <compile files="Test2.java" options="-1.5"/>
-        <run class="ConcreteAspect"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs151/pr125295" title="new IProgramElement methods">
-        <compile files="pkg/C.java,pkg/A.aj" options="-emacssym"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs151/pr125475" title="define empty pointcut using an annotation">
-        <compile files="TestEmptyPointcutAtAspect.java" options="-1.5"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs151/pr125475" title="define empty pointcut using an annotation - 2">
-        <compile files="TestEmptyPointcutAtAspect2.java" options="-1.5 -showWeaveInfo">
-          <message kind="warning" line="10" text="advice defined in TestEmptyPointcutAtAspect2 has not been applied [Xlint:adviceDidNotMatch]"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs151/pr125475" title="define empty pointcut using aop.xml">
-        <compile files="Test.java TestAspect.aj"/>
-        <run class="Test" ltw="aop.xml"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs151/pr128744" title="broken ltw">
-        <compile files="Hello.java World.java" options="-1.5" />
-        <run class="Hello" ltw="aop.xml">
-        	<stdout>
-                <line text="Hello"/>
-                <line text="World"/>
-            </stdout>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs151/pr125699" title="inherit advice with this() and thisJoinPoint">
-        <compile files="Tracing.aj, TestTracing.aj, AtTestTracing.java" options="-1.5">
-          <message kind="warning" line="13" text="advice defined in Tracing has not been applied [Xlint:adviceDidNotMatch]"/>
-          <message kind="warning" line="8" text="advice defined in Tracing has not been applied [Xlint:adviceDidNotMatch]"/>
-          <message kind="warning" line="3" text="advice defined in Tracing has not been applied [Xlint:adviceDidNotMatch]"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs151/pr125699" title="inherit advice with this() and thisJoinPoint - 2">
-        <compile files="Tracing.aj, SubAbstractTracing.aj, SubAtAj.java" options="-1.5">
-          <message kind="warning" line="13" text="advice defined in Tracing has not been applied [Xlint:adviceDidNotMatch]"/>
-          <message kind="warning" line="8" text="advice defined in Tracing has not been applied [Xlint:adviceDidNotMatch]"/>
-          <message kind="warning" line="3" text="advice defined in Tracing has not been applied [Xlint:adviceDidNotMatch]"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs151/pr125810" title="warning when inherited pointcut not made concrete">
-        <compile files="SuperAspect.aj, SubAspect.aj, SubAtAspect.java" options="-1.5">
-          <message kind="error" line="3" text="inherited abstract pointcut SuperAspect.scope() is not made concrete in SubAspect"/>
-          <message kind="error" line="1" text="inherited abstract pointcut SuperAspect.scope() is not made concrete in SubAspect"/>
-          <message kind="error" line="3" text="inherited abstract pointcut SuperAspect.scope() is not made concrete in SubAtAspect"/>
-          <message kind="error" line="4" text="inherited abstract pointcut SuperAspect.scope() is not made concrete in SubAtAspect"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs151" title="E extends Enum(E) again">
-        <compile files="Pr126316.aj" options="-1.5"/>
-    </ajc-test> 
-
-    <ajc-test dir="bugs151" title="@AJ without JoinPoint import">
-        <compile files="pr121616.java" options="-1.5">
-          <message kind="error" line="13" text="JoinPoint cannot be resolved to a type"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs151/pr122370" title="@AJ declare parents retains field state">
-        <compile files="moody/AnnotationMoodImplementor.java, moody/AnnotationMoodIndicator.java, moody/Mood.java, moody/MainClass.java" options="-1.5"/>
-       <run class="moody.MainClass">
-            <stdout>
-             <line text="ami0's mood is HAPPY"/>
-             <line text="ami1's mood is now JOLLY"/>
-             <line text="ami0's mood is still HAPPY"/>
-            </stdout>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="bugs151" title="@AJ no npe with pointcut containing or, this and a wildcard">
-        <compile files="pr128237.java" options="-1.5"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs151" title="Generic aspects with annotation type parameters">
-        <compile files="GenericAspectWithAnnotationTypeParameter.aj" options="-1.5"/>
-        <run class="GenericAspectWithAnnotationTypeParameter">
-            <stdout>
-                <line text="annotation match - no binding"/>
-                <line text="execution with annotation match"/>
-                <line text="annotation match - binding"/>
-                <line text="hello"/>
-            </stdout>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs151" title="Pointcut interfaces">
-        <compile files="pr130869.aj" options="-1.5">
-          <message kind="warning" line="30" text="no directly runnable classes"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs151" title="no ClassCastException with generic aspect and unknown type">
-        <compile files="pr131933.aj" options="-1.5">
-          <message kind="error" line="5" text="can't bind type name 'MyList'"/>
-        </compile>
-    </ajc-test> 
-
-    <!-- New features down here... when they arent big enough to have their own test file -->
-    
-    <ajc-test dir="features151/ptw" title="exposing withintype">
-        <compile files="ExposedType.java" options="-1.5"/>
-        <run class="ExposedType">
-          <stderr>
-            <line text="here I am execution(void ExposedTypeOne.foo()): for class ExposedTypeOne"/>
-            <line text="here I am execution(void ExposedTypeTwo.foo()): for class ExposedTypeTwo"/>
-            <line text="here I am execution(void ExposedTypeThree.foo()): for class ExposedTypeThree"/>
-          </stderr>
-        </run>
-    </ajc-test>  
-    
-    <ajc-test dir="features151/swallowedExceptions" title="swallowed exceptions">
-        <compile files="SwallowedException.java" options="-Xlint:warning">
-            <message kind="warning" line="11" text="Exception swallowed in catch block"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="features151/swallowedExceptions" title="swallowed exceptions with xlint">
-        <compile files="SwallowedException.java">
-        </compile>
-    </ajc-test>
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc151/ataround.xml b/tests/src/test/java/org/aspectj/systemtest/ajc151/ataround.xml
deleted file mode 100644
index d8b625823..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc151/ataround.xml
+++ /dev/null
@@ -1,379 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<!-- AspectJ v1.5.1 Tests -->
-<suite>
-    
-    
-     <ajc-test dir="features151/ataround" title="code style - basic">
-        <compile files="X1.java" options="-1.5"/>
-        <run class="X1">
-          <stderr>
-             <line text="advice from code aspect"/>
-             <line text="faked"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="features151/ataround" title="annotation style - basic - noinline">
-        <compile files="A1.java" options="-1.5 -XnoInline"/>
-        <run class="A1">
-          <stderr>
-             <line text="advice from ataj aspect"/>
-             <line text="faked"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="features151/ataround" title="annotation style - basic">
-        <compile files="A1.java" options="-1.5"/>
-        <run class="A1">
-          <stderr>
-             <line text="advice from ataj aspect"/>
-             <line text="faked"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    
-    
-     
-     <ajc-test dir="features151/ataround" title="code style - correct usage, binding and passing same target for call">
-        <compile files="X4.java" options="-1.5"/>
-        <run class="X4">
-          <stderr>
-             <line text="advice from code aspect"/>
-             <line text="1faked"/>
-          </stderr>
-        </run>
-     </ajc-test>
-    
-     <ajc-test dir="features151/ataround" title="annotation style - correct usage, binding and passing same target for call - noinline">
-        <compile files="A4.java" options="-1.5 -XnoInline"/>
-        <run class="A4">
-          <stderr>
-             <line text="advice from ataj aspect"/>
-             <line text="1faked"/>
-          </stderr>
-        </run>
-     </ajc-test>   
-     
-     <ajc-test dir="features151/ataround" title="annotation style - correct usage, binding and passing same target for call">
-        <compile files="A4.java" options="-1.5"/>
-        <run class="A4">
-          <stderr>
-             <line text="advice from ataj aspect"/>
-             <line text="1faked"/>
-          </stderr>
-        </run>
-     </ajc-test>   
-     
-     
-     
-     
-     <ajc-test dir="features151/ataround" title="code style - correct usage, binding and passing new target for call">
-        <compile files="X42.java" options="-1.5"/>
-        <run class="X42">
-          <stderr>
-             <line text="advice from code aspect"/>
-             <line text="2faked"/>
-          </stderr>
-        </run>
-     </ajc-test>
-    
-     <ajc-test dir="features151/ataround" title="annotation style - correct usage, binding and passing new target for call - noinline">
-        <compile files="A42.java" options="-1.5 -XnoInline"/>
-        <run class="A42">
-          <stderr>
-             <line text="advice from ataj aspect"/>
-             <line text="2faked"/>
-          </stderr>
-        </run>
-     </ajc-test>   
-     
-     <ajc-test dir="features151/ataround" title="annotation style - correct usage, binding and passing new target for call">
-        <compile files="A42.java" options="-1.5"/>
-        <run class="A42">
-          <stderr>
-             <line text="advice from ataj aspect"/>
-             <line text="2faked"/>
-          </stderr>
-        </run>
-     </ajc-test>   
-     
-     
-     
-     
-     
-     <ajc-test dir="features151/ataround" title="code style - forget to pass target">
-        <compile files="X2.java" options="-1.5">
-          <message kind="error" line="7" text="too few arguments to proceed, expected 2"/>
-        </compile>
-     </ajc-test>
-    
-     <ajc-test dir="features151/ataround" title="annotation style - forget to pass target">
-        <compile files="A2.java" options="-1.5">
-          <message kind="error" line="7" text="too few arguments to proceed, expected 2"/>
-        </compile>
-     </ajc-test>
-     
-     
-     
-     
-     <ajc-test dir="features151/ataround" title="code style - bind this on call - change on proceed - no effect">
-        <compile files="X7.java" options="-1.5"/>
-        <run class="X7">
-          <stderr>
-             <line text="advice from code aspect"/>
-             <line text="1faked"/>
-          </stderr>
-        </run>
-     </ajc-test>
-     
-     <ajc-test dir="features151/ataround" title="annotation style - bind this on call - change on proceed - no effect - noinline">
-        <compile files="A7.java" options="-1.5 -XnoInline"/>
-        <run class="A7">
-          <stderr>
-             <line text="advice from ataj aspect"/>
-             <line text="1faked"/>
-          </stderr>
-        </run>
-     </ajc-test>
-     
-     <ajc-test dir="features151/ataround" title="annotation style - bind this on call - change on proceed - no effect">
-        <compile files="A7.java" options="-1.5"/>
-        <run class="A7">
-          <stderr>
-             <line text="advice from ataj aspect"/>
-             <line text="1faked"/>
-          </stderr>
-        </run>
-     </ajc-test>
-     
-     
-     
-     <ajc-test dir="features151/ataround" title="code style - bind this on execution - change on proceed - works">
-        <compile files="X8.java" options="-1.5"/>
-        <run class="X8">
-          <stderr>
-             <line text="advice from code aspect"/>
-             <line text="2faked"/>
-          </stderr>
-        </run>
-     </ajc-test>
-     
-     <ajc-test dir="features151/ataround" title="annotation style - bind this on execution - change on proceed - works - noinline">
-        <compile files="A8.java" options="-1.5 -XnoInline"/>
-        <run class="A8">
-          <stderr>
-             <line text="advice from ataj aspect"/>
-             <line text="2faked"/>
-          </stderr>
-        </run>
-     </ajc-test>
-
-     <ajc-test dir="features151/ataround" title="annotation style - bind this on execution - change on proceed - works">
-        <compile files="A8.java" options="-1.5"/>
-        <run class="A8">
-          <stderr>
-             <line text="advice from ataj aspect"/>
-             <line text="2faked"/>
-          </stderr>
-        </run>
-     </ajc-test>
-     
-
-
- 
-     <ajc-test dir="features151/ataround" title="code style - incorrect arg types">
-        <compile files="X3.java" options="-1.5">
-          <message kind="error" line="7" text="Type mismatch: cannot convert from String to M"/>
-          <message kind="error" line="7" text="Type mismatch: cannot convert from M to String"/>
-        </compile>
-     </ajc-test>
-    
-     <ajc-test dir="features151/ataround" title="annotation style - incorrect arg types">
-        <compile files="A3.java" options="-1.5">
-          <message kind="error" line="7" text="too few arguments to proceed, expected 2"/>
-        </compile>
-     </ajc-test>    
-     
-     
-     
-
-     <ajc-test dir="features151/ataround" title="code style - bind this and target on execution - change on proceed - works">
-        <compile files="X9.java" options="-1.5"/>
-        <run class="X9">
-          <stderr>
-             <line text="advice from code aspect"/>
-             <line text="3faked"/>
-          </stderr>
-        </run>
-     </ajc-test>
-     
-     <ajc-test dir="features151/ataround" title="annotation style - bind this and target on execution - change on proceed - works - noinline">
-        <compile files="A9.java" options="-1.5 -XnoInline"/>
-        <run class="A9">
-          <stderr>
-             <line text="advice from ataj aspect"/>
-             <line text="3faked"/>
-          </stderr>
-        </run>
-     </ajc-test> 
-     
-     <ajc-test dir="features151/ataround" title="annotation style - bind this and target on execution - change on proceed - works">
-        <compile files="A9.java" options="-1.5"/>
-        <run class="A9">
-          <stderr>
-             <line text="advice from ataj aspect"/>
-             <line text="3faked"/>
-          </stderr>
-        </run>
-     </ajc-test> 
-     
-     
-     
-     
-
-     <ajc-test dir="features151/ataround" title="code style - bind this and target on call - change on proceed - works">
-        <compile files="X10.java" options="-1.5"/>
-        <run class="X10">
-          <stderr>
-             <line text="advice from code aspect"/>
-             <line text="3faked"/>
-          </stderr>
-        </run>
-     </ajc-test>     
-     
-     <ajc-test dir="features151/ataround" title="annotation style - bind this and target on call - change on proceed - works - noinline">
-        <compile files="A10.java" options="-1.5"/>
-        <run class="A10">
-          <stderr>
-             <line text="advice from ataj aspect"/>
-             <line text="3faked"/>
-          </stderr>
-        </run>
-     </ajc-test>     
-
-     <ajc-test dir="features151/ataround" title="annotation style - bind this and target on call - change on proceed - works">
-        <compile files="A10.java" options="-1.5"/>
-        <run class="A10">
-          <stderr>
-             <line text="advice from ataj aspect"/>
-             <line text="3faked"/>
-          </stderr>
-        </run>
-     </ajc-test>     
-     
-     
-     
-     
-     <ajc-test dir="features151/ataround" title="breaking it - one">
-        <compile files="Break1.java" options="-1.5"/>
-        <run class="Break1">
-          <stderr>
-             <line text="advice from ataj aspect"/>
-             <line text="1faked"/>
-          </stderr>
-        </run>
-     </ajc-test>     
-     
-     <ajc-test dir="features151/ataround" title="breaking it - two">
-        <compile files="Break2.java" options="-1.5"/>
-        <run class="Break2">
-          <stderr>
-             <line text="advice from ataj aspect"/>
-             <line text="1faked"/>
-          </stderr>
-        </run>
-     </ajc-test>     
-     
-     
-     <ajc-test dir="features151/ataround" title="bug case one">
-        <compile files="BugCase1.java" options="-1.5"/>
-        <run class="BugCase1">
-          <stderr>
-             <line text="advice running"/>
-             <line text="Setting age to 10"/>
-          </stderr>
-        </run>
-     </ajc-test>     
-    
-     <ajc-test dir="features151/ataround" title="bug case two">
-        <compile files="BugCase2.java" options="-1.5"/>
-        <run class="BugCase2">
-          <stderr>
-             <line text="advice running"/>
-             <line text="Setting age to 10"/>
-          </stderr>
-        </run>
-     </ajc-test>     
-     
-     
-     <ajc-test dir="features151/ataround" title="multiple args">
-        <compile files="MultipleArgs.java" options="-1.5"/>
-        <run class="MultipleArgs">
-          <stderr>
-             <line text="advice running"/>
-             <line text="advice running"/>
-             <line text="advice running"/>
-          </stderr>
-        </run>
-     </ajc-test>     
-    
-   
-     
-     
-     
-     
-     
-     <ajc-test dir="features151/ataround" title="code style - changing target for call - reverse order">
-        <compile files="X6.java" options="-1.5"/>
-        <run class="X6">
-          <stderr>
-             <line text="advice from code aspect"/>
-             <line text="2faked"/>
-          </stderr>
-        </run>
-     </ajc-test>
-    
-     <ajc-test dir="features151/ataround" title="annotation style - changing target for call - reverse order">
-        <compile files="A6.java" options="-1.5"/>
-        <run class="A6">
-          <stderr>
-             <line text="advice from ataj aspect"/>
-             <line text="2faked"/>
-          </stderr>
-        </run>
-     </ajc-test>   
-     
-     
-     
-     
-     
-
-
-
-
-
-
-     <ajc-test dir="features151/ataround" title="code style - works with subset of arguments in advice">
-        <compile files="X11.java" options="-1.5"/>
-        <run class="X11">
-          <stderr>
-             <line text="advice from code aspect"/>
-             <line text="3x_z"/>
-          </stderr>
-        </run>
-     </ajc-test>
-     
-      <ajc-test dir="features151/ataround" title="annotation style - works with subset of arguments in advice">
-        <compile files="A11.java" options="-1.5"/>
-        <run class="A11">
-          <stderr>
-             <line text="advice from code aspect"/>
-             <line text="3x_z"/>
-          </stderr>
-        </run>
-     </ajc-test>
-
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc151/newarray_joinpoint.xml b/tests/src/test/java/org/aspectj/systemtest/ajc151/newarray_joinpoint.xml
deleted file mode 100644
index fb11fa596..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc151/newarray_joinpoint.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<!-- AspectJ v1.5.1 Tests -->
-<suite>
-    
-    <ajc-test dir="features151/newarrayjoinpoint" title="basics">
-        <compile files="One.java" options="-1.5 -showWeaveInfo -Xjoinpoints:arrayconstruction">
-          <message kind="weave" text="Join point 'constructor-call(void java.lang.Integer[].&lt;init&gt;(int))' in Type 'One' (One.java:4) advised by before advice from 'X' (One.java:9)"/>
-        </compile>
-        <run class="One">
-          <stderr>
-             <line text="advice running"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    
-    <ajc-test dir="features151/newarrayjoinpoint" title="basics - 2">
-        <compile files="Two.java" options="-1.5 -showWeaveInfo -Xjoinpoints:arrayconstruction">
-          <message kind="weave" text="Join point 'constructor-call(void java.lang.Integer[].&lt;init&gt;(int))' in Type 'Two' (Two.java:4) advised by before advice from 'X' (Two.java:9)"/>
-        </compile>
-        <run class="Two">
-          <stderr>
-             <line text="advice running"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="features151/newarrayjoinpoint" title="shouldnt match">
-        <compile files="Three.java" options="-1.5 -showWeaveInfo -Xjoinpoints:arrayconstruction">
-          <message kind="warning" line="9" text="advice defined in X has not been applied [Xlint:adviceDidNotMatch]"/>
-          <message kind="warning" line="10" text="advice defined in X has not been applied [Xlint:adviceDidNotMatch]"/>
-          <message kind="warning" line="11" text="advice defined in X has not been applied [Xlint:adviceDidNotMatch]"/>
-          <message kind="warning" line="12" text="advice defined in X has not been applied [Xlint:adviceDidNotMatch]"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="features151/newarrayjoinpoint" title="thisjoinpoint">
-        <compile files="Four.java" options="-1.5 -showWeaveInfo -Xjoinpoints:arrayconstruction">
-          <message kind="weave" text="Join point 'constructor-call(void java.lang.Integer[].&lt;init&gt;(int))' in Type 'Four' (Four.java:4) advised by before advice from 'X' (Four.java:10)"/>
-		  <message kind="weave" text="Join point 'constructor-call(void Foo.&lt;init&gt;(int))' in Type 'Four' (Four.java:5) advised by before advice from 'X' (Four.java:13)"/>
-        </compile>
-        <run class="Four">
-          <stderr>
-             <line text="tjp1=>call(java.lang.Integer[](int))"/>
-			 <line text="tjp2=>call(Foo(int))"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-     <ajc-test dir="features151/newarrayjoinpoint" title="different advice kinds">
-        <compile files="Five.java" options="-1.5 -showWeaveInfo -Xjoinpoints:arrayconstruction">
-          <message kind="weave" text="Join point 'constructor-call(void java.lang.Integer[].&lt;init&gt;(int))' in Type 'Five' (Five.java:4) advised by around advice from 'Z' (Five.java:16)"/>
-		  <message kind="weave" text="Join point 'constructor-call(void java.lang.Integer[].&lt;init&gt;(int))' in Type 'Five' (Five.java:4) advised by after advice from 'Y' (Five.java:12)"/>
-		  <message kind="weave" text="Join point 'constructor-call(void java.lang.Integer[].&lt;init&gt;(int))' in Type 'Five' (Five.java:4) advised by afterReturning advice from 'Y' (Five.java:13)"/>
-		  <message kind="weave" text="Join point 'constructor-call(void java.lang.Integer[].&lt;init&gt;(int))' in Type 'Five' (Five.java:4) advised by before advice from 'X' (Five.java:9)"/>
-        </compile>
-        <run class="Five">
-          <stderr>
-             <line text="before"/>
-             <line text="around!"/>
-             <line text="after"/>
-             <line text="after returning"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="features151/newarrayjoinpoint" title="args">
-        <compile files="Six.java" options="-1.5 -Xjoinpoints:arrayconstruction"/>
-        <run class="Six">
-          <stderr>
-             <line text="Array size = 5"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="features151/newarrayjoinpoint" title="basic primitive array creation">
-        <compile files="Seven.java" options="-1.5 -Xjoinpoints:arrayconstruction"/>
-        <run class="Seven">
-          <stderr>
-             <line text="advice running"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="features151/newarrayjoinpoint" title="multi dimensional array creation">
-        <compile files="Eight.java" options="-1.5 -Xjoinpoints:arrayconstruction"/>
-        <run class="Eight">
-          <stderr>
-             <line text="advice running 2"/>
-             <line text="advice running 1"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="features151/newarrayjoinpoint" title="multi dimensional array args">
-        <compile files="Nine.java" options="-1.5 -Xjoinpoints:arrayconstruction"/>
-        <run class="Nine">
-          <stderr>
-             <line text="advice running 2 (5,6)"/>
-             <line text="advice running 1 (2,4)"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="features151/newarrayjoinpoint" title="using target and after returning">
-        <compile files="Ten.java" options="-1.5 -showWeaveInfo -Xjoinpoints:arrayconstruction">
-          <message kind="warning" line="13" text="advice defined in X has not been applied [Xlint:adviceDidNotMatch]"/>
-          <message kind="warning" line="17" text="advice defined in X has not been applied [Xlint:adviceDidNotMatch]"/>
-          <message kind="weave" text="Join point 'constructor-call(void Ten.&lt;init&gt;())' in Type 'Ten' (Ten.java:4) advised by afterReturning advice from 'X' (Ten.java:21)"/>
-          <message kind="weave" text="Join point 'constructor-call(void int[].&lt;init&gt;(int))' in Type 'Ten' (Ten.java:5) advised by afterReturning advice from 'X' (Ten.java:21)"/>
-        </compile>
-        <run class="Ten">
-          <stderr>
-             <line text="afterReturning class Ten"/>
-             <line text="afterReturning class [I"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="features151/newarrayjoinpoint" title="using it for real">
-        <compile files="Eleven.java" options="-1.5 -Xjoinpoints:arrayconstruction">
-          <!--message kind="weave" text="Join point 'constructor-call(void Ten.&lt;init&gt;())' in Type 'Ten' (Ten.java:4) advised by afterReturning advice from 'X' (Ten.java:21)"/>
-          <message kind="weave" text="Join point 'constructor-call(void int[].&lt;init&gt;(int))' in Type 'Ten' (Ten.java:5) advised by afterReturning advice from 'X' (Ten.java:21)"/-->
-        </compile>
-        <run class="Eleven">
-          <stderr>
-             <line text="Found the interesting array"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="features151/newarrayjoinpoint" title="differentiating array types">
-        <compile files="Twelve.java" options="-1.5 -Xjoinpoints:arrayconstruction"/>
-        <run class="Twelve">
-          <stderr>
-             <line text="It is class [I"/>
-             <line text="Is it an array? true"/>
-             <line text="Component type is int"/>
-             <line text="--"/>
-             <line text="It is class [Ljava.lang.Integer;"/>
-             <line text="Is it an array? true"/>
-             <line text="Component type is class java.lang.Integer"/>
-             <line text="--"/>
-             <line text="It is class [[Ljava.lang.String;"/>
-             <line text="Is it an array? true"/>
-             <line text="Component type is class [Ljava.lang.String;"/>
-             <line text="--"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="features151/newarrayjoinpoint" title="structure model">
-        <compile files="Five.java" options="-1.5 -emacssym -Xjoinpoints:arrayconstruction"/>
-    </ajc-test>
-    
-     <ajc-test dir="features151/newarrayjoinpoint" title="option deactivated - no match expected">
-        <compile files="One.java" options="-1.5 -showWeaveInfo">
-           <message kind="warning" line="9" text="advice defined in X has not been applied [Xlint:adviceDidNotMatch]"/>
-           <message kind="warning" line="9" text="There are no join points for array construction unless -Xjoinpoints:arrayconstruction is specified"/>
-        </compile>
-    </ajc-test>
-    
-
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc151/serialversionuid.xml b/tests/src/test/java/org/aspectj/systemtest/ajc151/serialversionuid.xml
deleted file mode 100644
index f7b05af63..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc151/serialversionuid.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<!-- AspectJ v1.5.1 Tests -->
-<suite>
-    
-    <ajc-test dir="features151/serialveruid" title="basic">
-        <compile files="Basic.java" options="-1.5 -XaddSerialVersionUID"/>
-        <run class="Basic">
-          <stderr>
-             <line text="SerialVersionUID is -7868414887470674287"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="features151/serialveruid" title="basic - lint">
-        <compile files="Basic.java" options="-1.5 -XaddSerialVersionUID -Xlint:warning">
-          <message kind="warning" text="calculated SerialVersionUID for type Basic"/>
-        </compile>
-        <run class="Basic">
-          <stderr>
-             <line text="SerialVersionUID is -7868414887470674287"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="features151/serialveruid" title="horrible">
-        <compile files="BigHorribleClass.java,AnAspect.java" options="-1.5 -XaddSerialVersionUID -Xlint:warning">
-          <message kind="warning" text="calculated SerialVersionUID for type BigHorribleClass"/>
-        </compile>
-        <run class="BigHorribleClass">
-          <stderr>
-             <line text="SerialVersionUID is -3425710461209091702"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-	<ajc-test dir="features151/serialveruid" title="abstract class">
-	  <compile files="TwoTypes.java,Test.java,ATest.java" options="-1.5 -XaddSerialVersionUID -Xlint:warning">
-          <message kind="warning" text="calculated SerialVersionUID for type TwoTypes"/>
-          <message kind="warning" text="calculated SerialVersionUID for type com.testware.ejb.common.Test to be -1674849842374764518L"/>
-          <message kind="warning" text="calculated SerialVersionUID for type com.testware.ejb.common.ATest to be -7300724421810308152L"/>
-	  </compile>
-	  <run class="TwoTypes">
-	    <stderr>
-	      <line text="Test SerialVersionUID is -1674849842374764518"/>
-		  <line text="ATest SerialVersionUID is -7300724421810308152"/>
-	    </stderr>
-	  </run>
-	</ajc-test>
-    
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc152/ajc152.xml b/tests/src/test/java/org/aspectj/systemtest/ajc152/ajc152.xml
deleted file mode 100644
index c7a917688..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc152/ajc152.xml
+++ /dev/null
@@ -1,777 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<!-- AspectJ v1.5.2 Tests -->
-<suite>
-
-    <ajc-test dir="bugs152/pr135001" title="aspect libraries and asm">
-      <compile files="AbstractAspect.java" outjar="lib.jar" options="-1.5"/>
-      <compile files="Foo.java,ConcreteAspect.java" classpath="lib.jar" options="-1.5 -showWeaveInfo">
-        <message kind="weave" text="Join point 'method-call(void Foo.foo())' in Type 'Foo' (Foo.java:3) advised by around advice from 'ConcreteAspect' (AbstractAspect.java:5)"/>
-      </compile>
-      <run class="Foo">
-         <stderr>
-           <line text="In the advice!"/>
-         </stderr>
-      </run>
-    </ajc-test>
-    
-	<ajc-test dir="bugs152/pr122253" title="aspects14 - persingleton">
-     <compile files="Singleton.java"/>
-     <run class="Singleton">
-       <stderr>
-         <line text="hasAspect?  true : true"/>
-         <line text="aspectOf? SingletonInstance : SingletonInstance"/>
-         <line text="hasAspect?  true : true"/>
-         <line text="aspectOf? SingletonInstance : SingletonInstance"/>
-       </stderr>
-     </run>
-    </ajc-test>
-
-	<ajc-test dir="bugs152/pr122253" title="aspects14 - percflow">
-     <compile files="PerCflow.java"/>
-     <run class="PerCflow">
-       <stderr>
-         <line text="before"/>
-         <line text="hasAspect?  false : false"/>
-         <line text="aspectOf? null : null"/>
-         <line text="during"/>
-         <line text="hasAspect?  true : true"/>
-         <line text="aspectOf? PerCflowInstance : PerCflowInstance"/>
-         <line text="after"/>
-         <line text="hasAspect?  false : false"/>
-         <line text="aspectOf? null : null"/>
-       </stderr>
-     </run>
-    </ajc-test>
-     
-     <ajc-test dir="bugs152/pr122253" title="aspects14 - perthis">
-     <compile files="PerThis.java"/>
-     <run class="PerThis">
-       <stderr>
-         <line text="before"/>
-         <line text="hasAspect?  false : false"/>
-         <line text="aspectOf? null : null"/>
-         <line text="during"/>
-         <line text="hasAspect?  true : true"/>
-         <line text="aspectOf? PerThisInstance : PerThisInstance"/>
-         <line text="after"/>
-         <line text="hasAspect?  false : false"/>
-         <line text="aspectOf? null : null"/>
-       </stderr>
-     </run>
-    </ajc-test>
-        
-     <ajc-test dir="bugs152/pr122253" title="aspects14 - pertypewithin">
-     <compile files="PerTypeWithin.java"/>
-     <run class="PerTypeWithin">
-       <stderr>
-         <line text="before"/>
-         <line text="hasAspect?  false : false"/>
-         <line text="aspectOf? null : null"/>
-         <line text="during"/>
-         <line text="hasAspect?  true : true"/>
-         <line text="aspectOf? PerTypeWithinInstance : PerTypeWithinInstance"/>
-         <line text="after"/>
-         <line text="hasAspect?  false : false"/>
-         <line text="aspectOf? null : null"/>
-       </stderr>
-     </run>
-    </ajc-test>
- 
-    
-	<ajc-test dir="bugs152/pr148536" title="NPE for unknown annotation">
-     <compile files="Bug.java" options="-1.5">
-       <message kind="error" line="2" text="SomeAnnotation cannot be resolved to a type"/>
-     </compile>
-    </ajc-test>
-    
-	<ajc-test dir="bugs152/pr148537" title="classcast annotation value">
-     <compile files="MyClass.java,MyAspect.java" options="-1.5"/>
-    </ajc-test>
-    
-	<ajc-test dir="bugs152/pr148545" title="nosuchmethoderror for privileged aspect">
-      <compile files="MyClass.java,MyAspect.java,MyAnnotation.java,MyEnum.java" options="-1.5"/>
-      <run class="MyClass"/>
-    </ajc-test>
-    
-	<ajc-test dir="bugs152/pr148545" title="nosuchmethoderror for privileged aspect - 2">
-      <compile files="MyClass.java,MyAspect2.java,MyAnnotation.java,MyEnum.java" options="-1.5 -showWeaveInfo">
-        <message kind="weave" text="Join point 'method-execution(void MyClass.test())' in Type 'MyClass' (MyClass.java:8) advised by around advice from 'MyAspect2' (MyAspect2.java:5)"/>
-      </compile>
-      <run class="MyClass"/>
-    </ajc-test>
-
-	<ajc-test dir="bugs152/pr126355" title="bizarre generic error with itds">
-     <compile files="Pair.java" options="-1.5"/>
-     <compile files="Test.java" options="-1.5"/>
-    </ajc-test>
-    
-	<ajc-test dir="bugs152/pr126355" title="bizarre generic error with itds - 2">
-     <compile files="Pair.java" options="-1.5"/>
-     <compile files="Test.java" options="-1.5"/>
-    </ajc-test>
-    
-	<ajc-test dir="bugs152/pr145950" title="fails to discover Serializable">
-     <compile files="Indirect.java" options="-1.5 -XaddSerialVersionUID"/>
-     <run class="Indirect">
-       <stderr>
-         <line text="SerialVersionUID is "/>
-       </stderr>
-     </run>
-    </ajc-test>
-
-    <ajc-test dir="bugs152/pr132349" title="ITD on inner type of generic type">
-     <compile files="TopLevelType.java" options="-1.5"/>
-     <run class="TopLevelType"/>
-    </ajc-test>
-    
-    
-    <ajc-test dir="bugs152/pr144602" title="atAJ perthis aspect verification error">
-     <compile files="MyAspect.aj" options="-1.5"/>
-     <run class="MyAspect"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/pr132349" title="ITD on inner type of generic type - 2">
-     <compile files="TopLevelType2.java" options="-1.5">
-       <message kind="error" line="12"/> <!-- error message is currently crap - its a parser message -->
-     </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/pr132349" title="ITD on inner type of generic type - 3">
-     <compile files="TopLevelType3.java" options="-1.5">
-       <message kind="error" line="12" text="Cannot make inter-type declarations on parameterized types"/>
-       <message kind="error" line="7" text="The method someMethod() is undefined for the type TopLevelType3.NestedType"/>
-     </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/pr135865" title="misbehaving declare annotation">
-      <compile files="B.java,A.java" options="-1.5 -Xlint:ignore">
-      	<!--message kind="weave" text="Join point 'method-call(void B.foo())' in Type 'A' (A.java:32) advised by before advice from 'Aspect' (A.java:22) [with runtime test]"/>
-      	<message kind="weave" text="Join point 'method-call(void A.foo())' in Type 'A' (A.java:33) advised by before advice from 'Aspect' (A.java:22) [with runtime test]"/>
-      	<message kind="weave" text="' void B.goo()' (A.java:7) is annotated with @Ann method annotation from 'Aspect' (A.java:27)"/-->
-      </compile>
-      <run class="A">
-        <stdout>
-          <line text="Join point: call(void B.foo())"/>
-        </stdout>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/pr135865" title="misbehaving declare annotation - 2">
-      <compile files="A.java,B.java" options="-1.5 -Xlint:ignore">
-      	<!--message kind="weave" text="Join point 'method-call(void B.foo())' in Type 'A' (A.java:32) advised by before advice from 'Aspect' (A.java:22) [with runtime test]"/>
-      	<message kind="weave" text="Join point 'method-call(void A.foo())' in Type 'A' (A.java:33) advised by before advice from 'Aspect' (A.java:22) [with runtime test]"/>
-      	<message kind="weave" text="' void B.goo()' (A.java:7) is annotated with @Ann method annotation from 'Aspect' (A.java:27)"/-->
-      </compile>
-      <run class="A">
-        <stdout>
-          <line text="Join point: call(void B.foo())"/>
-        </stdout>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/pr129704" title="annotations and generics leading to BCException">
-      <compile files="A.java" options="-1.5"/>
-      <run class="A">
-        <stderr>
-          <line text="@Marker()"/>
-        </stderr>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/pr136026" title="verifyerror">
-      <compile files="CflowOrder.java" options="-1.5"/>
-      <run class="CflowOrder"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/pr136026" title="verifyerror - 2">
-      <compile files="CflowOrderOriginal.java" options="-1.5"/>
-      <run class="bugs.CflowOrderOriginal">
-        <stderr>
-          <line text="Starting CflowOrder.main(..)"/>
-          <line text="topAnnotated"/>
-          <!--line text=" Join point: call(void bugs.CflowOrderOriginal.A.foo())"/>
-          <line text=" Enclosing join point: execution(void bugs.CflowOrderOriginal.A.main(String[]))"/>
-          <line text=" Annotation: @bugs.CflowOrderOriginal$Annotation(value=A.foo)"/-->
-          <line text="nonTopAnnotated"/>
-          <!--line text=" Join point: call(void bugs.CflowOrderOriginal.B.foo())"/>
-          <line text=" Enclosing join point: execution(void bugs.CflowOrderOriginal.A.foo())"/>
-          <line text=" Annotation: @bugs.CflowOrderOriginal$Annotation(value=B.foo)"/-->
-          <line text="B.foo()"/>
-          <line text="A.foo()"/>
-          <line text="A.main(..)"/>
-          <line text="Ending CflowOrder.main(..)"/>
-        </stderr>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/pr136258" title="stack overflow">
-      <compile files="StatisticsTypeImpl.java" options="-1.5"/>
-      <run class="StatisticsTypeImpl"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/pr138384" title="method too big">
-      <compile files="BigMethod.java" options="-1.5"> <!-- will be 67628 bytes in the big method -->
-        <message kind="error" line="1" text="problem generating method BigMethod.i_am_a_big_method : Code size too big: 67629"/>
-      </compile>
-      <!--run class="BigMethod"/-->
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/pr138798" title="atWithinCodeBug">
-      <compile files="ErrorHandling.aj" options="-1.5"/>
-      <run class="ErrorHandling">
-         <stderr>
-           <line text="Caught in foo"/>
-         </stderr>
-      </run>      
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/pr138158" title="not at withincode - 1">
-      <compile files="Boo.java" options="-1.5 -showWeaveInfo">
-        <message kind="weave" text="Join point 'method-call(void Boo.m())' in Type 'Boo' (Boo.java:9) advised by before advice from 'X' (Boo.java:19)"/>
-      </compile>
-      <run class="Boo"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/pr138158" title="not at within - 3">
-      <compile files="Doo.java" options="-1.5 -showWeaveInfo">
-        <message kind="weave" text="Join point 'method-call(void java.io.PrintStream.println(java.lang.String))' in Type 'Soo' (Doo.java:20) advised by before advice from 'X' (Doo.java:25)"/>
-      </compile>
-      <run class="Doo"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/pr138158" title="not at withincode - 2">
-      <compile files="Foo.java" options="-1.5 -showWeaveInfo">
-        <message kind="weave" text="Join point 'method-call(void java.io.PrintStream.println(java.lang.String))' in Type 'Foo' (Foo.java:14) advised by before advice from 'X' (Foo.java:26)"/>
-		<message kind="weave" text="Join point 'method-call(void java.io.PrintStream.println(java.lang.String))' in Type 'Foo' (Foo.java:18) advised by before advice from 'X' (Foo.java:23)"/>
-      </compile>
-      <run class="Foo"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/pr137568" title="complicated generics declaration">
-      <compile files="C.java" options="-emacssym -1.5"/>
-      <run class="C"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/pr138143" title="npe on duplicate method with ataj">
-      <compile files="AspectClass.java" options="-1.5">
-        <message kind="error" line="7" text="Duplicate method incomingMessage() in type AspectClass"/>
-        <message kind="error" line="12" text="Duplicate method incomingMessage() in type AspectClass"/>
-        <!-- in e37 the TypeDeclaration.traverse(ASTVisitor,CompilationUnitScope) no longer checks 'ignoreFurtherInvestigation' so gets further -->
-        <message kind="warning" line="11" text="no match for this type name: Incoming [Xlint:invalidAbsoluteTypeName]"/>
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/pr137496" title="pointcuts and generics - B">
-      <compile files="B.java" options="-1.5 -showWeaveInfo">
-        <!--message kind="weave" text="Join point 'method-call(java.lang.String C.pm(java.lang.String))' in Type 'B' (B.java:20) advised by before advice from 'X' (B.java:26)"/-->
-        <message kind="weave" text="Join point 'method-call(java.lang.Object C.pm(java.lang.Object))' in Type 'B' (B.java:20) advised by before advice from 'X' (B.java:26)"/>
-        <!--message kind="weave" text="Join point 'method-call(java.lang.String C.pm2(java.lang.String))' in Type 'B' (B.java:21) advised by before advice from 'X' (B.java:27)"/-->
-      </compile>
-      <run class="B">
-        <stderr>
-          <line text="advice"/>
-          <line text="foo"/>
-        </stderr>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/pr137496" title="pointcuts and generics - D">
-      <compile files="D.java" options="-1.5 -showWeaveInfo">
-		<message kind="weave" text="Join point 'method-call(java.lang.String CImpl.pm(java.lang.String))' in Type 'D' (D.java:20) advised by before advice from 'X' (D.java:26)"/>
-		<message kind="weave" text="Join point 'method-call(java.lang.String CImpl.pm2(java.lang.String))' in Type 'D' (D.java:21) advised by before advice from 'X' (D.java:27)"/>
-      </compile>
-      <run class="D">
-        <stderr>
-          <line text="advice"/>
-          <line text="foo"/>
-          <line text="advice2"/>
-          <line text="foo"/>
-        </stderr>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/pr137496" title="pointcuts and generics - E">
-      <compile files="E.java" options="-1.5 -showWeaveInfo">
-      	<message kind="weave" text="Join point 'method-call(java.lang.Object C.pm(java.lang.Object))' in Type 'E' (E.java:18) advised by before advice from 'X' (E.java:23)"/>
-      </compile>
-      <run class="E">
-        <stderr>
-          <line text="advice"/>
-          <line text="foo"/>
-        </stderr>
-      </run>
-    </ajc-test>
-    
-    
-    <ajc-test dir="bugs152/pr137496" title="pointcuts and generics - F">
-      <compile files="F.java" options="-1.5 -showWeaveInfo">
-        <message kind="weave" text="Join point 'method-call(java.lang.Object C.pm(java.lang.Object))' in Type 'F' (F.java:18) advised by before advice from 'X' (F.java:23)"/>
-      </compile>
-      <run class="F">
-        <stderr>
-          <line text="advice"/>
-          <line text="foo"/>
-        </stderr>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/pr137496" title="pointcuts and generics - G">
-      <compile files="G.java" options="-1.5 -showWeaveInfo">
-        <message kind="warning" line="23" text="advice defined in X has not been applied [Xlint:adviceDidNotMatch]"/>
-      </compile>
-      <run class="G">
-        <stderr>
-          <line text="foo"/>
-        </stderr>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/pr137496" title="pointcuts and generics - H">
-      <compile files="H.java" options="-1.5 -showWeaveInfo">
-        <message kind="weave" text="Join point 'method-call(java.lang.Object C.pm(java.lang.Object))' in Type 'H' (H.java:20) advised by around advice from 'X' (H.java:26)"/>
-      </compile>
-      <run class="H">
-        <stderr>
-          <line text="advice"/>
-        </stderr>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/binaryDecp" title="incorrect overrides evaluation - 1.3">
-      <compile files="SubClassLoader.java,SubSubClassLoader.java" options="-1.3" outjar="lib.jar"/>
-      <compile files="X.aj" inpath="lib.jar" options="-showWeaveInfo">
-        <message kind="weave" text="Setting superclass of type 'SubSubClassLoader' (SubSubClassLoader.java) to 'SubClassLoader' (X.aj)"/>
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/binaryDecp" title="incorrect overrides evaluation - 1.4">
-      <compile files="IsItSynthetic.java" options="-1.5"/>
-      <compile files="Top.java" options="-source 1.5 -target 1.5" outjar="a.jar"/>
-      <compile files="Bottom.java" classpath="$sandbox/a.jar" options="-source 1.4 -target 1.4" outjar="b.jar"/>
-      <compile files="Middle.java" classpath="$sandbox/a.jar" options="-source 1.4 -target 1.4" outjar="c.jar"/>
-      <compile files="X2.aj" classpath="$sandbox/a.jar;$sandbox/b.jar;$sandbox/c.jar" options="-Xlint:ignore" outjar="x.jar"/>
-      <run class="Bottom" classpath="a.jar;b.jar;c.jar;x.jar" ltw="aop.xml"/>
-        <!--message kind="weave" text="Setting superclass of type 'Bottom' (Bottom.java) to 'Middle' (X2.aj)"/-->
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/binaryDecp" title="incorrect overrides evaluation - 1.5">
-      <compile files="SubClassLoader.java,SubSubClassLoader.java" options="-1.5" outjar="lib.jar"/>
-      <compile files="X.aj" inpath="lib.jar" options="-showWeaveInfo">
-        <message kind="weave" text="Setting superclass of type 'SubSubClassLoader' (SubSubClassLoader.java) to 'SubClassLoader' (X.aj)"/>
-      </compile>
-    </ajc-test>
-    
-
-    <ajc-test dir="bugs152/pr129282" title="no unnecessary declaration of thrown exception warning - 1">
-      <compile files="MethodExecution.aj" options="-warn:+unusedThrown">
-		<message kind="warning" line="30" text="The declared exception SQLException is not actually thrown by the method needsToThrow() from type C"/>
-	  </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs152/pr129282" title="no unnecessary declaration of thrown exception warning - 2">
-      <compile files="MethodCall.aj" options="-warn:+unusedThrown">
-		<message kind="warning" line="36" text="The declared exception FileNotFoundException is not actually thrown by the method m4() from type C1"/>
-	  </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs152/pr129282" title="no unnecessary declaration of thrown exception warning - 3">
-      <compile files="InnerMethodCall.aj" options="-warn:+unusedThrown">
-		<message kind="warning" line="44" text="The declared exception FileNotFoundException is not actually thrown by the method m4() from type C1"/>
-	  </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs152/pr129282" title="no unnecessary declaration of thrown exception warning - 4">
-      <compile files="AdviceExecution.aj" options="-1.5 -warn:+unusedThrown"/>
-	</ajc-test>
-
-    <ajc-test dir="bugs152/pr129282" title="no unnecessary declaration of thrown exception warning - 5">
-      <compile files="ExceptionHandler.aj" options="-warn:+unusedThrown">
-		<message kind="warning" line="34" text="The declared exception MyException is not actually thrown by the method throwingMethod2() from type C"/>
-	  </compile>
-	</ajc-test>
-
-    <ajc-test dir="bugs152/pr129282" title="no unnecessary declaration of thrown exception warning - 6">
-      <compile files="Initialization.aj" options="-warn:+unusedThrown"/>
-	</ajc-test>
-
-    <ajc-test dir="bugs152/pr129282" title="no unnecessary declaration of thrown exception warning - 7">
-      <compile files="ConstructorCall.aj" options="-warn:+unusedThrown"/>
-	</ajc-test>
-
-    <ajc-test dir="bugs152/pr129282" title="no unnecessary declaration of thrown exception warning - 8">
-      <compile files="ConstructorExecution.aj" options="-warn:+unusedThrown"/>
-	</ajc-test>
-
-    <ajc-test dir="bugs152/pr129282" title="no unnecessary declaration of thrown exception warning - 9">
-      <compile files="MethodCallInDiffClass.aj" options="-warn:+unusedThrown"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs152/pr129282" title="no unnecessary declaration of thrown exception warning - 10">
-      <compile files="InnerMethodCall2.aj" options="-warn:+unusedThrown"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs152/pr138215" pr="138215" title="Reference pointcut fails inside @DeclareWarning">
-      <compile files="pr138215.aj" options="-1.5">
-        <message kind="warning" line="17" text="no foos please"/>
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/pr138219" pr="138219" title="Can't use a FQ Reference pointcut in any pointcut expression referenced by a per-clause">
-      <compile files="PerThisWithReference.aj,SomeOtherType.aj,RegularPCWithReference.aj" options="-1.5">
-      </compile>
-      <run class="PerThisWithReference">
-        <stdout>
-         <line text="before PerThisWithReference:1"/>
-         <line text="before PerThisWithReference:2"/>
-        </stdout>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/pr130722" pr="130722" title="FQ Reference pointcut from perclause ref pc">
-      <compile files="test/Test.java,test/PointcutConsumer.aj,test1/PointcutProvider.aj"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/pr138220" pr="138220" title="@Aspect with reference pointcut in perclause">
-      <compile files="AtAspectWithPerClause.aj" options="-1.5">
-      </compile>
-    </ajc-test>
-    
-   <ajc-test dir="bugs152/pr144465" title="ltw with serialversionUID creation">
-      <compile files="BigHorribleClass.java"/>
-      <compile files="AnAspect.java" options="-1.4"/>
-      <run class="BigHorribleClass" ltw="aop1.xml">
-        <stderr>
-          <line text="weaveinfo Join point 'staticinitialization(void BigHorribleClass.&lt;clinit&gt;())'"/>
-          <line text="SerialVersionUID is "/>
-        </stderr>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/pr125480" title="aop.xml aspect inheriting abstract method ">
-        <compile files="HelloWorld.java"/>
-        <compile files="AbstractMethods.aj, ConcreteMethods.aj" options="-1.5"/>
-        <run class="HelloWorld" ltw="aop-tracing.xml">
-          <stdout>
-            <line text="advice running"/>
-            <line text="Hello World!"/>
-          </stdout>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/pr125480/case2" title="aop.xml aspect inheriting abstract method - code style">
-        <compile files="HelloWorld.java"/>
-        <compile files="AbstractMethods.aj, ConcreteMethods.aj" options="-1.5"/>
-        <run class="HelloWorld" ltw="aop-tracing.xml">
-          <stdout>
-            <line text="advice running"/>
-            <line text="Hello World!"/>
-          </stdout>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/pr142466" title="aop.xml aspect inheriting but not concretizing abstract method">
-        <compile files="HelloWorld.java"/>
-        <compile files="AbstractMethods.aj, ConcreteMethods.aj" options="-1.5"/>
-        <run class="HelloWorld" ltw="aop-tracing.xml">
-          <stderr>
-            <line text="error Abstract method 'void ConcreteMethods.foo(int)' cannot be concretized in XML:"/>
-            <line text="error Concrete-aspect 'TraceHelloWorld' could not be registered"/>
-            <line text="warning failure(s) registering aspects. Disabling weaver for class loader"/>
-          </stderr>
-          <stdout>
-            <line text="Hello World!"/>
-          </stdout>
-        </run>
-    </ajc-test>
-     
-    <ajc-test dir="bugs152/pr142466/case2" title="aop.xml aspect inheriting but not concretizing abstract method - 2">
-        <compile files="HelloWorld.java"/>
-        <compile files="AbstractMethods.aj, ConcreteMethods.aj" options="-1.5"/>
-        <run class="HelloWorld" ltw="aop-tracing.xml">
-          <stderr>
-            <line text="error Abstract method 'void AbstractMethods.test()' cannot be concretized in XML"/>
-            <line text="error Concrete-aspect 'TraceHelloWorld' could not be registered"/>
-            <line text="warning failure(s) registering aspects. Disabling weaver for class loader"/>
-          </stderr>
-          <stdout>
-            <line text="Hello World!"/>
-          </stdout>
-        </run>
-    </ajc-test>   
-
-    <ajc-test dir="bugs152/pr138223" pr="138223" title="Double at annotation matching (no binding)">
-      <compile files="DoubleAnnotationMatching.aj" options="-1.5">
-      </compile>
-      <run class="DoubleAnnotationMatching">
-        <stderr>
-          <line text="advice running at execution(void Foo.a())"/>
-          <line text="advice running at execution(void TxTrueFoo.a())"/>
-          <line text="advice running at execution(void TxTrueFoo.b())"/>
-          <line text="advice running at execution(void TxTrueFoo.c())"/>
-          <line text="advice running at execution(void TxFalseFoo.a())"/>
-        </stderr>
-      </run>
-    </ajc-test>
-
-    <ajc-test dir="bugs152/pr138286" pr="138286" title="No ClassCastException with perThis">
-      <compile files="A.aj" options="-1.5 -showWeaveInfo">      
-	    <message kind="weave" text="Join point 'initialization(void A.&lt;init&gt;())' in Type 'A' (A.aj:9) advised by before advice from 'A' (A.aj:13) [with runtime test]"/>
-	    <message kind="weave" text="Join point 'initialization(void Soo.&lt;init&gt;())' in Type 'Soo' (A.aj:31) advised by before advice from 'A' (A.aj:13) [with runtime test]"/>
-	    <message kind="weave" text="Join point 'initialization(void Goo.&lt;init&gt;())' in Type 'Goo' (A.aj:27) advised by before advice from 'A' (A.aj:13) [with runtime test]"/>
-	    <message kind="weave" text="Join point 'initialization(void Foo.&lt;init&gt;())' in Type 'Foo' (A.aj:25) advised by before advice from 'A' (A.aj:13) [with runtime test]"/>
-	    <message kind="weave" text="Join point 'initialization(void Boo.&lt;init&gt;())' in Type 'Boo' (A.aj:29) advised by before advice from 'A' (A.aj:13) [with runtime test]"/>
-      </compile>
-      <run class="A">
-        <stderr>
-          <line text="class Foo"/>
-          <line text="class Boo"/>
-          <line text="class Boo"/> <!-- this one is because of the super() call in Soo's default ctor -->
-          <line text="class Soo"/>
-        </stderr>
-      </run>
-    </ajc-test>
-
-	<ajc-test dir="bugs152/pr139749" pr="139749" title="Super calls in @AspectJ advice">
-	  <compile files="AroundAdvicePassingPjpAsArgToSuper.java" options="-1.5">
-	  </compile>
-	  <run class="a.b.c.AroundAdvicePassingPjpAsArgToSuper"/>
-	</ajc-test>
-	
-	  <ajc-test dir="bugs152/pr137235"  pr="137235"
-		title="directory with .jar extension: source and outjar">
-	    <compile files="directory.jar/Hello.java" outjar="directory.jar/run.custom"/>
-        <run class="Hello" classpath="$sandbox/directory.jar/run.custom">
-          <stdout>
-            <line text="Hello Java"/>
-          </stdout>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/pr137235"  pr="137235"
-		title="directory with .jar extension"  >
-	    <compile files="directory.jar/Before.java" outjar="directory.jar/inOne.custom" options="-1.4"/>
-	    <compile files="directory.jar/BeforeExec.aj" outjar="directory.jar/inTwo" options="-1.4"/>
-	    <compile files="directory.jar/Rename.aj" outjar="directory.jar/weave.jar" options="-1.4"/>
-	    <compile files="directory.jar/Hello.java" inpath="directory.jar/inOne.custom,directory.jar/inTwo" aspectpath="directory.jar/weave.jar" outjar="directory.jar/outJar.jar"/>
-        <run class="Hello" classpath="$sandbox/directory.jar/outJar.jar,$sandbox/directory.jar/weave.jar">
-          <stdout>
-            <line text="Before call"/>
-            <line text="Before execution"/>
-            <line text="Hello AspectJ not just Java"/>
-          </stdout>
-        </run>
-    </ajc-test>
-    
-	<ajc-test dir="bugs152/pr136393" title="NPE in makePreMethod">
-	  <compile files="World.aj" options="-1.5">
-  	    <message kind="warning" line="10" text="this affected type is not exposed to the weaver: java.lang.String [Xlint:typeNotExposedToWeaver]"/>
-	    <message kind="error" line="11" text="h cannot be resolved"/>
-	    <message kind="error" line="16" text="Stystems cannot be resolved"/>
-	  </compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs152/pr135068" title="ltw verifyerror">
-	    <compile files="C.java,Ajava.java" options="-1.5 -XnoInline"/>
-	    <run class="C"/>
-    </ajc-test>
-    
-    	<ajc-test dir="bugs152/pr135068" title="ltw verifyerror - 2">
-	    <compile files="C2.java,Ajava2.java" options="-1.5 -XnoInline">
-	      <message kind="error" line="13" text="advice can not be declared static"/>
-	    </compile>
-    </ajc-test>
-    
-    	<ajc-test dir="bugs152/pr135068" title="ltw verifyerror - 3">
-	    <compile files="t/C.java" options="-1.5"/>
-        <compile files="t/Ajava.java" options="-1.5">
-          <message kind="warning" line="13" text="advice defined"/>
-        </compile>
-        <run class="t.C" ltw="aop.xml"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/pr135068" title="ltw verifyerror - 4">
-	    <compile files="t/C2.java" options="-1.5"/>
-        <compile files="t/Ajava2.java" options="-1.5">
-	      <message kind="error" line="13" text="advice can not be declared static"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/pr142165" title="broken concretization">
-      <compile files="C.java" options="-1.5"/>
-      <compile files="A.java" options="-1.5"/>
-      <run class="C" ltw="aop.xml">
-        <stderr>
-          <line text="warning at Type 'AA' (no debug info available)::0 no match for this type name: SomeType [Xlint:invalidAbsoluteTypeName]"/>        
-          <line text="foo running"/>
- 	    </stderr>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/pr142165" title="broken concretization - 2">
-      <compile files="C.java" options="-1.5"/>
-      <compile files="A.java" options="-1.5"/>
-      <run class="C" ltw="aop2.xml">
-        <stderr>
-           <line text="foo running"/>
-        </stderr>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/pr142165" title="broken concretization - 3">
-      <compile files="C.java" options="-1.5"/>
-      <compile files="A.java" options="-1.5"/>
-      <run class="C" ltw="aop3.xml">
-        <stderr>
-           <line text="advice"/>
-           <line text="foo running"/>
-        </stderr>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/pr134425" title="super ITDs">
-      <compile files="Derived.aj" options="-1.5"/>
-      <run class="Derived"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/pr128443" title="covariance and decp - 1">
-      <compile files="Covariance.java" options="-1.5"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/pr147701" title="package for exception ignored">
-      <compile files="TestBean.java" options="-1.5"/>
-      <run class="a.b.c.TestBean"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/pr147701" title="package for exception ignored - 2">
-      <compile files="TestBean2.java" options="-1.5"/>
-      <run class="a.b.c.TestBean2"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs152/pr147701" title="package for exception ignored - 3">
-      <compile files="TestBean3.java" options="-1.5">
-        <message kind="error" text="@DeclareParents: defaultImpl=&quot;a.b.c.Impl&quot; does not implement the interface 'a.b.c.I'"/>
-      </compile>
-    </ajc-test>
-
-    <!-- wont work whilst the compiler BuildArgParser.setDebugOptions is always switching debug on -->
-    <ajc-test dir="bugs152/pr129408" title="long winded ataj messages">
-      <compile files="AtAj.java" options="-XterminateAfterCompilation -g:none -1.5"/>
-      <compile files="C.java" options="-g:none -1.5"/>
-      <run class="C" ltw="aop.xml">
-         <!-- should check for expected stderr output here -->
-      </run>
-    </ajc-test>
-
-	<ajc-test dir="ltw"
-      title="Ensure no weaving without included aspects"
-      keywords="reweavable">
-        <compile
-        	files="TestMain.java, Main.java"
-        >
-        </compile>	
-        <run class="TestMain" ltw="aop-optionsonly.xml">
-        	<stdout>
-                <line text="Main.main"/>
-                <line text="Main.test1"/>
-                <line text="Main.test2"/>
-            </stdout>
-        	<stderr>
-				<line text="info AspectJ Weaver Version"/>
-				<line text="info register classloader org.aspectj.weaver.loadtime.WeavingURLClassLoader"/>
-				<line text="info using"/>
-				<line text="info no aspects registered. Disabling weaver for class loader org.aspectj.weaver.loadtime.WeavingURLClassLoader"/>
-            </stderr>
-        </run>
-    </ajc-test>
-    
-   <ajc-test dir="ltw" title="weaveinfo messages with include and exclude">
-      <compile files="EmptyTest1.java, EmptyTest2.java"/>
-      <compile files="EmptyAspect.aj"/>
-      <run class="EmptyTest1" ltw="aop-emptytests.xml">
-        	<stdout>
-                <line text="EmptyTest1.main()"/>
-                <line text="EmptyTest2.main()"/>
-            </stdout>
-        <stderr>
-			<line text="info AspectJ Weaver Version"/>
-			<line text="info register classloader org.aspectj.weaver.loadtime.WeavingURLClassLoader"/>
-			<line text="info using configuration"/>
-			<line text="info register aspect EmptyAspect"/>
-			<line text="debug weaving"/>
-            <line text="debug not weaving"/>
-        </stderr>
-      </run>
-    </ajc-test>
-
-	<ajc-test dir="bugs152/pr147845" title="Generic abstract aspect hierarchy with bounds">
-      <compile files="GenericAspectHierarchy.aj" options="-1.5">
-        <message kind="warning" line="25" text="a match"/>
-        <message kind="warning" line="27" text="a match"/>     
-      </compile>
-    </ajc-test>
-    
-   <ajc-test dir="bugs152/pr147801" title="duplicate bridge methods">
-      <compile files="Advisor.aj" inpath="foo.jar" options="-1.5"/>
-      <run class="Foo">
-        <stderr>
-          <line text="x"/>
-          <line text="1) public Sub Foo.getParameterMetaData() throws MyException"/>
-        </stderr>
-      </run>
-    </ajc-test>
-    
-	<ajc-test dir="bugs152/pr148007" title="jrockit boolean fun">
-		<compile files="test/BooleanUnitTest.java, test/LoggingAspect.aj"/>
-		<run class="test.BooleanUnitTest"/>
-    </ajc-test>
-
-	<ajc-test dir="bugs152/pr148007/purejava" title="jrockit boolean fun (no aspects)">
-		<compile files="test/BooleanUnitTest.java, test/LoggingAspect.java" options="-inlineJSR"/>
-		<run class="test.BooleanUnitTest"/>
-    </ajc-test>
-    
-    <ajc-test dir="features152/synthetic" title="synthetic ajc$ members">
-        <compile files="TheWholeShow.aj" options="-1.5"/>
-        <run class="TheWholeShow"/>
-    </ajc-test>    
-    
-    <ajc-test dir="bugs152/pr148786" title="freaky new array joinpoint">
-        <compile files="A.java" options="-Xjoinpoints:arrayconstruction"/>
-        <run class="A">
-          <stderr>
-            <line text="new array: class [[B"/>
-          </stderr>
-        </run>
-    </ajc-test>    
-    
-    <ajc-test dir="bugs152/pr148727"  pr="148727"
-		title="integrated compilation calling aspectOf and hasAspect"  >
-	    <compile files="Asp.aj, Client.java" options="-source 1.4"/>
-        <run class="Client">
-          <stdout>
-            <line text="Can call aspectOf? Asp@"/>
-          </stdout>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="bugs152/pr148727"  pr="148727"
-		title="separate compilation calling aspectOf and hasAspect"  >
-	    <compile files="Asp.aj" outjar="asp.jar"/>
-	    <compile files="Client.java" classpath="asp.jar" options="-source 1.4"/>
-        <run class="Client">
-          <stdout>
-            <line text="Can call aspectOf? Asp@"/>
-          </stdout>
-        </run>
-    </ajc-test>
-
-
-   <ajc-test dir="bugs152" title="new iprogramelement method getParameterSignatures">
-      <compile files="pr141730a.java" options="-emacssym -Xset:minimalModel=false"/>
-    </ajc-test>
-
-   <ajc-test dir="bugs152" title="new iprogramelement method getParameterSignatures with generics">
-      <compile files="pr141730b.java" options="-1.5 -emacssym -Xset:minimalModel=false"/>
-    </ajc-test>
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc152/synchronization.xml b/tests/src/test/java/org/aspectj/systemtest/ajc152/synchronization.xml
deleted file mode 100644
index 99096fa53..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc152/synchronization.xml
+++ /dev/null
@@ -1,650 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<!-- AspectJ v1.5.1 Tests -->
-<suite>
-    
-    <ajc-test dir="features152/synchronization" title="basic">
-        <compile files="Basic.java" options="-1.5 -showWeaveInfo -Xjoinpoints:synchronization">
-        </compile>
-        <run class="Basic">
-          <stderr>
-             <line text="methodWithSyncBlock1"/>
-             <line text="staticMethodWithSyncBlock1"/>
-             <line text="methodWithSyncBlock2"/>
-             <line text="staticMethodWithSyncBlock2"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="features152/synchronization" title="basic - within">
-        <compile files="Basic2.java" options="-1.5 -Xjoinpoints:synchronization">
-        </compile>
-        <run class="Basic2">
-          <stderr>
-             <line text="methodWithSyncBlock1"/>
-             <line text="Advice running at lock(Object)"/>
-             <line text="Advice running at unlock(Object)"/>
-             <line text="staticMethodWithSyncBlock1"/>
-             <line text="Advice running at lock(Object)"/>
-             <line text="Advice running at unlock(Object)"/>
-             <line text="methodWithSyncBlock2"/>
-             <line text="Advice running at lock(Object)"/>
-             <line text="Advice running at unlock(Object)"/>
-             <line text="staticMethodWithSyncBlock2"/>
-             <line text="Advice running at lock(Object)"/>
-             <line text="Advice running at unlock(Object)"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="features152/synchronization" title="basic - within plus args">
-        <compile files="Basic3.java" options="-1.5 -Xjoinpoints:synchronization">
-        </compile>
-        <run class="Basic3">
-          <stderr>
-			<line text="methodWithSyncBlock1"/>
-			<line text="Advice running at lock(Object) with this of type class Basic3 with value Basic3@"/>
-			<line text="Advice running at unlock(Object) with this of type class Basic3 with value Basic3@"/>
-			<line text="staticMethodWithSyncBlock1"/>
-			<line text="Advice running at lock(Object) with this of type class Basic3 with value Basic3@"/>
-			<line text="Advice running at unlock(Object) with this of type class Basic3 with value Basic3@"/>
-			<line text="methodWithSyncBlock2"/>
-			<line text="Advice running at lock(Object) with this of type class Basic3 with value Basic3@"/>
-			<line text="Advice running at unlock(Object) with this of type class Basic3 with value Basic3@"/>
-			<line text="staticMethodWithSyncBlock2"/>
-			<line text="Advice running at lock(Object) with this of type class Basic3 with value Basic3@"/>
-			<line text="Advice running at unlock(Object) with this of type class Basic3 with value Basic3@"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="features152/synchronization" title="basic - within plus this">
-        <compile files="Basic4.java" options="-1.5 -Xjoinpoints:synchronization">
-        </compile>
-        <run class="Basic4">
-          <stderr>
-			<line text="methodWithSyncBlock1"/>
-			<line text="Advice running at lock(Object) with args of type class Basic4 with value Basic4@"/>
-			<line text="Advice running at unlock(Object) with args of type class Basic4 with value Basic4@"/>
-			<line text="staticMethodWithSyncBlock1"/>
-			<line text="Advice running at lock(Object) with args of type class java.lang.Class with value class Basic4"/>
-			<line text="Advice running at unlock(Object) with args of type class java.lang.Class with value class Basic4"/>
-			<line text="methodWithSyncBlock2"/>
-			<line text="Advice running at lock(Object) with args of type class Basic4 with value Basic4@"/>
-			<line text="Advice running at unlock(Object) with args of type class Basic4 with value Basic4@"/>
-			<line text="staticMethodWithSyncBlock2"/>
-			<line text="Advice running at lock(Object) with args of type class java.lang.Class with value class Basic4"/>
-			<line text="Advice running at unlock(Object) with args of type class java.lang.Class with value class Basic4"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="features152/synchronization" title="basic - within plus target">
-        <compile files="Basic5.java" options="-1.5 -Xjoinpoints:synchronization">
-        </compile>
-        <run class="Basic5">
-          <stderr>
-			<line text="Advice running at void Basic5.methodWithSyncBlock1() with target of type class Basic5 with value Basic5@"/>
-			<line text="Advice running at void Basic5.methodWithSyncBlock1() with target of type class Basic5 with value Basic5@"/>
-			<line text="methodWithSyncBlock1"/>
-			<line text="Advice running at void Basic5.staticMethodWithSyncBlock1() with target of type class Basic5 with value Basic5@"/>
-			<line text="Advice running at void Basic5.staticMethodWithSyncBlock1() with target of type class Basic5 with value Basic5@"/>
-			<line text="staticMethodWithSyncBlock1"/>
-			<line text="Advice running at void Basic5.methodWithSyncBlock2() with target of type class Basic5 with value Basic5@"/>
-			<line text="Advice running at void Basic5.methodWithSyncBlock2() with target of type class Basic5 with value Basic5@"/>
-			<line text="methodWithSyncBlock2"/>
-			<line text="Advice running at void Basic5.staticMethodWithSyncBlock2() with target of type class Basic5 with value Basic5@"/>
-			<line text="Advice running at void Basic5.staticMethodWithSyncBlock2() with target of type class Basic5 with value Basic5@"/>
-			<line text="staticMethodWithSyncBlock2"/>
-          </stderr>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="features152/synchronization" title="a useful program">
-        <compile files="Useful1.java" options="-1.5 -Xjoinpoints:synchronization">
-        </compile>
-        <run class="Useful1">
-          <stderr>
-             <line text="Average lock taking time over 2000"/>
-             <line text="We did time something!"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="features152/synchronization" title="parsing - lock">
-        <compile files="Parsing1.java" options="-1.5 -Xjoinpoints:synchronization">
-          <message kind="warning" line="5" text="advice defined in Parsing1 has not been applied [Xlint:adviceDidNotMatch]"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="features152/synchronization" title="parsing - unlock">
-        <compile files="Parsing2.java" options="-1.5 -Xjoinpoints:synchronization">
-          <message kind="warning" line="5" text="advice defined in Parsing2 has not been applied [Xlint:adviceDidNotMatch]"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="features152/synchronization" title="parsing - error - lock">
-        <compile files="Parsing1.java" options="-1.5">
-          <message kind="warning" line="5" text="advice defined in Parsing1 has not been applied [Xlint:adviceDidNotMatch]"/>
-          <!-- this next warning comes out twice because we unpack the attributes twice... -->
-          <message kind="warning" line="5" text="lock() pointcut designator cannot be used without the option -Xjoinpoints:synchronization"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="features152/synchronization" title="parsing - error - unlock">
-        <compile files="Parsing2.java" options="-1.5">
-          <message kind="warning" line="5" text="advice defined in Parsing2 has not been applied [Xlint:adviceDidNotMatch]"/>
-          <!-- this next warning comes out twice because we unpack the attributes twice... -->
-          <message kind="warning" line="5" text="unlock() pointcut designator cannot be used without the option -Xjoinpoints:synchronization"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="features152/synchronization" title="parsing and matching - lock and static context">
-        <compile files="ParsingAndMatching1.java" options="-1.5 -Xjoinpoints:synchronization"/>
-        <run class="ParsingAndMatching1">
-          <stderr>
-            <line text="Advice running at ParsingAndMatching1.java:14"/>
-            <line text="static method running"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="features152/synchronization" title="using lock with LTW - missing flag">
-        <compile files="LockAspect1.java" options="-1.5">
-          <message kind="warning" line="6" text="lock() pointcut designator cannot be used without the option -Xjoinpoints:synchronization"/>
-        </compile>
-        <compile files="BasicProgram1.java" options="-1.5"/>
-        <run class="BasicProgram1" ltw="aop1.xml">
-        	<stderr>
-        	  <!-- warning is something like 'warning at C:\temp\ajcSandbox\ajcTest61975.tmp\LockAspect1.java:6::0 lock() pointcut designator cannot be used without the option -Xjoinpoints:synchronization'/-->
-        	  <line text="warning at "/>
-			  <line text="nonstatic method running"/>
-			  <line text="static method running"/>
-            </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="features152/synchronization/transformed" title="transform with LTW">
-        <compile files="CaptureLock.aj" options="-1.5"/>
-        <compile files="Program.java" options="-1.5"/>
-        <run class="Program" ltw="aop1.xml">
-        	<stdout>
-        	  <line text="Before a lock or unlock"/>
-        	  <line text="hello from b()"/>
-        	  <line text="Before a lock or unlock"/>
-        	  <line text="Before a lock or unlock"/>
-        	  <line text="bang in c()"/>
-        	  <line text="Before a lock or unlock"/>
-        	  <line text="Before a lock or unlock"/>
-        	  <line text="hello from d()"/>
-        	  <line text="Before a lock or unlock"/>
-        	  <line text="hello from block in d()"/>
-        	  <line text="Before a lock or unlock"/>
-        	  <line text="Before a lock or unlock"/>
-            </stdout>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="features152/synchronization" title="using lock with LTW">
-        <compile files="LockAspect1.java" options="-1.5 -Xjoinpoints:synchronization"/>
-        <compile files="BasicProgram1.java" options="-1.5 -Xjoinpoints:synchronization"/>
-        <run class="BasicProgram1" ltw="aop3.xml">
-        	<stderr>
-        	  <line text="weaveinfo Join point 'lock(void java.lang.Object.&lt;lock&gt;(java.lang.Object))' in Type 'BasicProgram1' (BasicProgram1.java:11) advised by before advice from 'LockAspect1' (LockAspect1.java:6)"/>
-			  <line text="weaveinfo Join point 'lock(void java.lang.Object.&lt;lock&gt;(java.lang.Object))' in Type 'BasicProgram1' (BasicProgram1.java:17) advised by before advice from 'LockAspect1' (LockAspect1.java:6)"/>
-			  <line text="Lock advice running at BasicProgram1.java:17"/>
-			  <line text="nonstatic method running"/>
-			  <line text="Lock advice running at BasicProgram1.java:11"/>
-		      <line text="static method running"/>
-            </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="features152/synchronization" title="using unlock with LTW">
-        <compile files="UnlockAspect1.java" options="-1.5 -Xjoinpoints:synchronization"/>
-        <compile files="BasicProgram1.java" options="-1.5 -Xjoinpoints:synchronization"/>
-        <run class="BasicProgram1" ltw="aop4.xml">
-        	<stderr>
-			  <line text="weaveinfo Join point 'unlock(void java.lang.Object.&lt;unlock&gt;(java.lang.Object))' in Type 'BasicProgram1' (BasicProgram1.java:11) advised by before advice from 'UnlockAspect1' (UnlockAspect1.java:6)"/>
-			  <line text="weaveinfo Join point 'unlock(void java.lang.Object.&lt;unlock&gt;(java.lang.Object))' in Type 'BasicProgram1' (BasicProgram1.java:17) advised by before advice from 'UnlockAspect1' (UnlockAspect1.java:6)"/>
-			  <line text="nonstatic method running"/>
-			  <line text="Unlock advice running at BasicProgram1.java:17"/>
-			  <line text="static method running"/>
-			  <line text="Unlock advice running at BasicProgram1.java:11"/>
-            </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="features152/synchronization" title="using unlock with LTW - missing flag">
-        <compile files="UnlockAspect1.java" options="-1.5">
-          <message kind="warning" line="6" text="unlock() pointcut designator cannot be used without the option -Xjoinpoints:synchronization"/>
-        </compile>
-        <compile files="BasicProgram1.java" options="-1.5"/>
-        <run class="BasicProgram1" ltw="aop2.xml">
-        	<stderr>
-        	  <line text="warning at "/>
-			  <line text="nonstatic method running"/>
-			  <line text="static method running"/>
-            </stderr>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="features152/synchronization" title="parsing and matching - unlock and static context">
-        <compile files="ParsingAndMatching2.java" options="-1.5 -Xjoinpoints:synchronization"/>
-        <run class="ParsingAndMatching2">
-          <stderr>
-            <line text="static method running"/>
-            <line text="Advice running at ParsingAndMatching2.java:14"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="features152/synchronization" title="parsing and matching - lock and non-static context">
-        <compile files="ParsingAndMatching3.java" options="-1.5 -Xjoinpoints:synchronization"/>
-        <run class="ParsingAndMatching3">
-          <stderr>
-            <line text="Advice running at ParsingAndMatching3.java:15"/>
-            <line text="non-static method running"/>
-          </stderr>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="features152/synchronization" title="parsing and matching - unlock and non-static context">
-        <compile files="ParsingAndMatching4.java" options="-1.5 -Xjoinpoints:synchronization"/>
-        <run class="ParsingAndMatching4">
-          <stderr>
-            <line text="non-static method running"/>
-            <line text="Advice running at ParsingAndMatching4.java:15"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="features152/synchronization" title="a useful program - with lock">
-        <compile files="Useful2.java" options="-1.5 -showWeaveInfo -Xjoinpoints:synchronization">
-        	<message kind="weave" text="Join point 'method-execution(void Useful2.main(java.lang.String[]))' in Type 'Useful2' (Useful2.java:33) advised by afterReturning advice from 'LockMonitor' (Useful2.java:25)"/>
-        	<message kind="weave" text="Join point 'lock(void java.lang.Object.&lt;lock&gt;(java.lang.Object))' in Type 'Useful2' (Useful2.java:42) advised by before advice from 'LockMonitor' (Useful2.java:9) [with runtime test]"/>
-        	<message kind="weave" text="Join point 'unlock(void java.lang.Object.&lt;unlock&gt;(java.lang.Object))' in Type 'Useful2' (Useful2.java:42) advised by after advice from 'LockMonitor' (Useful2.java:14) [with runtime test]"/>
-        	<!-- hope we aren't getting double messages out -->
-        </compile>
-        <run class="Useful2">
-          <stderr>
-             <line text="Average time spent with lock over"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="features152/synchronization" title="combining pcds - lock and this">
-        <compile files="CombiningPCDs1.java" options="-1.5 -Xjoinpoints:synchronization"/>
-        <run class="CombiningPCDs1">
-          <stderr>
-            <line text="static method running"/>
-            <line text="advice running at CombiningPCDs1.java:17"/>
-            <line text="non-static method running"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="features152/synchronization" title="combining pcds - unlock and this">
-        <compile files="CombiningPCDs2.java" options="-1.5 -Xjoinpoints:synchronization"/>
-        <run class="CombiningPCDs2">
-          <stderr>
-            <line text="static method running"/>
-            <line text="non-static method running"/>
-            <line text="advice running at CombiningPCDs2.java:17"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="features152/synchronization" title="thisjoinpoint - monitor entry">
-        <compile files="ThisJoinPointLock.java" options="-1.5 -Xjoinpoints:synchronization"/>
-        <run class="ThisJoinPointLock">
-          <stderr>
-            <line text="match.toString(): lock(lock(Object))"/>
-			<line text="match.toShortString(): lock(lock(Object))"/>
-			<line text="match.toLongString(): lock(lock(java.lang.Object))"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="features152/synchronization" title="thisjoinpoint - monitor exit">
-        <compile files="ThisJoinPointUnlock.java" options="-1.5 -Xjoinpoints:synchronization"/>
-        <run class="ThisJoinPointUnlock">
-          <stderr>
-            <line text="match.toString(): unlock(unlock(Object))"/>
-			<line text="match.toShortString(): unlock(unlock(Object))"/>
-			<line text="match.toLongString(): unlock(unlock(java.lang.Object))"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="features152/synchronization" title="prevent double unlock weaving messages and model contents">
-        <compile files="ThisJoinPointUnlock.java" options="-1.5 -Xjoinpoints:synchronization -showWeaveInfo -emacssym">
-          <message kind="weave" text="Join point 'lock(void java.lang.Object.&lt;lock&gt;(java.lang.Object))' in Type 'ThisJoinPointUnlock' (ThisJoinPointUnlock.java:38) advised by before advice from 'TJPAspect' (ThisJoinPointUnlock.java:4)"/>
-          <message kind="weave" text="Join point 'method-call(void ThisJoinPointUnlock.staticMethod())' in Type 'ThisJoinPointUnlock' (ThisJoinPointUnlock.java:39) advised by before advice from 'TJPAspect' (ThisJoinPointUnlock.java:4)"/>
-          <message kind="weave" text="Join point 'unlock(void java.lang.Object.&lt;unlock&gt;(java.lang.Object))' in Type 'ThisJoinPointUnlock' (ThisJoinPointUnlock.java:38) advised by before advice from 'TJPAspect' (ThisJoinPointUnlock.java:4)"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="features152/synchronization" title="before advice - lock">
-        <compile files="BeforeLock.java" options="-1.5 -Xjoinpoints:synchronization"/>
-        <run class="BeforeLock">
-          <stderr>
-            <line text="before() lock: advice running at BeforeLock.java:26"/>
-            <line text="static method running"/>
-            <line text="before(Foo) lock: advice running at BeforeLock.java:21"/>
-            <line text="before() lock: advice running at BeforeLock.java:21"/>
-            <line text="non-static method running"/>
-          </stderr>
-        </run>
-    </ajc-test>   
-    
-    <ajc-test dir="features152/synchronization" title="before advice - unlock">
-        <compile files="BeforeUnlock.java" options="-1.5 -Xjoinpoints:synchronization"/>
-        <run class="BeforeUnlock">
-          <stderr>
-            <line text="static method running"/>
-            <line text="before() unlock: advice running at BeforeUnlock.java:26"/>
-            <line text="non-static method running"/>
-            <line text="before(Foo) unlock: advice running at BeforeUnlock.java:21"/>
-            <line text="before() unlock: advice running at BeforeUnlock.java:21"/>
-          </stderr>
-        </run>
-    </ajc-test>   
-    
-    <ajc-test dir="features152/synchronization" title="after advice - lock">
-        <compile files="AfterLock.java" options="-1.5 -Xjoinpoints:synchronization"/>
-        <run class="AfterLock">
-          <stderr>
-            <line text="after() lock: advice running at AfterLock.java:26"/>
-            <line text="static method running"/>
-            <line text="after(Foo) lock: advice running at AfterLock.java:21"/>
-            <line text="after() lock: advice running at AfterLock.java:21"/>
-            <line text="non-static method running"/>
-          </stderr>
-        </run>
-    </ajc-test>   
-    
-    <ajc-test dir="features152/synchronization" title="after advice - unlock">
-        <compile files="AfterUnlock.java" options="-1.5 -Xjoinpoints:synchronization"/>
-        <run class="AfterUnlock">
-          <stderr>
-            <line text="static method running"/>
-            <line text="after() unlock: advice running at AfterUnlock.java:26"/>
-            <line text="non-static method running"/>
-            <line text="after(Foo) unlock: advice running at AfterUnlock.java:21"/>
-            <line text="after() unlock: advice running at AfterUnlock.java:21"/>
-          </stderr>
-        </run>
-    </ajc-test>   
-    
-    <ajc-test dir="features152/synchronization" title="around advice - lock">
-        <compile files="AroundLock.java" options="-1.5 -Xjoinpoints:synchronization">
-          <message kind="warning" line="11" text="Around advice is not supported on the lock and unlock join points (compiler limitation)"/>
-          <message kind="warning" line="17" text="Around advice is not supported on the lock and unlock join points (compiler limitation)"/>
-          <message kind="warning" line="31" text="Around advice is not supported on the lock and unlock join points (compiler limitation)"/>
-          <message kind="warning" line="36" text="Around advice is not supported on the lock and unlock join points (compiler limitation)"/>
-		  <message kind="warning" line="11" text="advice defined in AroundLock has not been applied [Xlint:adviceDidNotMatch]"/>
-		  <message kind="warning" line="17" text="advice defined in AroundLock has not been applied [Xlint:adviceDidNotMatch]"/>
-        </compile>
-        <run class="AroundLock">
-          <stderr>
-            <!--line text="around() lock: advice running at AroundLock.java:26"/-->
-            <line text="static method running"/>
-            <!--line text="around(Foo) lock: advice running at AroundLock.java:21"/>
-            <line text="around() lock: advice running at AroundLock.java:21"/-->
-            <line text="non-static method running"/>
-          </stderr>
-        </run>
-    </ajc-test>   
-    
-    <ajc-test dir="features152/synchronization" title="around advice - unlock">
-        <compile files="AroundUnlock.java" options="-1.5 -Xjoinpoints:synchronization">
-          <message kind="warning" line="5" text="Around advice is not supported on the lock and unlock join points (compiler limitation)"/>
-          <message kind="warning" line="10" text="Around advice is not supported on the lock and unlock join points (compiler limitation)"/>
-          <message kind="warning" line="23" text="Around advice is not supported on the lock and unlock join points (compiler limitation)"/>
-          <message kind="warning" line="28" text="Around advice is not supported on the lock and unlock join points (compiler limitation)"/>
-		  <message kind="warning" line="5" text="advice defined in AroundUnlock has not been applied [Xlint:adviceDidNotMatch]"/>
-		  <message kind="warning" line="10" text="advice defined in AroundUnlock has not been applied [Xlint:adviceDidNotMatch]"/>
-        </compile>
-        <run class="AroundUnlock">
-          <stderr>
-            <!--line text="around() unlock: advice running at AroundUnlock.java:26"/-->
-            <line text="static method running"/>
-            <!--line text="around(Foo) unlock: advice running at AroundUnlock.java:21"/-->
-            <!--line text="around() unlock: advice running at AroundUnlock.java:21"/-->
-            <line text="non-static method running"/>
-          </stderr>
-        </run>
-    </ajc-test>   
-    
-    <ajc-test dir="features152/synchronization/transformed" title="investigation">
-      <compile files="Investigation.java">
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="features152/synchronization/transformed" title="One">
-      <compile files="One.java -Xjoinpoints:synchronization">
-      </compile>
-      <run class="One"/><!-- will check verification ... -->
-    </ajc-test>
-    
-    <ajc-test dir="features152/synchronization/transformed" title="Two">
-      <compile files="Two.java -Xjoinpoints:synchronization">
-        <message kind="warning" line="14" text="advice matching the synchronized method shadow 'method-execution(void C.ma())' will be executed outside the lock rather than inside (compiler limitation) [Xlint"/>        
-      </compile>
-      <run class="Two">
-        <stderr>
-          <line text="execution advice running"/>
-          <line text="hello"/>
-        </stderr>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="features152/synchronization/transformed" title="Two - xlintoff">
-      <compile files="Two.java -Xjoinpoints:synchronization -Xlint:ignore"/>
-      <run class="Two">
-        <stderr>
-          <line text="execution advice running"/>
-          <line text="hello"/>
-        </stderr>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="features152/synchronization/transformed" title="Three">
-      <compile files="Three.java -Xjoinpoints:synchronization">
-        <message kind="warning" line="20" text="advice matching the synchronized method shadow 'method-execution(void C.m3())' will be executed outside the lock rather than inside (compiler limitation) [Xlint"/>        
-        <message kind="warning" line="24" text="advice matching the synchronized method shadow 'method-execution(void C.m32())' will be executed outside the lock rather than inside (compiler limitation) [Xlint"/>        
-      </compile>
-      <run class="Three">
-        <stderr>
-          <line text="hello"/>
-          <line text="execution advice running"/>
-          <line text="hello"/>
-          <line text="execution advice running2"/>
-          <line text="hello"/>
-          <line text="execution advice running3"/>
-          <line text="hello"/>
-          <line text="execution advice running4"/>
-        </stderr>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="features152/synchronization/transformed" title="Four">
-      <compile files="Four.java -Xjoinpoints:synchronization">
-         <message kind="warning" line="16" text="advice matching the synchronized method shadow 'method-execution(void C.m())' will be executed outside the lock rather than inside (compiler limitation) [Xlint"/>
-         <message kind="warning" line="20" text="advice matching the synchronized method shadow 'method-execution(void C.m2())' will be executed outside the lock rather than inside (compiler limitation) [Xlint"/>
-      </compile>
-      <run class="Four">
-        <stderr>
-          <line text="hello"/>
-          <line text="execution advice running"/>
-          <line text="hello"/>
-          <line text="execution advice running2"/>
-        </stderr>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="features152/synchronization/transformed" title="Five - Java5">
-      <compile files="Five.java -1.5 -Xjoinpoints:synchronization">
-      </compile>
-      <run class="Five">
-        <stderr>
-          <line text="test"/>
-          <line text="hello"/>
-          <line text="test"/>
-          <line text="hello"/>
-          <line text="test"/>
-          <line text="hello"/>
-          <line text="test"/>
-          <line text="hello"/>
-        </stderr>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="features152/synchronization/transformed" title="Six - preJava5">
-      <compile files="Six.java -Xjoinpoints:synchronization">
-      </compile>
-      <run class="Six">
-        <stderr>
-          <line text="test"/>
-          <line text="hello"/>
-          <line text="test"/>
-          <line text="hello"/>
-        </stderr>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="features152/synchronization/transformed" title="lock pcd on transformed non-static method">
-      <compile files="Seven.java -Xjoinpoints:synchronization">
-      </compile>
-      <run class="Seven">
-        <stderr>
-          <line text="Locking occurring at lock(lock(Object))"/>
-          <line text="Seven.java"/>
-          <line text="hello"/>
-        </stderr>
-      </run>
-    </ajc-test>
-
-    <ajc-test dir="features152/synchronization/transformed" title="unlock pcd on transformed non-static method">
-      <compile files="Eight.java -Xjoinpoints:synchronization">
-      </compile>
-      <run class="Eight">
-        <stderr>
-          <line text="hello"/>
-          <line text="Unlocking occurring at unlock(unlock(Object))"/>
-          <line text="Eight.java"/>
-        </stderr>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="features152/synchronization/transformed" title="lock pcd on transformed static method - J5">
-      <compile files="Nine.java -1.5 -Xjoinpoints:synchronization">
-      </compile>
-      <run class="Nine">
-        <stderr>
-          <line text="Locking occurring at lock(lock(Object))"/>
-          <line text="Nine.java"/>
-          <line text="hello"/>
-        </stderr>
-      </run>
-    </ajc-test>
-
-    <ajc-test dir="features152/synchronization/transformed" title="unlock pcd on transformed static method - J5">
-      <compile files="Ten.java -1.5 -Xjoinpoints:synchronization">
-      </compile>
-      <run class="Ten">
-        <stderr>
-          <line text="hello"/>
-          <line text="Unlocking occurring at unlock(unlock(Object))"/>
-          <line text="Ten.java"/>
-        </stderr>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="features152/synchronization/transformed" title="lock pcd on transformed static method - preJ5">
-      <compile files="Eleven.java -Xjoinpoints:synchronization">
-      </compile>
-      <run class="Eleven">
-        <stderr>
-          <line text="Locking occurring at lock(lock(Object))"/>
-          <line text="Eleven.java"/>
-          <line text="hello"/>
-        </stderr>
-      </run>
-    </ajc-test>
-
-    <ajc-test dir="features152/synchronization/transformed" title="unlock pcd on transformed static method - preJ5">
-      <compile files="Twelve.java" options="-Xjoinpoints:synchronization">
-      </compile>
-      <run class="Twelve">
-        <stderr>
-          <line text="hello"/>
-          <line text="Unlocking occurring at unlock(unlock(Object))"/>
-          <line text="Twelve.java"/>
-        </stderr>
-      </run>
-    </ajc-test>
-    
-    
-    <ajc-test dir="features152/synchronization/transformed" title="transform static method - preJ5">
-      <compile files="Fifteen.java" options="-Xjoinpoints:synchronization -1.4">
-      </compile>
-      <run class="Fifteen">
-        <stderr>
-          <line text="Locking occurring at lock(lock(Object))"/>
-          <line text="Fifteen.java"/>
-          <line text="hello"/>
-        </stderr>
-      </run>
-    </ajc-test>
-    
-    
-    <ajc-test dir="features152/synchronization/transformed" title="transform static method - packages - preJ5">
-      <compile files="Sixteen.java" options="-Xjoinpoints:synchronization -1.4">
-      </compile>
-      <run class="a.b.c.d.Sixteen">
-        <stderr>
-          <line text="Locking occurring at lock(lock(Object))"/>
-          <line text="Sixteen.java"/>
-          <line text="hello"/>
-        </stderr>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="features152/synchronization" title="obtaining locked object through getArgs">
-      <compile files="LockingWithTJP.java" options="-Xjoinpoints:synchronization">
-      </compile>
-      <run class="LockingWithTJP">
-        <stderr>
-          <line text="before() lock: advice running at LockingWithTJP.java:18"/>
-          <line text="Locked on LockingWithTJP$Foo"/>
-          <line text="non-static method running"/>
-          <line text="before() lock: advice running at LockingWithTJP.java:23"/>
-          <line text="Locked on class java.lang.String"/>
-          <line text="static method running"/>
-        </stderr>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="features152/synchronization/transformed" title="other targeters">
-      <compile files="OtherTargeters.java" options="-Xjoinpoints:synchronization">
-         <message kind="warning" line="8" text="advice matching the synchronized "/>
-      </compile>
-      <run class="OtherTargeters">
-        <stderr>
-          <line text="advice running"/>
-          <line text="foo() running"/>
-        </stderr>
-      </run>
-    </ajc-test>
-    
-    
-    <ajc-test dir="features152/synchronization/transformed" title="joinpoints enabled but no lock">
-      <compile files="Fourteen.java" options="-Xjoinpoints:synchronization">
-         <!--message kind="warning" line="8" text="advice matching the synchronized "/-->
-      </compile>
-      <run class="Fourteen"/>
-    </ajc-test>
-
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc153/ajc153.xml b/tests/src/test/java/org/aspectj/systemtest/ajc153/ajc153.xml
deleted file mode 100644
index c4300e9c7..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc153/ajc153.xml
+++ /dev/null
@@ -1,886 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<!-- AspectJ v1.5.3 Tests -->
-<suite>
-    <ajc-test dir="bugs153/pr149908" title="ensure no npe due to missing type">
-      <compile files="A.aj,C1.java,Tracing.aj" inpath="simple.jar">
-		<message kind="error" text="can't find type MyStringBuilder"/>
-		<message kind="error" text="can't determine superclass of missing type MyStringBuilder"/>
-	  </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs153/pr149908" title="ensure no npe due to missing member">
-      <compile files="A.aj,C1.java,Tracing.aj" inpath="simple.jar;stringBuilder.jar">
-		<message kind="warning" text="can not resolve this member: append [Xlint:unresolvableMember]"/>
-	  </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs153/pr164340" title="formal comments are set for constructor ipes">
-      <compile files="C.java" options="-emacssym -XjavadocsInModel -Xset:minimalModel=false"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs153/pr162135" title="bcexception in annotation style around advice">
-      <compile files="Foo.java" options="-1.5"/>
-      <run class="Foo">
-        <stdout>
-          <line text="In if(), is there a caller? yes"/>
-        </stdout>
-      </run>
-    </ajc-test>
-
-    <ajc-test dir="bugs153/pr162657" title="complex pointcut">
-      <compile files="TestAspect.aj" options="-1.4"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs153/pr164633" title="incompatibleclasschange">
-      <compile files="Model.java"/>
-      <run class="test.Model"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs153/pr162135" title="bcexception in annotation style around advice - 2">
-      <compile files="Foo2.java" options="-1.5"/>
-      <run class="Foo2"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs153/pr162135" title="bcexception in annotation style around advice - 3">
-      <compile files="Foo3.java" options="-1.5"/>
-      <run class="Foo3"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs153/pr162135" title="bcexception in annotation style around advice - 4">
-      <compile files="Foo4.java" options="-1.5"/>
-      <run class="Foo4"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs153/pr162135" title="bcexception in annotation style around advice - 5">
-      <compile files="Foo5.java" options="-1.5"/>
-      <run class="Foo5"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs153/pr162135" title="bcexception in annotation style around advice - 6">
-      <compile files="Foo6.java" options="-1.5"/>
-      <run class="Foo6">
-      <stdout>
-      <line text="ProceedingJoinPoint is call(java.lang.RuntimeException(String))"/>
-      <line text="caller is notnull"/>
-      </stdout>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs153/pr162135" title="bcexception in annotation style around advice - 7">
-      <compile files="Real.java" options="-1.5"/>
-      <run class="a.b.c.Real">
-      <stdout>
-      <line text="advice running"/>
-      <line text="newmessage"/>
-      </stdout>
-      </run>
-    </ajc-test>
-    
-     <ajc-test dir="bugs153/pr159143" title="declare method annotations">
-        <compile files="DeclareMethodAnnotation.java" options="-1.5">
-            <message line="16" kind="warning" text="all"/>
-            <message line="17" kind="warning" text="all"/>
-            <message line="18" kind="warning" text="all"/>
-            <message line="22" kind="warning" text="all"/>
-            <message line="23" kind="warning" text="all"/>
-            <message line="24" kind="warning" text="all"/>
-            <message line="27" kind="warning" text="all"/>
-            <message line="28" kind="warning" text="all"/>
-            <message line="29" kind="warning" text="all"/>
-            <message line="33" kind="warning" text="all"/>
-            <message line="34" kind="warning" text="all"/>
-            <message line="35" kind="warning" text="all"/>
-            <message line="39" kind="warning" text="all"/>
-            <message line="40" kind="warning" text="all"/>
-            <message line="41" kind="warning" text="all"/>
-        </compile>
-    </ajc-test>
-    
-	<ajc-test dir="bugs153/pr148908" title="ensure getSourceSignature correct with static field">
-      <compile files="BadInterface.java" options="-1.5 -emacssym -Xset:minimalModel=false"/>
-    </ajc-test> 
-    
-	<ajc-test dir="bugs153/pr161502" title="generics in pointcuts">
-      <compile files="Main.java" options="-1.5 -showWeaveInfo">
-        <message kind="weave" text="Join point 'method-call(java.util.List Main.getElements())' in Type 'Main' (Main.java:31) advised by around advice from 'Main$Concrete' (Main.java:18)"/>
-      </compile>
-      <run class="Main"/>
-    </ajc-test> 
-        
-	<ajc-test dir="bugs153/pr161502" title="generics in pointcuts - 2">
-      <compile files="Main2.java" options="-1.5 -showWeaveInfo">
-        <message kind="warning" text="advice defined in Main2$Base has not been applied"/>
-      </compile>
-      <run class="Main2"/>
-    </ajc-test> 
-    
-	<ajc-test dir="bugs153/pr158624" title="generics and arrays">
-      <compile files="ValueChange.java" options="-1.5"/>
-    </ajc-test> 
-
-    <ajc-test dir="bugs153/pr153845" title="IllegalStateException at GenericSignatureParser.java">
-      <compile files="GenericType.java,Aspect.java,Aspect2.java,Interface.java" options="-1.5" outjar="blob.jar"/>
-      <compile files="Nothing.java" aspectpath="blob.jar" options="-1.5" outjar="bang.jar"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs153/pr158412" title="annotation style pointcut npe">
-      <compile files="layering/Layering.aj,layering/SystemArchitektur.java" options="-1.5"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs153/pr153464" title="negated annotation matching problem">
-      <compile files="Bug.java" options="-1.5">
-        <message kind="warning" line="99"/>
-      </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs153/pr158412" title="annotation style pointcut npe - 2">
-      <compile files="layering/Layering.aj,layering/SystemArchitektur.java,dao/Foo.java" options="-1.5">
-        <message kind="warning" line="3" text="Whatever"/>
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="features153/ptw" title="basic usage of getWithinTypeName">
-      <compile files="CaseOne.java"/>
-      <run class="CaseOne">
-        <stdout>
-          <line text="AClass has an aspect instance"/>
-          <line text="The aspect instance thinks it is for type name AClass"/>
- 	    </stdout>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="features153/ptw" title="basic usage of getWithinTypeName - annotation style">
-      <compile files="CaseFive.java" options="-1.5"/>
-      <run class="CaseFive">
-        <stdout>
-          <line text="AClass has an aspect instance"/>
-          <line text="The aspect instance thinks it is for type name AClass"/>
- 	    </stdout>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="features153/ptw" title="basic usage of getWithinTypeName - multiple types">
-      <compile files="CaseTwo.java"/>
-      <run class="CaseTwo">
-        <stdout>
-          <line text="BClass aspect instance gives a within type name of BClass"/>
-          <line text="CClass aspect instance gives a within type name of CClass"/>
-          <line text="AClass aspect instance gives a within type name of AClass"/>
- 	    </stdout>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="features153/ptw" title="basic usage of getWithinTypeName - non matching types">
-      <compile files="CaseThree.java"/>
-      <run class="CaseThree">
-        <stdout>
-          <line text="BClass aspect instance gives a within type name of &lt;null&gt;"/>
-          <line text="CClass aspect instance gives a within type name of CClass"/>
-          <line text="AClass aspect instance gives a within type name of AClass"/>
- 	    </stdout>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="features153/ptw" title="basic usage of getWithinTypeName - types in packages">
-      <compile files="CaseFour.java"/>
-      <run class="a.b.CaseFour">
-        <stdout>
-          <line text="BClass aspect instance gives a within type name of a.b.BClass"/>
-          <line text="CClass aspect instance gives a within type name of a.b.CClass"/>
-          <line text="AClass aspect instance gives a within type name of a.b.AClass"/>
- 	    </stdout>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs153/pr158126" title="annotations, call and constructors problem">
-      <compile files="A.java,B.java,MyAnnotation.java,MyAspect.java" options="-1.5 -showWeaveInfo">
-        <message kind="weave" text="Join point 'constructor-call(void B.&lt;init&gt;())' in Type 'A' (A.java:5) advised by before advice from 'MyAspect' (MyAspect.java:3)"/>
-        <message kind="weave" text="Join point 'constructor-call(void B.&lt;init&gt;(int))' in Type 'A' (A.java:10) advised by before advice from 'MyAspect' (MyAspect.java:3)"/>
-        <message kind="weave" text="Join point 'constructor-call(void A.&lt;init&gt;())' in Type 'A' (A.java:14) advised by before advice from 'MyAspect' (MyAspect.java:3)"/>
-        <message kind="weave" text="Join point 'constructor-call(void A.&lt;init&gt;(int))' in Type 'A' (A.java:15) advised by before advice from 'MyAspect' (MyAspect.java:3)"/>      
-      </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs153/pr156058" title="no IllegalStateException with generic inner aspect">
-      <compile files="Bug.java" options="-1.5">
-        <message kind="warning" line="2" text="advice defined in MyAspect has not been applied [Xlint:adviceDidNotMatch]"/>
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs153/pr156058" title="no IllegalStateException with generic inner aspect - 2">
-      <compile files="Bug2.java" options="-1.5 -showWeaveInfo">
-        <message kind="weave" text="Join point 'method-call(MyClass Bug2.callit())' in Type 'Bug2' (Bug2.java:15) advised by before advice from 'MyAspect' (Bug2.java:2)"/>
-        <message kind="warning" line="24" text="advice defined in MyAspect2 has not been applied [Xlint:adviceDidNotMatch]"/>
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs153/pr153490" title="no illegal state exception from AsmDelegate - 1">
-      <compile files="Foo.java" options="-1.5" classpath="jarForFoo.jar" />
-    </ajc-test>
-
-    <ajc-test dir="bugs153/pr153490" title="no illegal state exception from AsmDelegate - 2">
-      <compile files="Bar.java" options="-1.5" classpath="jarForBar.jar" />
-    </ajc-test>
-
-    <ajc-test dir="bugs153/pr153490" title="no illegal state exception from AsmDelegate - 3">
-      <compile files="Goo.java" options="-1.5" classpath="jarForGoo.jar" />
-    </ajc-test>
-
-    <ajc-test dir="bugs153/pr156962" title="Test Annot Method">
-      <compile files="Sample.java, WarnDeprecatedMethod.aj" options="-1.5">
-        <message kind="warning" line="2" text="deprecated method"/>      
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs153/pr156962" title="Test Annot Method Has Member">
-      <compile files="Sample.java, LiftDeprecation.aj" options="-1.5 -XhasMember -showWeaveInfo -Xlint:ignore">
-        <message kind="weave" text="'Sample' (Sample.java:1) is annotated with @Deprecated type annotation from 'LiftDeprecation' (LiftDeprecation.aj:2)"/>
-      </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs153/pr152848" title="mixing generics">
-      <compile files="PairGeneric.java" options="-1.5" outjar="pair1.jar"/>
-      <compile files="BaseType.java" options="-1.5" outjar="basetype.jar" classpath="pair1.jar"/>
-      <compile files="PairNormal.java" outjar="pair2.jar"/>
-      <compile files="AnAspect.java" options="-1.5 -Xset:runMinimalMemory=true" inpath="basetype.jar;pair2.jar"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs153/pr152871" title="parsing bytecode less">
-      <compile files="MyClass.java" options="-1.5"/>
-      <compile files="MyAspect.java" options="-1.5 -Xlint:ignore"/>
-      <run class="a.MyClass" ltw="aop.xml">
-        <stdout>
-          <line text="advice running"/>
-          <line text="hello"/>
-          <line text="advice running"/>
-          <line text="world"/>
- 	    </stdout>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs153/pr160674" title="turning off bcel caching">
-      <compile files="MyClass.java" options="-1.5"/>
-      <compile files="MyAspect.java" options="-1.5 -Xlint:ignore"/>
-      <run class="a.MyClass" ltw="aop.xml">
-        <stdout>
-          <line text="advice running"/>
-          <line text="hello"/>
-          <line text="advice running"/>
-          <line text="world"/>
- 	    </stdout>
- 	    <stderr>
-            <line text="info AspectJ Weaver Version"/>
-            <line text="info register classloader"/>
-            <line text="info using"/>
-            <line text="info [bcelRepositoryCaching=false] AspectJ will not"/>
-            <line text="info register aspect"/>
-            <line text="info processing"/>
-            <line text="info successfully"/>
- 	    </stderr>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs153/pr153380/case1" title="pipelining decps">
-      <compile files="Ann.java,Base.java,BaseImpl.java,I1.java,Mixin.java,Runner.java,X.aj" options="-1.5">
-        <message kind="error" line="1" text="The import java.lang.retention cannot be resolved"/>
-        <message kind="error" line="3" text="Retention cannot be resolved to a type"/>
-        <message kind="error" line="3" text="RetentionPolicy cannot be resolved to a variable"/>
-        <!-- With 1.8 don't seem to get this now - assume it is because the annotation isn't being found
-        <message kind="error" line="3" text="The attribute value is undefined for the annotation type Retention"/>
-        -->
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs153/pr154332" title="incorrect deprecated annotation processing">
-      <compile files="Annot.java" options="-1.5">
-        <message kind="warning" line="5" text="marker"/>
-        <message kind="warning" line="31" text="marker"/>
-        <message kind="warning" line="5" text="deprecated"/>
-        <message kind="warning" line="31" text="deprecated"/>
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs153/pr148381" title="argNames and javac">
-      <!--compile files="C.java" options="-1.5"/>
-      <compile files="A.java" options="-1.5"/-->
-      <compile files="Main.java,Monitor.java" options="-1.5" outjar="foo.jar" classpath="code.jar"/>
-      <run class="test.Main" classpath="$sandbox/code.jar" ltw="aop.xml">
-        <stderr>
-          <line text="goo"/>
- 	    </stderr>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs153/PR148219" title="unwanted warning for pointcut">
-      <compile files="MyMessages.java" options="-1.5 -Xlint:ignore -warn:+unusedArgument"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs153/pr148737" title="illegalstateexception for non generic type">
-      <compile files="A.java" options="-source 5 -target 5">
-        <message kind="warning" line="18" text="advice defined in TestAspect has not been applied"/>
-      </compile>
-    </ajc-test>
-         
-    <ajc-test dir="bugs153/pr149096" title="cflow xml concrete aspect">
-		<compile files="SimpleTracing.aj" outjar="out.jar"/>
-		<compile files="TestMain.aj"/>
-		<run class="TestMain" ltw="aop-pr149096.xml"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs153/pr149305/case1" title="ataj inheritance - 1">
-		<compile files="AbstractOzonator.java,IdentityOzonator.java,User.java" options="-1.5"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs153/pr149305/case2" title="ataj inheritance - 2">
-		<compile files="com/codesrc/ozonator/identity/IdentityOzonator.java,com/codesrc/ozonator/identity/User.java,com/codesrc/ozonator/AbstractOzonator.java" options="-1.5"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs153/pr149305/case2" title="ataj inheritance - 3">
-		<compile files="com/codesrc/ozonator/AbstractOzonator.java,com/codesrc/ozonator/identity/IdentityOzonator.java,com/codesrc/ozonator/identity/User.java" options="-1.5"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs153/pr148693" title="verification problem">
-		<compile files="MyAspect.java" options="-1.5 -XterminateAfterCompilation=true"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs153/pr148537" title="incorrect annotation value">
-		<compile files="MyClass.java" options="-1.5">
-		  <message kind="error" line="5" text="Type mismatch: cannot convert from RetentionPolicy[] to RetentionPolicy"/>
-		</compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs153/pr145693" title="verifyErrNoTypeCflowField">
-      <compile files="Event.java" outjar="cpath.jar"/>
-      <compile files="Monitor.aj" outjar="apath.jar" classpath="cpath.jar" options="-1.4"/>
-      <compile files="Sample.java" options="-Xlint:ignore" aspectpath="apath.jar" outjar="run.jar">
-        <message kind="warning" line="8" text="Unable to determine match at this join point because the type 'Event' cannot be found"/>
-      </compile>
-      <run class="Sample" classpath="run.jar,apath.jar">
-        <stderr>
-          <line text="method running"/>
-        </stderr>
-      </run>
-    </ajc-test>    
-
-    <ajc-test dir="bugs153/pr145693" title="verifyErrInpathNoTypeCflowField">
-      <compile files="Event.java" outjar="cpath.jar"/>
-      <compile files="Monitor.aj" outjar="apath.jar" classpath="cpath.jar" options="-1.4"/>
-      <compile files="Sample.java" options="-Xlint:ignore" inpath="cpath.jar" aspectpath="apath.jar" outjar="run.jar"/>
-      <run class="Sample" classpath="run.jar,apath.jar"/>
-    </ajc-test>    
-
-    <ajc-test dir="bugs153/pr145693" title="cpathNoTypeCflowField">
-      <compile files="Event.java" outjar="cpath.jar"/>
-      <compile files="Monitor.aj" outjar="apath.jar" classpath="cpath.jar" options="-1.4"/>
-      <compile files="Sample.java" options="-Xlint:ignore" classpath="cpath.jar" aspectpath="apath.jar" outjar="run.jar"/>
-      <run class="Sample" classpath="run.jar,apath.jar"/>
-    </ajc-test>    
-    
-     <ajc-test dir="bugs153/pr148409" title="generic signature problem">
-      <compile files="Blurgh.java" options="-1.5"/>
-      <compile files="X.java" options="-1.5 -Xlint:ignore"/>
-      <run class="Blurgh" options="-1.5" ltw="aop.xml"/>
-    </ajc-test>    
-    
-    <ajc-test dir="bugs153/pr149071" title="visibility problem">
-      <compile files="AspectItd.java"/>
-      <run class="AspectItd"/>
-    </ajc-test>    
-    
-    <ajc-test dir="bugs153/pr147841" title="advice not woven on aspectpath">
-      <compile files="A.java" options="-Xlint:ignore" outjar="apath.jar"/>
-      <!--compile files="C.java" outjar="cpa.jar" classpath="cpath.jar"/-->
-      <compile files="C.java" options="-showWeaveInfo" aspectpath="apath.jar">
-        <message kind="weave" text="foo"/>
-      </compile>
-      <run class="C">
-        <stderr>
-          <line text="foo"/>
-        </stderr>
-      </run>
-    </ajc-test>   
-        
-	<ajc-test dir="bugs153/pr150095" title="generics, inheritance and decp">
-     <compile files="Foo.java" options="-1.5"/>
-    </ajc-test> 
-    
-	<ajc-test dir="bugs153/pr121805" title="ambiguous binding">
-     <compile files="Complex.java"/>
-    </ajc-test> 
-    
-	<ajc-test dir="bugs153/pr145442" title="missing line numbers in stacktrace before">
-     <compile files="hello/HelloWorld.java hello/ThrowExceptionBefore.aj"/>
-     <run class="hello.HelloWorld">
-		<stderr>
-	    	<line text="hello.HelloWorld.println(HelloWorld.java:14)"/>
-	    	<line text="hello.HelloWorld.testStackTrace(HelloWorld.java:19)"/>
-	    	<line text="hello.HelloWorld.main(HelloWorld.java:41)"/>
-		</stderr>
-     </run>
-    </ajc-test> 
-    
-	<ajc-test dir="bugs153/pr145442" title="missing line numbers in stacktrace before - binary">
-     <compile inpath="helloworld.jar" files="hello/ThrowExceptionBefore.aj"/>
-     <run class="hello.HelloWorld">
-		<stderr>
-	    	<line text="hello.HelloWorld.println(HelloWorld.java:14)"/>
-	    	<line text="hello.HelloWorld.testStackTrace(HelloWorld.java:19)"/>
-	    	<line text="hello.HelloWorld.main(HelloWorld.java:41)"/>
-		</stderr>
-     </run>
-    </ajc-test> 
-    
-	<ajc-test dir="bugs153/pr145442" title="missing line numbers in stacktrace after">
-     <compile files="hello/HelloWorld.java hello/ThrowExceptionAfter.aj"/>
-     <run class="hello.HelloWorld">
-		<stderr>
-	    	<line text="hello.HelloWorld.println(HelloWorld.java:15)"/>
-	    	<line text="hello.HelloWorld.testStackTrace(HelloWorld.java:19)"/>
-	    	<line text="hello.HelloWorld.main(HelloWorld.java:41)"/>
-		</stderr>
-     </run>
-    </ajc-test> 
-    
-	<ajc-test dir="bugs153/pr145442" title="missing line numbers in stacktrace around">
-     <compile files="hello/HelloWorld.java hello/ThrowExceptionAround.aj" options="-XnoInline"/>
-     <run class="hello.HelloWorld">
-		<stderr>
-	    	<line text="hello.HelloWorld.println(HelloWorld.java:13)"/>
-	    	<line text="hello.HelloWorld.testStackTrace(HelloWorld.java:19)"/>
-	    	<line text="hello.HelloWorld.main(HelloWorld.java:41)"/>
-		</stderr>
-     </run>
-    </ajc-test> 
-    
-	<ajc-test dir="bugs153/pr149322" title="can't find type on interface call 1">
-		<compile files="Interface.java"/>
-        <compile
-			files="Missing.java"
-        	outjar="missing.jar"
-        />
-      	<compile files="TestWithMissing.java" classpath="missing.jar"/>
-      	<compile files="Aspect1.aj" options="-showWeaveInfo -inpath ." classpath="missing.jar">
-	        <message kind="weave" text="void Interface.interfaceMethod()"/>
-	        <message kind="weave" text="void Missing.interfaceMethod()"/>
-		</compile>	        
-      	<compile files="Aspect1.aj" options="-Xlint:warning -showWeaveInfo -inpath .">
-	        <message kind="weave" text="void Interface.interfaceMethod()"/>
-	        <!--
-	        <message kind="warning" text="can't determine superclass of missing type Missing"/>
-	        -->
-		</compile>	        
-      	<run class="TestWithMissing">
-			<stdout>
-	        	<line text="Aspect1.before() interfaceMethod"/>
-	        	<line text="Missing.interfaceMethod()"/>
-<!--	        	
-	        	<line text="Aspect1.before() interfaceMethod"/>
--->
-	        	<line text="Missing.interfaceMethod()"/>
-	        	<line text="Missing.missingMethod()"/>
-    		</stdout>
-    	</run>
-    </ajc-test>    
-	<ajc-test dir="bugs153/pr149322" title="can't find type on interface call 2">
-		<compile files="Interface.java"/>
-        <compile
-			files="Missing.java"
-        	outjar="missing.jar"
-        />
-      	<compile files="TestWithMissing.java" classpath="missing.jar"/>
-      	<compile files="Aspect2.aj" options="-showWeaveInfo -inpath ." classpath="missing.jar">
-	        <message kind="weave" text="void Interface.interfaceMethod()"/>
-	        <message kind="weave" text="void Missing.interfaceMethod()"/>
-		</compile>	        
-      	<compile files="Aspect2.aj" options="-Xlint:warning -showWeaveInfo -inpath .">
-	        <message kind="weave" text="void Interface.interfaceMethod()"/>
-	        <message kind="warning" text="can't determine whether missing type Missing is an instance of Interface"/>
-	        <message kind="warning" text="can't determine superclass of missing type Missing"/>
-		</compile>	        
-      	<run class="TestWithMissing">
-			<stdout>
-	        	<line text="Aspect2.before() interfaceMethod"/>
-	        	<line text="Missing.interfaceMethod()"/>
-<!--	        	
-	        	<line text="Aspect2.before() interfaceMethod"/>
--->
-	        	<line text="Missing.interfaceMethod()"/>
-	        	<line text="Missing.missingMethod()"/>
-    		</stdout>
-    	</run>
-    </ajc-test>    
-	<ajc-test dir="bugs153/pr149322" title="can't find type on interface call 3">
-		<compile files="Interface.java"/>
-        <compile
-			files="Missing.java"
-        	outjar="missing.jar"
-        />
-      	<compile files="TestWithMissing.java" classpath="missing.jar"/>
-      	<compile files="Aspect3.aj" options="-showWeaveInfo -inpath ." classpath="missing.jar">
-	        <message kind="weave" text="void Interface.interfaceMethod()"/>
-	        <message kind="weave" text="void Missing.interfaceMethod()"/>
-		</compile>	        
-      	<compile files="Aspect3.aj" options="-Xlint:warning -showWeaveInfo -inpath .">
-	        <message kind="weave" text="void Interface.interfaceMethod()"/>
-	        <message kind="warning" text="can't determine whether missing type Missing is an instance of Interface"/>
-	        <message kind="warning" text="can't determine superclass of missing type Missing"/>
-		</compile>	        
-      	<run class="TestWithMissing">
-			<stdout>
-	        	<line text="Aspect3.before() interfaceMethod"/>
-	        	<line text="Missing.interfaceMethod()"/>
-<!--	        	
-	        	<line text="Aspect3.before() interfaceMethod"/>
--->
-	        	<line text="Missing.interfaceMethod()"/>
-	        	<line text="Missing.missingMethod()"/>
-    		</stdout>
-    	</run>
-    </ajc-test>    
-  
-    <ajc-test dir="bugs153" title="match volatile field">
-      <compile files="pr150671.aj" options="-Xset:activateLightweightDelegates=false">
-        <message kind="error" line="7" text="Changing state"/>
-        <message kind="error" line="8" text="test"/>
-      </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/ataspectj" title="Duplicate JVMTI agents">
-        <compile files="HelloWorld.java"/>
-        <compile files="MessageHandler.java"/>
-<!--        <compile files="Aspect.aj" options="-outxml"/> -->
-        <compile files="Aspect.aj" options="-outxml -outjar aspects.jar -1.4"/>
-        <ant file="ajc-ant.xml" target="Duplicate JVMTI agents" verbose="true"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs153/pr151978" title="generics problem">
-      <compile files="IMessage.java" options="-1.5">
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs153/pr152631" title="decp and cflowadder munger clash">
-      <compile files="EMA.java" options="-1.5"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs153/pr153572" title="LTWWorld with annotation matching">
-    	<compile 
-    		files="Configurable.java, AnnotationMatcher.aj" 
-    		options="-1.5"
-    		outjar="aspectlib.jar"
-    		outxmlfile="META-INF/aop.xml"/>
-    	<compile files="Configurable.java,Annotated.java,Main.java" options="-1.5" outjar="myapp.jar"/>
-    	<run class="Main" ltw="">
-    		<stdout>
-    			<line text="annotated type initialized"/>
-    		</stdout>
-    	</run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs153/pr149560" title="incorrect staticinitialization weaving - codestyle">
-      <compile files="CodeStyle.java" options="-1.5 -showWeaveInfo">
-        <message kind="weave" text="Join point 'staticinitialization(void MyAspect.&lt;clinit&gt;())' in Type 'MyAspect' (CodeStyle.java:3) advised by after advice from 'MyAspect' (CodeStyle.java:4)"/>
-        <message kind="weave" test="Join point 'staticinitialization(void CodeStyle.&lt;clini&gt;())' in Type 'CodeStyle' (CodeStyle.java:9) advised by after advice from 'MyAspect' (CodeStyle.java:4)"/>
-      </compile>
-      <run class="CodeStyle">
-        <stdout>
-          <line text="after initialization staticinitialization(MyAspect.&lt;clinit&gt;)"/>
-          <line text="after initialization staticinitialization(CodeStyle.&lt;clinit&gt;)"/>
-          <line text="InstanceExists?true"/>
-        </stdout>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs153/pr149560" title="incorrect staticinitialization weaving - annstyle">
-      <compile files="AnnStyle.java" options="-1.5 -showWeaveInfo">
-        <message kind="weave" text="Join point 'staticinitialization(void MyAspect.&lt;clinit&gt;())' in Type 'MyAspect' (AnnStyle.java:5) advised by after advice from 'MyAspect' (AnnStyle.java:7)"/>
-        <message kind="weave" test="Join point 'staticinitialization(void AnnStyle.&lt;clini&gt;())' in Type 'AnnStyle' (AnnStyle.java:12) advised by after advice from 'MyAspect' (AnnStyle.java:7)"/>
-      </compile>
-      <run class="AnnStyle">
-        <stdout>
-          <line text="after initialization staticinitialization(MyAspect.&lt;clinit&gt;)"/>
-          <line text="after initialization staticinitialization(AnnStyle.&lt;clinit&gt;)"/>
-          <line text="InstanceExists?true"/>
-        </stdout>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="ltw" title="reweavableAspectNotRegistered error">
-      <compile files="HelloWorldWithException.java, ExceptionHandler.aj" options="-showWeaveInfo">
-        <message kind="weave" text="Join point 'method-execution(void HelloWorldWithException.main(java.lang.String[]))' in Type 'HelloWorldWithException' (HelloWorldWithException.java:3) advised by around advice from 'ExceptionHandler' (ExceptionHandler.aj:2)"/>
-      </compile>
-      <compile files="EmptyAspect.aj">
-      </compile>
-      <run class="HelloWorldWithException" ltw="aop-missingaspect.xml">
-        <stdout>
-          <line text="Hello World!"/>
-        </stdout>
-        <stderr>
-        	<line text="error aspect 'ExceptionHandler' woven into 'HelloWorldWithException' must be defined to the weaver (placed on the aspectpath, or defined in an aop.xml file if using LTW)."/>
-        </stderr>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs153/pr155972" title="NPE in ConstructorSignatureImpl">
-      <compile files="ConstructorTest.java, SignatureImplAspect.aj" options="-Xlint:ignore"/>
-      <run class="ConstructorTest">
-        <stdout>
-          <line text="ConstructorTest"/>
-        </stdout>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs153/pr155972" title="NPE in FieldSignatureImpl">
-      <compile files="FieldTest.java, SignatureImplAspect.aj" options="-Xlint:ignore"/>
-      <run class="FieldTest">
-        <stdout>
-          <line text="intField"/>
-        </stdout>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs153/pr155972" title="NPE in InitializerSignatureImpl">
-      <compile files="InitializerTest.java, SignatureImplAspect.aj" options="-Xlint:ignore"/>
-      <run class="InitializerTest">
-        <stdout>
-          <line text="InitializerTest"/>
-        </stdout>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs153/pr155763" title="ensure LineNumberTable correct with generics, for each and continue">
-      <compile files="Test.java" options="-1.5">
-		<message kind="warning" line="27" text="adviceDidNotMatch"/>
-	  </compile>	
-    </ajc-test>
-    
-	<ajc-test dir="bugs153/pr157474" title="TestServer with duplicate configuration" keywords="ltw,server">
-        <compile files="AbstractTracing.aj" options="-outjar library.jar -outxml"/>
-        <compile files="HelloWorld.java" options="-outjar application.jar"/>
-        <ant file="ant-server.xml" target="TestServer with duplicate configuration" verbose="true">
-        	<stdout>
-            	<line text="Starting ..."/>
-            	<line text="Running HelloWorld"/>
-            	<line text="? main"/>
-            	<line text="Hello World!"/>
-            	<line text="Stopping ..."/>
-        	</stdout>
-        </ant>
-    </ajc-test>
-
-    <ajc-test dir="bugs153/pr151772" title="ensure declare soft doesn't allow undeclared exception in anonymous inner class">
-      <compile files="Softener.aj"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs153/pr151772" title="ensure declare soft doesn't allow undeclared exception in anonymous inner class - 2">
-      <compile files="Softener2.aj">
-		<message kind="error" line="18" text="Unhandled exception type SQLException"/>
-	  </compile>	
-    </ajc-test>
-
-    <ajc-test dir="bugs153/pr125981" title="declare soft and inner classes">
-      <compile files="SampleTest.java"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs153/pr156904/inSameFile" title="ensure no invalidAbsoluteTypeName when do match - 1">
-      <compile files="A.aj"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs153/pr156904/inDiffPkgAndImport" title="ensure no invalidAbsoluteTypeName when do match - 2">
-      <compile files="A.aj,Outer.java"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs153/pr156904/inSamePkg" title="ensure no invalidAbsoluteTypeName when do match - 3">
-      <compile files="A.aj,Outer.java"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs153/pr156904/inDiffPkgWithoutImport" title="ensure no invalidAbsoluteTypeName when do match - 4">
-      <compile files="A.aj,Outer.java" options="-1.4">
-		<message kind="warning" line="5" text="no match for this type name: Outer [Xlint:invalidAbsoluteTypeName]"/>
-	  </compile>
-    </ajc-test>
-
-	<ajc-test dir="ltw" title="NPE with custom agent" keywords="ltw">
-        <compile files="java/net/URLClassLoader.java"/>
-        <compile files="HelloWorldWithException.java" options="-outjar hello.jar"/>
-        <compile files="ExceptionHandler.aj" options="-outxml -outjar handler.jar"/>
-        <compile files="NullSecurityManager.java" options="-outjar security.jar"/>
-		<ant file="ant.xml" target="NPE with custom agent" verbose="true">
-        	<stdout>
-            	<line text="Hello World!"/>
-        	</stdout>
-        </ant>
-    </ajc-test>
-
-	<ajc-test dir="bugs153/pr158957" title="NPE with LTW, pointcut library and missing aspect dependency" keywords="ltw">
-        <compile files="HelloWorld.java" options="-outjar hello.jar"/>
-        <compile files="Missing.java" options="-outjar missing.jar"/>
-        <compile files="Tracing.aj, PointcutLibrary.aj" options="-Xlint:ignore -1.5 -outxml -outjar tracing.jar" classpath="hello.jar,missing.jar"/>
-<!--        
-		<run class="HelloWorld" ltw="aop.xml">
-	        <stdout>
-    	      <line text="? main"/>
-    	      <line text="Hello World!"/>
-        	</stdout>
-        </run>
--->        
-		<ant file="ant.xml" target="NPE with LTW, pointcut library and missing aspect dependency" verbose="true">
-	        <stdout>
-    	      <line text="? main"/>
-    	      <line text="Hello World!"/>
-        	</stdout>
-        </ant>
-
-    </ajc-test>
-
-	<ajc-test dir="bugs153/pr132080"
-      title="Weave concrete sub-aspect with advice"
-      keywords="aop.xml">
-        <compile
-        	files="HelloWorld.java"
-        >
-        </compile>	
-        <compile files="AbstractSuperAspect.aj" options="-1.4"/>
-        <compile files="TestAdvice.aj" options="-1.4"/>
-        <run class="HelloWorld" ltw="aop-advice.xml">
-        	<stdout>
-                <line text="? ConcreteAspectWithAdvice()"/>
-                <line text="? void HelloWorld.main(String[])"/>
-                <line text="? HelloWorld()"/>
-                <line text="Hello World!"/>
-            </stdout>
-        </run>
-    </ajc-test>
-
-	<ajc-test dir="bugs153/pr132080"
-      title="Weave concrete sub-aspect with ITD"
-      keywords="aop.xml">
-<!--      
-        <compile files="AbstractSuperAspectWithInterface.aj, TestInterface.java" options="-verbose"/>
-        <compile files="HelloWorld.java, TestITD.aj, ConcreteAspectWithITD.aj" options="-verbose">
-            <message line="3" kind="warning" text="this affected type is not exposed to the weaver: AbstractSuperAspectWithInterface"/>
-        </compile>
-        <run class="HelloWorld">
-        	<stdout>
-                <line text="? void TestITD.interfaceMethod()"/>
-                <line text="? void HelloWorld.main(String[])"/>
-                <line text="Hello World!"/>
-            </stdout>
-        </run>
--->        
-        <compile files="HelloWorld.java"/>
-        <compile files="AbstractSuperAspectWithInterface.aj, TestInterface.java"/>
-        <compile files="TestITD.aj">
-            <message line="3" kind="warning" text="this affected type is not exposed to the weaver: AbstractSuperAspectWithInterface"/>
-        </compile>
-        <run class="HelloWorld" ltw="aop-itd.xml">
-        	<stdout>
-                <line text="? void TestITD.interfaceMethod()"/>
-                <line text="? void HelloWorld.main(String[])"/>
-                <line text="Hello World!"/>
-            </stdout>
-        </run>
-
-    </ajc-test>
-
-	<ajc-test dir="bugs153/pr132080" title="Weave concrete sub-aspect with around closure" 
-		keywords="aop.xml">
-
-        <compile files="HelloWorld.java"/>
-        <compile files="AbstractSuperAspect.aj" options="-1.4"/>
-        <compile files="TestAroundClosure.aj" options="-1.4"/>
-        <run class="HelloWorld" ltw="aop-aroundclosure.xml">
-        	<stdout>
-                <line text="&rt; ConcreteAspectWithAroundClosure()"/>
-                <line text="&lt; ConcreteAspectWithAroundClosure()"/>
-                <line text="? void HelloWorld.main(String[])"/>
-                <line text="&rt; HelloWorld()"/>
-                <line text="&lt; HelloWorld()"/>
-                <line text="Hello World!"/>
-            </stdout>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="bugs153/pr149096" title="Weave concrete sub-aspect with cflow">
-		<compile files="SimpleTracing.aj" outjar="out.jar"/>
-		<compile files="TestMain.aj"/>
-		<run class="TestMain" ltw="aop-pr149096.xml"/>
-    </ajc-test>
-    
-	<ajc-test dir="bugs153/pr158957" title="NPE with LTW, pointcut library and missing aspect dependency" keywords="ltw">
-        <compile files="HelloWorld.java" options="-outjar hello.jar"/>
-        <compile files="Missing.java" options="-outjar missing.jar"/>
-        <compile files="Tracing.aj, PointcutLibrary.aj" options="-Xlint:ignore -1.5 -outxml -outjar tracing.jar" classpath="hello.jar,missing.jar"/>
-<!--        
-		<run class="HelloWorld" ltw="aop.xml">
-	        <stdout>
-    	      <line text="? main"/>
-    	      <line text="Hello World!"/>
-        	</stdout>
-        </run>
--->        
-		<ant file="ant.xml" target="NPE with LTW, pointcut library and missing aspect dependency" verbose="true">
-	        <stdout>
-    	      <line text="? println"/>
-    	      <line text="Hello World!"/>
-        	</stdout>
-        </ant>
-
-    </ajc-test>
-
-    <ajc-test dir="bugs153/pr161217" title="NPE with thrown exception warning and at aspectj">
-      <compile files="AtAspectJAspect.java, C.java" options="-warn:+unusedThrown -1.5"/>
-    </ajc-test>
-
-	<ajc-test dir="bugs153/pr164384" title="binary weaving into java 6 library">
-     <compile files="MainClass.java, WorldAspect.aj" inpath="library.jar" options="-1.5 -showWeaveInfo">
-		<message kind="weave" text="Join point 'method-execution(void pkg.Hello.sayHello())' in Type 'pkg.Hello' (Hello.java:7) advised by afterReturning advice from 'pack.WorldAspect' (WorldAspect.aj:9)"/>
-	 </compile>
-    </ajc-test> 
-
-    <ajc-test dir="bugs153/pr164356" title="javadoc comments are set if have normal comments">
-      <compile files="C.java" options="-emacssym -XjavadocsInModel -Xset:minimalModel=false"/>
-    </ajc-test>
-    
-   <ajc-test dir="bugs153/pr164384" title="compliance java 6 throws usage error">
-      <compile files="MainClass.java,Hello.java,MyAnnotation.java" options="-1.6">
- 	  <!--        
-		<message kind="error" text="-1.6"/>
-		<message kind="error" text="no sources specified"/>
-		<message kind="abort" text="AspectJ Compiler"/>
-	  -->
-	  </compile>
-    </ajc-test>
-
-   <ajc-test dir="bugs153/pr164384" title="source level java 6 throws usage error">
-      <compile files="MainClass.java,Hello.java,MyAnnotation.java" options="-1.6">
-	  <!-- 
-	    <message kind="error" text="-1.6"/>
-		<message kind="error" text="no sources specified"/>
-		<message kind="abort" text="AspectJ Compiler"/>
-	  -->
-	  </compile>	  
-    </ajc-test>
-
-   <ajc-test dir="bugs153/pr164384" title="target level java 6 throws usage error">
-      <compile files="MainClass.java,Hello.java,MyAnnotation.java" options="-1.6">
-	  <!-- 
-		<message kind="error" text="-1.6"/>
-		<message kind="error" text="no sources specified"/>
-		<message kind="abort" text="AspectJ Compiler"/>
-	  -->
-	  </compile>
-    </ajc-test>
-
-	<ajc-test dir="bugs153/StaticImport" title="ensure static import reference have static modifier set">
-      <compile files="StaticImport.java,C.java" options="-1.5 -emacssym -Xset:minimalModel=false"/>
-    </ajc-test> 
-    
-    <ajc-test dir="bugs153/GenericMethod" title="ensure getSourceSignature correct with generic method">
-      <compile files="C.java" options="-1.5 -emacssym -Xset:minimalModel=false"/>
-    </ajc-test> 
-    
-    <ajc-test dir="bugs153/Annotation" title="ensure Annotations are added to import list">
-      <compile files="C.java, Anno.aj, A.java" options="-1.5 -emacssym"/>
-    </ajc-test> 
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc153/jdtlikehandleprovider.xml b/tests/src/test/java/org/aspectj/systemtest/ajc153/jdtlikehandleprovider.xml
deleted file mode 100644
index 215240fe4..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc153/jdtlikehandleprovider.xml
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<!-- AspectJ v1.5.2 Tests -->
-<suite>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="More than one named pointcut">
-      <compile files="HandleProvider.aj" options="-emacssym"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="aspect handle">
-      <compile files="A1.aj" options="-emacssym"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="advice handle">
-      <compile files="A2.aj" options="-emacssym -1.4"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="pointcut handle">
-      <compile files="A4.aj" options="-emacssym"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="get IProgramElement with aspect handle">
-      <compile files="A1.aj" options="-emacssym"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="advice handle with crosscutting">
-      <compile files="A3.aj" options="-emacssym"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="two pieces of advice with the same signature and pointcut">
-      <compile files="A5.aj" options="-emacssym -1.4"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="pointcut handle with args">
-      <compile files="A6.aj" options="-emacssym"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="declare parents handle">
-      <compile files="A7.aj" options="-emacssym"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="two declare parents in same file">
-      <compile files="A7.aj" options="-emacssym"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="advice handle with args">
-      <compile files="A8.aj" options="-emacssym -1.4"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="field itd handle">
-      <compile files="A9.aj" options="-emacssym"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="method itd handle">
-      <compile files="A9.aj" options="-emacssym"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="method itd with args handle">
-      <compile files="A9.aj" options="-emacssym"/>
-    </ajc-test>
-
-   <ajc-test dir="features153/jdtlikehandleprovider" title="constructor itd with args">
-      <compile files="A13.aj" options="-emacssym">
-        <message kind="warning" text="inter-type constructor"/>
-      </compile>   
-   </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="method call handle">
-      <compile files="A10.aj" options="-emacssym"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="declare warning handle">
-      <compile files="A11.aj" options="-emacssym">
-        <message kind="warning" text="blah"/>
-        <message kind="warning" text="Illegal call"/>
-      </compile>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="two declare warning handles">
-      <compile files="A11.aj" options="-emacssym">
-        <message kind="warning" text="blah"/>
-        <message kind="warning" text="Illegal call"/>
-      </compile>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="ten declare warning handles">
-      <compile files="DeclareWarnings.aj" options="-emacssym">
-        <message kind="warning" text="warning 1"/>
-        <message kind="warning" text="warning 2"/>
-        <message kind="warning" text="warning 3"/>
-        <message kind="warning" text="warning 4"/>
-        <message kind="warning" text="warning 5"/>
-        <message kind="warning" text="warning 6"/>
-        <message kind="warning" text="warning 7"/>
-        <message kind="warning" text="warning 8"/>
-        <message kind="warning" text="warning 9"/>
-        <message kind="warning" text="warning 10"/>
-      </compile>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="declare @type">
-      <compile files="A12.aj" options="-emacssym -1.5"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="declare @field">
-      <compile files="A12.aj" options="-emacssym -1.5"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="declare @method">
-      <compile files="A12.aj" options="-emacssym -1.5"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="declare @constructor">
-      <compile files="A12.aj" options="-emacssym -1.5"/>
-    </ajc-test>
-
-    <!-- tests to ensure handle provider produces same as the jdt -->
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="compilation unit same as jdt">
-      <compile files="Demo.java" options="-emacssym -Xset:minimalModel=false"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="class same as jdt">
-      <compile files="C.java" options="-emacssym -Xset:minimalModel=false"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="interface same as jdt">
-      <compile files="C.java" options="-emacssym -Xset:minimalModel=false"/>
-    </ajc-test>
-
-   <ajc-test dir="features153/jdtlikehandleprovider" title="constructor same as jdt">
-      <compile files="C.java" options="-emacssym -Xset:minimalModel=false"/>
-    </ajc-test>
-
-   <ajc-test dir="features153/jdtlikehandleprovider" title="constructor with args same as jdt">
-      <compile files="C.java" options="-emacssym -Xset:minimalModel=false"/>
-    </ajc-test>
-
-<!--    <ajc-test dir="features153/jdtlikehandleprovider" title="package declaration same as jdt">
-      <compile files="Demo.java" options="-emacssym"/>
-    </ajc-test>
--->
-    <ajc-test dir="features153/jdtlikehandleprovider" title="import declaration same as jdt">
-      <compile files="Demo.java" options="-emacssym -Xset:minimalModel=false"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="type same as jdt">
-      <compile files="Demo.java" options="-emacssym -Xset:minimalModel=false"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="field same as jdt">
-      <compile files="Demo.java" options="-emacssym -Xset:minimalModel=false"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="initialization same as jdt">
-      <compile files="Demo.java" options="-emacssym -Xset:minimalModel=false"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="method with string array as argument same as jdt">
-      <compile files="Demo.java" options="-emacssym -Xset:minimalModel=false"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="method with int array as argument same as jdt">
-      <compile files="Demo.java" options="-emacssym -Xset:minimalModel=false"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="method with no args same as jdt">
-      <compile files="Demo.java" options="-emacssym -Xset:minimalModel=false"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="method with two args same as jdt">
-      <compile files="Demo.java" options="-emacssym -Xset:minimalModel=false"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="method with two string args same as jdt">
-      <compile files="Demo.java" options="-emacssym -Xset:minimalModel=false"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="enum same as jdt">
-      <compile files="E.java" options="-emacssym -1.5 -Xset:minimalModel=false"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="enum value same as jdt">
-      <compile files="E.java" options="-emacssym -1.5 -Xset:minimalModel=false"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="annotation same as jdt">
-      <compile files="MyAnnotation.java" options="-emacssym -1.5 -Xset:minimalModel=false"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="method with list arg same as jdt">
-      <compile files="Java5Class.java" options="-emacssym -1.5 -Xset:minimalModel=false"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="method with generic arg same as jdt">
-      <compile files="Java5Class.java" options="-emacssym -1.5 -Xset:minimalModel=false"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="method with two generic args same as jdt">
-      <compile files="Java5Class.java" options="-emacssym -1.5 -Xset:minimalModel=false"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="method with two type parameters same as jdt">
-      <compile files="Java5Class.java" options="-emacssym -1.5 -Xset:minimalModel=false"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="method with two args one of which is generic same as jdt">
-      <compile files="Java5Class.java" options="-emacssym -1.5 -Xset:minimalModel=false"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="ipes with same name have unique handles - method-call">
-      <compile files="TwoMethodCalls.aj" options="-emacssym"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="ipes with different names do not have counter - method-call">
-      <compile files="TwoDiffMethodCalls.aj" options="-emacssym"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="ipes with same name have unique handles - handler">
-      <compile files="Handler.aj" options="-emacssym"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="ipes with same name have unique handles - get">
-      <compile files="Get.aj" options="-emacssym"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="ipes with same name have unique handles - set">
-      <compile files="Set.aj" options="-emacssym"/>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="advice with same name in injar aspect should have unique handles">
-      <compile files="ClassForAspectpath.java" options="-emacssym" aspectpath="jarForAspectPath.jar">
-        <message kind="warning" text="blah"/>
-        <message kind="warning" text="blah2"/>
-      </compile>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="declare warnings in injar aspect should have unique handles">
-      <compile files="ClassForAspectpath.java" options="-emacssym" aspectpath="jarForAspectPath.jar">
-        <message kind="warning" text="blah"/>
-        <message kind="warning" text="blah2"/>
-      </compile>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="dont increment counter for different declares">
-      <compile files="ClassForAspectpath.java" options="-emacssym" aspectpath="declare.jar">
-        <message kind="warning" text="warning"/>
-        <message kind="error" text="error"/>
-      </compile>
-    </ajc-test>
-
-    <ajc-test dir="features153/jdtlikehandleprovider" title="dont increment counter for different advice kinds">
-      <compile files="ClassForAspectpath.java" options="-emacssym" aspectpath="advice.jar"/>
-    </ajc-test>
-
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc153/pipelining.xml b/tests/src/test/java/org/aspectj/systemtest/ajc153/pipelining.xml
deleted file mode 100644
index 05b85d1f8..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc153/pipelining.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<!-- Pipelining tests -->
-<suite>
-
-    <!-- testing the very very basics of pipelining -->
-    <ajc-test dir="features153/pipelining" title="build two classes">
-      <compile files="ClassOne.java,ClassTwo.java" options="-verbose"/>
-    </ajc-test>
-    
-    <!-- testing the basics when an aspect is included, it is placed at the front deliberately -->
-    <ajc-test dir="features153/pipelining" title="build one aspect and two classes">
-      <compile files="SimpleAspect.java,ClassOne.java,ClassTwo.java" options="-verbose -showWeaveInfo">
-        <message kind="weave" text="Join point 'staticinitialization(void SimpleAspect.&lt;clinit&gt;())' in Type 'SimpleAspect' (SimpleAspect.java:1) advised by before advice from 'SimpleAspect' (SimpleAspect.java:2)"/>
-        <message kind="weave" text="Join point 'staticinitialization(void ClassOne.&lt;clinit&gt;())' in Type 'ClassOne' (ClassOne.java:1) advised by before advice from 'SimpleAspect' (SimpleAspect.java:2)"/>
-        <message kind="weave" text="Join point 'staticinitialization(void ClassTwo.&lt;clinit&gt;())' in Type 'ClassTwo' (ClassTwo.java:1) advised by before advice from 'SimpleAspect' (SimpleAspect.java:2)"/>
-      </compile>        
-    </ajc-test>
-    
-    <!-- testing the basics when an aspect is included, aspect should be moved to the front after diet parsing -->
-    <ajc-test dir="features153/pipelining" title="build two classes and one aspect">
-      <compile files="ClassOne.java,ClassTwo.java,SimpleAspect.java" options="-verbose -showWeaveInfo">
-        <message kind="weave" text="Join point 'staticinitialization(void SimpleAspect.&lt;clinit&gt;())' in Type 'SimpleAspect' (SimpleAspect.java:1) advised by before advice from 'SimpleAspect' (SimpleAspect.java:2)"/>
-        <message kind="weave" text="Join point 'staticinitialization(void ClassOne.&lt;clinit&gt;())' in Type 'ClassOne' (ClassOne.java:1) advised by before advice from 'SimpleAspect' (SimpleAspect.java:2)"/>
-        <message kind="weave" text="Join point 'staticinitialization(void ClassTwo.&lt;clinit&gt;())' in Type 'ClassTwo' (ClassTwo.java:1) advised by before advice from 'SimpleAspect' (SimpleAspect.java:2)"/>
-      </compile>        
-    </ajc-test>
-    
-    <!-- just building aspects, no classes around - will the sorting behave -->
-    <ajc-test dir="features153/pipelining" title="build two aspects">
-      <compile files="SimpleAspect.java,SimpleAspect2.java" options="-verbose -showWeaveInfo">
-        <message kind="weave" text="Join point 'staticinitialization(void SimpleAspect.&lt;clinit&gt;())' in Type 'SimpleAspect' (SimpleAspect.java:1) advised by before advice from 'SimpleAspect2' (SimpleAspect2.java:2)"/>
-        <message kind="weave" text="Join point 'staticinitialization(void SimpleAspect.&lt;clinit&gt;())' in Type 'SimpleAspect' (SimpleAspect.java:1) advised by before advice from 'SimpleAspect' (SimpleAspect.java:2)"/>
-        <message kind="weave" text="Join point 'staticinitialization(void SimpleAspect2.&lt;clinit&gt;())' in Type 'SimpleAspect2' (SimpleAspect2.java:1) advised by before advice from 'SimpleAspect2' (SimpleAspect2.java:2)"/>
-        <message kind="weave" text="Join point 'staticinitialization(void SimpleAspect2.&lt;clinit&gt;())' in Type 'SimpleAspect2' (SimpleAspect2.java:1) advised by before advice from 'SimpleAspect' (SimpleAspect.java:2)"/>
-      </compile>        
-    </ajc-test>
-    
-    <!-- pointcut in a superclass, subaspect extends the class - pointcut class is supplied after the superclass -->
-    <ajc-test dir="features153/pipelining" title="aspect extends class">
-      <compile files="ClassOne.java,SubAspect.java,ClassTwo.java,SuperClass.java" options="-verbose -showWeaveInfo">
-        <message kind="weave" text="Join point 'staticinitialization(void SubAspect.&lt;clinit&gt;())' in Type 'SubAspect' (SubAspect.java:1) advised by before advice from 'SubAspect' (SubAspect.java:2)"/>
-        <message kind="weave" text="Join point 'staticinitialization(void ClassOne.&lt;clinit&gt;())' in Type 'ClassOne' (ClassOne.java:1) advised by before advice from 'SubAspect' (SubAspect.java:2)"/>
-        <message kind="weave" text="Join point 'staticinitialization(void ClassTwo.&lt;clinit&gt;())' in Type 'ClassTwo' (ClassTwo.java:1) advised by before advice from 'SubAspect' (SubAspect.java:2)"/>
-        <message kind="weave" text="Join point 'staticinitialization(void SuperClass.&lt;clinit&gt;())' in Type 'SuperClass' (SuperClass.java:1) advised by before advice from 'SubAspect' (SubAspect.java:2)"/>
-      </compile>        
-    </ajc-test>
-    
-    <!-- testing eclipse to aspectj annotation transformation -->
-    <ajc-test dir="features153/pipelining/annotations" title="annotation transformation">
-      <compile files="AnAspect.java,Foo.java,DecoratedClass.java" options="-1.5 -verbose"/>
-    </ajc-test>
-
-    <!-- does the aspect sorter recognize annotation style aspects, pass the aspects last  -->
-    <ajc-test dir="features153/pipelining" title="recognizing annotation style aspects - 1">
-      <compile files="ClassOne.java,AtAJAspect.java" options="-1.5 -verbose"/>
-    </ajc-test>
-    
-    <!-- does the aspect sorter recognize annotation style aspects (inner type), pass the aspects last -->
-    <ajc-test dir="features153/pipelining" title="recognizing annotation style aspects - 2">
-      <compile files="ClassOne.java,AtInnerAJAspect.java" options="-1.5 -verbose"/>
-    </ajc-test>
-    
-    <!-- the aspect is multiple layers down in the class... -->
-    <ajc-test dir="features153/pipelining" title="build one class and deeply nested aspect">
-      <compile files="ClassOne.java,DeepAspect.java" options="-1.5 -verbose -showWeaveInfo">
-        <message kind="weave" text="Join point 'staticinitialization(void ClassOne.&lt;clinit&gt;())' in Type 'ClassOne' (ClassOne.java:1) advised by before advice from 'DeepAspect$Inner$SimpleAspect' (DeepAspect.java:4)"/>
-      </compile>
-    </ajc-test>
-    
-
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc154/ajc154.xml b/tests/src/test/java/org/aspectj/systemtest/ajc154/ajc154.xml
deleted file mode 100644
index 9cb0eae87..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc154/ajc154.xml
+++ /dev/null
@@ -1,491 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<!-- AspectJ v1.5.4Tests -->
-<suite>
-
-   <ajc-test dir="bugs154/pr166647" title="ltw and cflow problem">
-     <compile options="-1.5" files="ClassToAdvise.java,ClassWithMain.java" outjar="code.jar"/>
-     <compile options="-1.5 -Xlint:ignore" files="Aspect.java" outjar="aspects.jar"/>
-     <run class="a.ClassWithMain" classpath="aspects.jar;code.jar" ltw="aop1.xml">
-       <stdout>
-         <line text="advice fired"/>
-       </stdout>
-       <stderr>
-       </stderr>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs154/pr211052" title="declare atType problems - 1">
-     <compile options="-1.5" files="MyPojo.java"/>
-     <run class="MyPojo"/>
-   </ajc-test>
-   
-   <!--  DistantResource is explicitly mentioned as c.d.DistantResource -->
-   <ajc-test dir="bugs154/pr211052" title="declare atType problems - 2">
-     <compile options="-1.5 -showWeaveInfo" files="SimpleAnnotation.java,SimpleAspect1.java,DistantResource.java">
-       <message kind="weave" text="'c.d.DistantResource' (DistantResource.java:5) is annotated with @SimpleAnnotation(classname = &quot;oranges&quot;)"/>
-     </compile>
-     <run class="c.d.DistantResource">
-     <stdout>
-       <line text="Annotation is @a.b.SimpleAnnotation(classname=oranges)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-       <line text="Annotation is @a.b.SimpleAnnotation(classname=&quot;oranges&quot;)" vm="9+"/>
-     </stdout>
-     </run>
-   </ajc-test>
-
-   <!--  DistantResource is imported and refered to as DistantResource -->
-   <ajc-test dir="bugs154/pr211052" title="declare atType problems - 3">
-     <compile options="-1.5 -showWeaveInfo" files="SimpleAnnotation.java,SimpleAspect2.java,DistantResource.java">
-       <message kind="weave" text="'c.d.DistantResource' (DistantResource.java:5) is annotated with @SimpleAnnotation(classname = &quot;oranges&quot;)"/>
-     </compile>
-      <run class="c.d.DistantResource">
-     <stdout>       
-       <line text="Annotation is @a.b.SimpleAnnotation(classname=oranges)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-       <line text="Annotation is @a.b.SimpleAnnotation(classname=&quot;oranges&quot;)" vm="9+"/>
-     </stdout>
-     </run>
-   </ajc-test>
-   
-   <!--  Annotation is in a different package to the aspect and explicitly referenced with a fully qualified name -->
-   <ajc-test dir="bugs154/pr211052" title="declare atType problems - 4">
-     <compile options="-1.5 -showWeaveInfo" files="SimpleAnnotation2.java,SimpleAspect3.java,DistantResource.java">
-       <message kind="weave" text="'c.d.DistantResource' (DistantResource.java:5) is annotated with @e.f.SimpleAnnotation2(classname = &quot;oranges&quot;)"/>
-     </compile>     
-     <run class="c.d.DistantResource">
-     <stdout>
-       <line text="Annotation is @e.f.SimpleAnnotation2(classname=oranges)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-       <line text="Annotation is @e.f.SimpleAnnotation2(classname=&quot;oranges&quot;)" vm="9+"/>       
-     </stdout>
-     </run>
-   </ajc-test>
-
-   <!--  Annotation is in a different package to the aspect and imported -->
-   <ajc-test dir="bugs154/pr211052" title="declare atType problems - 5">
-     <compile options="-1.5 -showWeaveInfo" files="SimpleAnnotation2.java,SimpleAspect4.java,DistantResource.java">
-       <message kind="weave" text="'c.d.DistantResource' (DistantResource.java:5) is annotated with @SimpleAnnotation2(classname = &quot;oranges&quot;)"/>
-     </compile>
-     <run class="c.d.DistantResource">
-     <stdout>
-       <line text="Annotation is @e.f.SimpleAnnotation2(classname=oranges)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-       <line text="Annotation is @e.f.SimpleAnnotation2(classname=&quot;oranges&quot;)" vm="9+"/>       
-     </stdout>
-     </run>
-   </ajc-test>
-   
-   <!-- target for annotation is from a jar -->
-   <ajc-test dir="bugs154/pr211052" title="declare atType problems - 6">
-     <compile options="-1.5" files="DistantResource.java" outjar="target.jar"/>
-     <compile options="-1.5 -showWeaveInfo" files="SimpleAnnotation2.java,SimpleAspect4.java" inpath="target.jar">
-       <message kind="weave" text="'c.d.DistantResource' (DistantResource.java) is annotated with @SimpleAnnotation2(classname = &quot;oranges&quot;)"/>
-     </compile>
-     <run class="c.d.DistantResource">
-     <stdout>
-       <line text="Annotation is @e.f.SimpleAnnotation2(classname=oranges)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-       <line text="Annotation is @e.f.SimpleAnnotation2(classname=&quot;oranges&quot;)" vm="9+"/>       
-     </stdout>
-     </run>
-   </ajc-test>
-
-   <!-- target for annotation is from a jar and annotation and aspect are in a different jar-->
-   <ajc-test dir="bugs154/pr211052" title="declare atType problems - 7">
-     <compile options="-1.5" files="DistantResource.java" outjar="target.jar"/>
-     <compile options="-1.5 -Xlint:ignore" files="SimpleAnnotation2.java,SimpleAspect3.java" outjar="aspect.jar"/>
-     <compile options="-1.5 -showWeaveInfo" aspectpath="aspect.jar" inpath="target.jar">
-       <message kind="weave" text="'c.d.DistantResource' (DistantResource.java) is annotated with @e.f.SimpleAnnotation2(classname = &quot;oranges&quot;)"/>
-     </compile>
-     <run class="c.d.DistantResource">
-     <stdout>
-       <line text="Annotation is @e.f.SimpleAnnotation2(classname=oranges)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-       <line text="Annotation is @e.f.SimpleAnnotation2(classname=&quot;oranges&quot;)" vm="9+"/>              
-     </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs154/pr211674" title="after throwing annotation style problem - 1">
-     <compile options="-1.5" files="Test.java"/>
-     <run class="Test"/>
-   </ajc-test>
-
-   <ajc-test dir="bugs154/pr211674" title="after throwing annotation style problem - 2">
-     <compile options="-1.5" files="Test2.java"/>
-     <run class="Test2"/>
-   </ajc-test>
-
-   <ajc-test dir="bugs154/pr194314" title="broken lvt for woven at aspectj around advice">
-     <compile options="-1.5" files="test/IService.java,test/Main.java,test/Service.java,test/ServiceInterceptor.java"/>
-   </ajc-test>
-
-   <ajc-test dir="bugs154/pr148381/simple" title="argNames does not work - simple">
-     <!-- this compile is just to get code.jar into the sandbox, all the code is already precompiled in code.jar -->
-     <compile options="-1.5" files="PerformanceMonitor.java" classpath="code.jar"/>
-     <run class="test.Main" classpath="code.jar" ltw="META-INF/aop.xml">
-       <stdout>
-         <line text="This method was intercepted by the advice: Main.foo()"/>
-       </stdout>
-       <stderr/>
-     </run>
-   </ajc-test>
-
-   <ajc-test dir="bugs154/pr148381/error1" title="argNames does not work - error1">
-     <!-- this compile is just to get code.jar into the sandbox, all the code is already precompiled in code.jar -->
-     <compile options="-1.5" files="PerformanceMonitor.java" classpath="code.jar"/>
-     <run class="test.Main" classpath="code.jar" ltw="META-INF/aop.xml">
-       <stderr>
-         <line text="argNames annotation value does not specify the right number of argument names for the method 'Object flagExpectationMismatch(ProceedingJoinPoint,PerformanceMonitor)'"/>
-         <line text="Cannot read debug info for @Aspect to handle formal binding in pointcuts (please compile with 'javac -g' or '&lt;javac debug='true'.../&gt;' in Ant)"/>
-       </stderr>
-       <stdout/>
-     </run>
-   </ajc-test>
-
-   <ajc-test dir="bugs154/pr148381/error2" title="argNames does not work - error2">
-     <!-- this compile is just to get code.jar into the sandbox, all the code is already precompiled in code.jar -->
-     <compile options="-1.5" files="PerformanceMonitor.java" classpath="code.jar"/>
-     <run class="test.Main" classpath="code.jar" ltw="META-INF/aop.xml">
-       <stderr>
-         <line text="argNames annotation value does not specify the right number of argument names for the method 'Object flagExpectationMismatch(ProceedingJoinPoint,PerformanceMonitor)'"/>
-         <line text="Cannot read debug info for @Aspect to handle formal binding in pointcuts (please compile with 'javac -g' or '&lt;javac debug='true'.../&gt;' in Ant)"/>
-       </stderr>
-       <stdout/>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs154/pr148381/error3" title="argNames does not work - error3">
-     <!-- this compile is just to get code.jar into the sandbox, all the code is already precompiled in code.jar -->
-     <compile options="-1.5" files="PerformanceMonitor.java" classpath="code.jar"/>
-     <run class="test.Main" classpath="code.jar" ltw="META-INF/aop.xml">
-       <stderr>
-         <line text="argNames annotation value does not specify the right number of argument names for the method 'void a(Foo)'"/>
-         <line text="Cannot read debug info for @Aspect to handle formal binding in pointcuts (please compile with 'javac -g' or '&lt;javac debug='true'.../&gt;' in Ant)"/>
-         <line text="argNames annotation value does not specify the right number of argument names for the method 'void f(Foo)'"/>
-         <line text="Cannot read debug info for @Aspect to handle formal binding in pointcuts (please compile with 'javac -g' or '&lt;javac debug='true'.../&gt;' in Ant)"/>
-         <line text="argNames annotation value does not specify the right number of argument names for the method 'void e(Foo)'"/>
-         <line text="Cannot read debug info for @Aspect to handle formal binding in pointcuts (please compile with 'javac -g' or '&lt;javac debug='true'.../&gt;' in Ant)"/>
-         <line text="argNames annotation value does not specify the right number of argument names for the method 'void d(Foo)'"/>
-         <line text="Cannot read debug info for @Aspect to handle formal binding in pointcuts (please compile with 'javac -g' or '&lt;javac debug='true'.../&gt;' in Ant)"/>
-         <line text="argNames annotation value does not specify the right number of argument names for the method 'void c(Foo)'"/>
-         <line text="Cannot read debug info for @Aspect to handle formal binding in pointcuts (please compile with 'javac -g' or '&lt;javac debug='true'.../&gt;' in Ant)"/>
-         <line text="argNames annotation value does not specify the right number of argument names for the method 'void b(Foo)'"/>
-         <line text="Cannot read debug info for @Aspect to handle formal binding in pointcuts (please compile with 'javac -g' or '&lt;javac debug='true'.../&gt;' in Ant)"/>
-       </stderr>
-       <stdout/>
-     </run>
-   </ajc-test>
-
-   <!-- very basic with all code style, should be fine -->
-   <ajc-test dir="bugs154/pr209019/case1" title="various issues with ltw and around advice - 1">
-     <compile options="-1.5" files="A.java,DurationMethod.java,AbstractDurationMethod.java,Runner.java"/>
-     <run class="Runner">
-       <stdout>
-         <line text="Proceeded at joinpoint call(Object a.b.A.m3())"/>
-         <line text="Proceeded at joinpoint call(Object a.b.A.m2())"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <!-- switch from code style sub-aspect to annotation style sub aspect -->
-   <ajc-test dir="bugs154/pr209019/case2" title="various issues with ltw and around advice - 2">
-     <compile options="-1.5 -XnoInline" files="A.java,AtDurationMethod.java,AbstractDurationMethod.java,Runner.java"/>
-     <run class="Runner">
-       <stdout>
-         <line text="Proceeded at joinpoint call(Object a.b.A.m3())"/>
-         <line text="Proceeded at joinpoint call(Object a.b.A.m2())"/>
-       </stdout>
-       <stderr>
-       </stderr>
-     </run>
-   </ajc-test>
-   
-   <!-- same as case2 but without -XnoInline -->
-   <ajc-test dir="bugs154/pr209019/case2" title="various issues with ltw and around advice - 3">
-     <compile options="-1.5" files="A.java,AtDurationMethod.java,AbstractDurationMethod.java,Runner.java"/>
-     <run class="Runner">
-       <stdout>
-         <line text="Proceeded at joinpoint call(Object a.b.A.m3())"/>
-         <line text="Proceeded at joinpoint call(Object a.b.A.m2())"/>
-       </stdout>
-       <stderr>
-       </stderr>
-     </run>
-   </ajc-test>
-   
-   <!-- now loadtime weaving -->
-   <ajc-test dir="bugs154/pr209019/case3" title="various issues with ltw and around advice - 4">
-     <compile options="-1.5" files="A.java,AbstractDurationMethod.java,Runner.java"/>
-     <run class="Runner" ltw="aop.xml">
-       <stdout>
-         <line text="Proceeded at joinpoint call(Object a.b.A.m3())"/>
-         <line text="Proceeded at joinpoint call(Object a.b.A.m2())"/>
-       </stdout>
-       <stderr>
-       </stderr>
-     </run>
-   </ajc-test>
-   
-   <!-- just checking the new syntax compiles OK -->
-   <ajc-test dir="bugs154/pr169432/case1" title="declare parents problem when target already implements interface - 1">
-     <compile options="-1.5" files="NonMarkerInterface.java,ClassThatAlreadyIncludesRequiredMethods.java,DeclareParentsForNonMarkerInterfaceToAClassThatAlreadyIncludeRequiredMethods.java"/>
-   </ajc-test>
-   
-   <!-- now violate the rules, the types matching the pattern do not implement the interface -->
-   <ajc-test dir="bugs154/pr169432/case2" title="declare parents problem when target already implements interface - 2">
-    <compile options="-1.5" files="A.java">
-       <message kind="error" line="20" text="@DeclareParents: No defaultImpl was specified but the type 'C1' does not implement the method 'int m()' defined on the interface 'NonMarkerInterface'"/>
-       <message kind="error" line="24" text="@DeclareParents: No defaultImpl was specified but the type 'C2' does not implement the method 'int m()' defined on the interface 'NonMarkerInterface'"/>
-     </compile>
-   </ajc-test>
-
-   <!-- now they do, lets check they behave as expected -->   
-   <ajc-test dir="bugs154/pr169432/case3" title="declare parents problem when target already implements interface - 3">
-     <compile options="-1.5" files="A.java"/>
-     <run class="A">
-        <stdout>
-            <line text="C1.m() returns 1"/>
-            <line text="C2.m() returns 2"/>
-        </stdout>
-     </run>
-   </ajc-test>
-
-   <ajc-test dir="bugs154/pr202088" title="abstract annotation style pointcut with context">
-     <compile options="-1.5" files="Bug.java"/>
-     <compile options="-1.5" files="Bug2.java">
-     </compile>
-     <run class="tracing.Bug2">
-       <stdout>
-         <line text="o is 'instance of C'"/>
-       </stdout>
-     </run>
-   </ajc-test>
-
-   <ajc-test dir="bugs154/pr169428" title="no error for atDecp in normal class">
-     <compile options="-1.5" files="CorrectError.java">
-       <message kind="error" text="Advice must be declared inside an aspect type"/>
-     </compile>
-     <compile options="-1.5" files="NoError.java">
-       <message kind="error" text="DeclareParents can only be used inside an aspect type"/>
-     </compile>
-   </ajc-test>
-
-   <ajc-test dir="bugs154/pr162539" title="NPE with missing @aspect annotation in pointcut library - 1">
-   	 <compile files="test/ataspectj/pointcutlibrary/HelloWorld.java, test/ataspectj/pointcutlibrary/AtAspect.java" classpath="lib.jar" options="-1.5"/>
-   </ajc-test>
-    
-   <ajc-test dir="bugs154/pr162539" title="NPE with missing @aspect annotation in pointcut library - 2">
-   	<compile files="test/ataspectj/pointcutlibrary/PointcutLibrary.java, test/ataspectj/pointcutlibrary/HelloWorld.java, test/ataspectj/pointcutlibrary/AtAspect.java" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs154/pr176991" title="wrong number of type parameters">
-     <compile options="-1.5" files="AspectJBugTestCase.java"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs154/pr186673" title="jars and zips with non-standard suffix">
-     <compile options="-1.5" files="Apple.java" outjar="apple.jar.0"/>
-     <compile options="-1.5" files="Orange.java" outjar="orange.zipfoo"/>
-     <!-- check ant and a standard compile -->
-     <!--ant file="ant.xml" target="default" verbose="true">
-        <stdout>
-   	      <line text="Blah"/>
-       	</stdout>
-     </ant-->
-     <compile options="-1.5" files="Main.java" classpath="orange.zipfoo,apple.jar.0"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs154/pr203646" title="npe with itd on inner generic interface">
-     <compile options="-1.5" files="Bang.java"/>
-     <!--compile options="-1.5 -emacssym" files="Bang.java"/-->
-   </ajc-test>
-   
-   <ajc-test dir="bugs154/pr203646" title="npe with itd on inner generic interface - emacssym">
-     <compile options="-1.5 -emacssym" files="Bang.java"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs154/pr203646" title="npe with itd on inner generic interface - exampleA">
-     <compile options="-1.5" files="ExampleA.java"/>
-     <run class="ExampleA"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs154/pr203646" title="npe with itd on inner generic interface - exampleB">
-     <compile options="-1.5" files="ExampleB.java">
-       <message kind="error" line="20" text="The method intro(String) in the type I.J&lt;String&gt; is not applicable for the arguments (int)"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs154/pr203646" title="npe with itd on inner generic interface - exampleC">
-     <compile options="-1.5" files="ExampleC.java"/>
-     <run class="ExampleC"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs154/pr203646" title="npe with itd on inner generic interface - exampleD">
-     <compile options="-1.5" files="ExampleD.java"/>
-     <run class="ExampleD"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs154/pr203646" title="npe with itd on inner generic interface - exampleE">
-     <compile options="-1.5" files="ExampleE.java"/>
-     <run class="ExampleE"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs154/pr203646" title="npe with itd on inner generic interface - exampleF">
-     <compile options="-1.5" files="ExampleF.java"/>
-     <run class="ExampleF"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs154/pr203646" title="npe with itd on inner generic interface - exampleG">
-     <compile options="-1.5" files="ExampleG.java"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs154/pr206732" title="itd clash for types from aspectpath">
-     <compile outjar="foo.jar" files="Advised.aj"/>
-     <compile files="Ref.aj" aspectpath="foo.jar"/>
-   </ajc-test>
-
-   <ajc-test dir="bugs154/pr175806" title="coping with bad tables">
-     <compile options="-1.5" files="A.java"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs154/pr174449" title="problem with generic aspect and generic pointcut">
-     <compile options="-1.5" files="Foo.java"/>
-     <run class="Foo">
-       <stderr>
-         <line text="around advice executing: servant class is class Boo"/>
-         <line text="around advice executing: servant class is class Goo"/>
-       </stderr>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs154/pr174449" title="problem with generic aspect and generic pointcut - noinline">
-     <compile options="-1.5 -XnoInline" files="Foo.java"/>
-     <run class="Foo">
-       <stderr>
-         <line text="around advice executing: servant class is class Boo"/>
-         <line text="around advice executing: servant class is class Goo"/>
-       </stderr>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs154/pr171953_2" title="problem with generic methods and ordering - ok">
-	 <compile options="-1.5" files="test/ListFactoryAspect.aj, test/AbstractProcessor.java,test/ListFactory.java,test/ListFactoryConsumer.java,test/Processor.java,test/SimpleListFactoryConsumer.java">
-	 </compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs154/pr171953_2" title="problem with generic methods and ordering - bad">
-	 <compile options="-1.5" files="test/ListFactory.java,test/ListFactoryConsumer.java,test/SimpleListFactoryConsumer.java,test/Processor.java,test/ListFactoryAspect.aj,test/AbstractProcessor.java">
-	 </compile>
-   </ajc-test>
-
-   <ajc-test dir="bugs154/pr171953" title="problem with itd and join point signature collection - bad">
-     <compile options="-1.5 -showWeaveInfo" files="test/AbstractExecutable.java,test/AnotherExecutable.java,test/Executable.java,test/ExecutionAspect.aj,test/SecondTestExecutable.java test/SubTestExecutable.java test/TestExecutable.java">
-       <message kind="weave" text="Join point 'method-execution(void test.SecondTestExecutable.execute())' in Type 'test.SecondTestExecutable' (SecondTestExecutable.java:5) advised by around advice from 'test.ExecutionAspect' (ExecutionAspect.aj:9)"/>
-       <message kind="weave" text="Extending interface set for type 'test.AbstractExecutable' (AbstractExecutable.java) to include 'java.io.Serializable' (ExecutionAspect.aj)"/>
-       <message kind="weave" text="Join point 'method-execution(void test.SubTestExecutable.execute())' in Type 'test.SubTestExecutable' (SubTestExecutable.java:6) advised by around advice from 'test.ExecutionAspect' (ExecutionAspect.aj:9)"/>
-       <message kind="weave" text="Join point 'method-execution(void test.TestExecutable.execute())' in Type 'test.TestExecutable' (TestExecutable.java:5) advised by around advice from 'test.ExecutionAspect' (ExecutionAspect.aj:9)"/>
-     </compile>       
-     <run class="test.SecondTestExecutable"/>
-   </ajc-test>
-
-   <ajc-test dir="bugs154/pr171953" title="problem with itd and join point signature collection - ok">
-     <compile options="-1.5 -showWeaveInfo" files="test/SecondTestExecutable.java test/AbstractExecutable.java test/AnotherExecutable.java  test/Executable.java test/ExecutionAspect.aj test/RunnableAspect.aj test/SubTestExecutable.java test/TestExecutable.java">
-       <message kind="weave" text="Join point 'method-execution(void test.SecondTestExecutable.execute())' in Type 'test.SecondTestExecutable' (SecondTestExecutable.java:5) advised by around advice from 'test.ExecutionAspect' (ExecutionAspect.aj:9)"/>
-       <message kind="weave" text="Extending interface set for type 'test.AbstractExecutable' (AbstractExecutable.java) to include 'java.io.Serializable' (ExecutionAspect.aj)"/>
-       <message kind="weave" text="Join point 'method-execution(void test.SubTestExecutable.execute())' in Type 'test.SubTestExecutable' (SubTestExecutable.java:6) advised by around advice from 'test.ExecutionAspect' (ExecutionAspect.aj:9)"/>
-       <message kind="weave" text="Join point 'method-execution(void test.TestExecutable.execute())' in Type 'test.TestExecutable' (TestExecutable.java:5) advised by around advice from 'test.ExecutionAspect' (ExecutionAspect.aj:9)"/>
-     </compile>       
-     <run class="test.SecondTestExecutable"/>
-   </ajc-test>
-
-    <ajc-test dir="bugs154/pr171952" title="generic methods and ITDs">
-      <compile files="Foo.java,FooAspect.java" options="-1.5"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs154/pr169428" title="using decp annotation without aspect annotation">
-      <compile files="AnAspect.java" options="-1.5">
-        <message kind="error" text="Found @AspectJ annotations in a non @Aspect type 'AnAspect'"/>
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs154/pr170467" title="itds and parameterized parameters">
-      <compile files="Bug.aj" options="-1.5"/>
-      <compile files="Bug2.aj" options="-1.5"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs154/pr169706" title="inherited annotations">
-      <compile files="A.java,B.java,C.java,MyAspect.java,MyAnnotation.java,Test.java" options="-1.5 -showWeaveInfo">
-        <message kind="weave" text="Join point 'method-call(void C.foo())' in Type 'Test' (Test.java:5) advised by before advice from 'MyAspect' (MyAspect.java:4)"/>
-	  </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs154/pr165885" title="generic field npe">
-      <compile files="Concrete.java,Abstract.java,Aspect.java" options="-1.5">
-        <message kind="warning" line="8" text="foo"/>
-	  </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs154/pr168044" title="complex generics - 1">
-      <compile files="AbstractNode.java" options="-1.5">
-	  </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs154/pr168063" title="incorrectly marking field transient">
-      <compile files="A.java"/>
-      <run class="A">
-        <stdout>
-          <line text="It worked, data preserved!"/>
-        </stdout>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs154/pr166084" title="incorrect optimization of istore">
-      <compile files="X.java" inpath="simple.jar"/>
-	  <run class="Simple"/>
-    </ajc-test>
-       
-    <ajc-test dir="bugs154/pr165631" title="dual parameterizations not allowed">
-      <!-- two variations of the same situation, should fail in the same way -->
-      <compile files="Bug.java" options="-1.5">
-        <message kind="error" line="12" text="Cannot declare parent B"/>
-      </compile>
-      <compile files="Bug2.java" options="-1.5">
-        <message kind="error" line="13" text="Cannot declare parent B"/>
-      </compile>
-    </ajc-test>
-
-    <ajc-test dir="ltw"
-      title="Suppress warnings1"
-      keywords="xlint, ltw, nowarn, pr166238">
-        <compile
-            files="Main.java"
-        >
-        </compile>    
-        <run class="Main" ltw="aop-noxlintfile-nowarn.xml">
-            <stderr/> <!-- no warnings from missing xlint file: they are suppressed -->
-        </run>        
-    </ajc-test>
-
-    <ajc-test dir="ltw"
-      title="Suppress warnings2"
-      keywords="xlint, ltw, nowarn, pr166238">
-        <compile
-            files="Main.java"
-        >
-        </compile>    
-        <run class="Main" ltw="aop-noxlintfile-warnnone.xml">
-            <stderr/> <!-- no warnings from missing xlint file: they are suppressed -->
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs154/pr172107" title="null returned from getField()"
-		keywords="pr172107">
-        <compile files="ReadWriteAJBug172107.java,Instrumentation.aj"/>
-		<run class="ReadWriteAJBug172107"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs154/pr197719" title="annotation style syntax and cross package extension">
-      <compile files="test/aspects/C1.java,test/aspects/C3.java,test/aspects/MyAnn.java,test/aspects/MyAnnAspect.java,test/aspects2/C2.java" options="-1.5"/>
-      <run class="test.aspects2.C2"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs154/pr205907" title="new pointcut designators in a reference pointcut">
-      <compile files="Test.aj"/>
-    </ajc-test>
-
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc160/ajc160.xml b/tests/src/test/java/org/aspectj/systemtest/ajc160/ajc160.xml
deleted file mode 100644
index 6e02e8903..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc160/ajc160.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<!-- AspectJ v1.6.0 Tests -->
-<suite>
-
-    <ajc-test dir="bugs160/pr226567" title="pipeline compilation and generic return type">
-        <compile files="BarAspect.aj Foo.java Bar.java" options="-1.5"/>
-        <compile files="BarAspect.aj Bar.java Foo.java" options="-1.5"/>
-    </ajc-test>
-
-	<ajc-test dir="bugs160/pr225916" title="pipeline compilation and anonymous type">
-		<compile files="Test.java TestMBean.java TestAspect.java" options="-showWeaveInfo">
-		 <message kind="weave" text="Join point 'method-execution(java.lang.String test.jmx.Test.test())' in Type"/>
-		</compile>
-	</ajc-test>
-
-	<ajc-test dir="bugs160/pr214994" title="generic itd">
-		<compile files="Broke.java" options="-1.5"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs160/pr223605" title="generic decp ltw">
-		<compile files="GenericConfigurableBugTest.java" options="-1.5"><!-- -showWeaveInfo"-->
-		</compile>
-		<run class="test.GenericConfigurableBugTest"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs160/pr173602" title="duplicate itd npe">
-		<compile files="X.java">
-		  <message kind="error" line="2" text="intertype declaration from "/>
-		  <message kind="error" line="3" text="intertype declaration from "/>
-		  <message kind="error" line="6" text="intertype declaration from "/>
-		</compile>
-	</ajc-test>
-	
-    <ajc-test dir="bugs160/pr223094" title="ltw inherited itds">
-      <compile files="B.java" outjar="foo.jar"/>
-      <compile files="A.java" classpath="$sandbox/foo.jar"/>
-      <run class="p.A" classpath="$sandbox/foo.jar" ltw="aop.xml">
-        <stdout>
-          <line text="ok"/>
- 	    </stdout>
-      </run>
-    </ajc-test>
-
-   <ajc-test dir="bugs160/pr167197" title="generic type parameterized with array type">
-     <compile options="-1.5" files="AspectBreaker.java"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs160/pr167197" title="generic type parameterized with array type - 2">
-     <compile options="-1.5" files="Breaker2.java"/>
-     <run class="Breaker2"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs160/pr180264" title="classcastexception on array type">
-     <compile options="-warn:+uselessTypeCheck" files="Foo.java,Main.java"/>
-   </ajc-test>
-   
-	<ajc-test dir="bugs160/pr145018" title="ataj crashing with cflow, if and args">
-     <compile files="Broken.aj" options="-1.5"/>
-     <run class="Broken">
-     </run>
-    </ajc-test> 
-    
-	<ajc-test dir="bugs160/pr201748" title="itd with array">
-     <compile files="Foo.java">
-       <message kind="error" text="Type mismatch: cannot convert from Factory[] to Factory"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs160/various" title="incorrect itd error with generics">
-     <compile options="-1.5 -showWeaveInfo" files="IncorrectMessage.java">
-       <message kind="weave" text="Type 'Foo' (IncorrectMessage.java) has intertyped method from 'AspectDoWhatEver' (IncorrectMessage.java:'void Marker.doWhatEver()')"/>
-       <message kind="weave" text="Type 'Marker' (IncorrectMessage.java) has intertyped method from 'AspectDoWhatEver' (IncorrectMessage.java:'void Marker.doWhatEver()')"/>
-     </compile>       
-   </ajc-test>
-   
-   <ajc-test dir="bugs160/various" title="incorrect itd error with generics - 2">
-     <compile options="-1.5 -showWeaveInfo" files="IncorrectMessage2.java">
-       <message kind="weave" text="Type 'Foo' (IncorrectMessage2.java) has intertyped method from 'AspectDoWhatEver' (IncorrectMessage2.java:'void Marker.doWhatEver()')"/>
-       <message kind="weave" text="Type 'Marker' (IncorrectMessage2.java) has intertyped method from 'AspectDoWhatEver' (IncorrectMessage2.java:'void Marker.doWhatEver()')"/>
-     </compile>       
-   </ajc-test>
-   
-   
-   <ajc-test dir="bugs160/various" title="hasmethod anno value - I">
-     <compile options="-1.5 -XhasMember -showWeaveInfo" files="A.java">
-       <message kind="weave" text="Extending interface set for type 'B' (A.java) to include 'java.io.Serializable' (A.java)"/>
-     </compile>
-   </ajc-test>
-
-   <ajc-test dir="bugs160/various" title="hasmethod anno value - Z">
-     <compile options="-1.5 -XhasMember -showWeaveInfo" files="Z.java">
-       <message kind="weave" text="Extending interface set for type 'B' (Z.java) to include 'java.io.Serializable' (Z.java)"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs160/various" title="hasmethod anno value - S">
-     <compile options="-1.5 -XhasMember -showWeaveInfo" files="S.java">
-       <message kind="weave" text="Extending interface set for type 'B' (S.java) to include 'java.io.Serializable' (S.java)"/>
-     </compile>
-   </ajc-test>
-
-   <ajc-test dir="bugs160/various" title="hasmethod semantics">
-     <compile options="-1.5 -XhasMember -Xlint:ignore" files="HasMethodSemantics.java"/>
-     <run class="HasMethodSemantics">
-       <stdout>
-         <line text="Implements Marker? no"/>
-       </stdout>
-     </run>
-   </ajc-test>
-
-   <ajc-test dir="bugs160/pr204505" title="generics method matching - 1">
-     <compile options="-1.5 -showWeaveInfo" files="Bug.java">
-       <message kind="weave" text="execution(void C.save(java.lang.Object))"/>
-       <message kind="weave" text="execution(void C.saveAll(java.util.Collection))"/>
-     </compile>
-   </ajc-test>
-
-   <ajc-test dir="bugs160/pr204505" title="generics method matching - 2">
-     <compile options="-1.5" files="GenericInterfaceWithGenericArgumentPointcutBug.java"/>
-     <run class="mypackage.GenericInterfaceWithGenericArgumentPointcutBug"/>
-   </ajc-test>  
-   
-   <ajc-test dir="bugs160/pr219298" title="bounds check failure">
-     <compile options="-1.5" files="TestMarkers.java">
-       <message kind="error" line="11" text="Bound mismatch: The type TestMarkers.SubGenericsType is not a valid substitute for the bounded"/>
-     </compile>
-   </ajc-test>
-
-   <ajc-test dir="bugs160/pr219298" title="bounds check failure - 2">
-     <compile options="-1.5" files="TestMarkers2.java"/>
-   </ajc-test>
-
-   <ajc-test dir="bugs160/pr218167" title="dec field problem">
-     <compile options="-1.5" files="Test.java">
-       <message kind="warning" text="already has an annotation of type A, cannot add a second instance"/>
-     </compile>
-   </ajc-test>
-
-   <ajc-test dir="bugs160/pr206911" title="generics super itd">
-     <compile options="-1.5" files="VerifyError.java"/>
-     <run class="bugs.VerifyError"/>
-   </ajc-test>
-
-   <ajc-test dir="bugs160/pr206911" title="generics super itd - 2">
-     <compile options="-1.5" files="VerifyError2.java"/>
-     <run class="bugs.VerifyError2"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs160/pr216311" title="serialization and annotation style">
-     <compile options="-1.5" files="PersistabilityTest.java,IPersistable.java,Persistability.java"/>
-     <run class="PersistabilityTest"/>
-   </ajc-test>
-
-   <ajc-test dir="bugs160/pr214559" title="decp repetition problem">
-     <compile files="X.java"/>
-     <run class="test.X"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs160/pr214559" title="decp repetition problem - 2">
-     <compile files="Y.java"/>
-     <run class="Y"/>
-   </ajc-test>
-
-   <ajc-test dir="bugs160/pr214559" title="decp repetition problem - 3">
-     <compile files="TestClass.java Interface1.java Interface1TestClass.java DeclareParentsPrecedenceTest.java TestAspect.java"/>
-     <run class="DeclareParentsPrecedenceTest"/>
-   </ajc-test>
-
-   <ajc-test dir="bugs160/pr209831" title="illegal state exception with annotations">
-     <compile options="-1.5 -showWeaveInfo" files="Test.java">
-       <message kind="weave" text="Join point 'exception-handler(void Test.&lt;catch&gt;(java.lang.Throwable))' in Type 'Test' (Test.java:34) advised by before advice from 'ExactAnnotationTypePatternBug' (Test.java:5)"/>
-     </compile>
-     <run class="Test"/>
-   </ajc-test>
-
-   <ajc-test dir="bugs160/pr209831" title="illegal state exception with annotations - 2">
-     <compile options="-Xlint:ignore -1.5 -showWeaveInfo" files="Test2.java"/>
-     <run class="Test2"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs160/pr211146" title="itd lost generic signature">
-     <compile options=" -1.5" files="StringAspect.aj,StringClass.java" outjar="foo.jar"/>
-     <compile options=" -1.5" files="DemoUsage.java" classpath="foo.jar"/>
-   </ajc-test>
-   
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc160/annotationValueMatching.xml b/tests/src/test/java/org/aspectj/systemtest/ajc160/annotationValueMatching.xml
deleted file mode 100644
index ebcc8b4c2..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc160/annotationValueMatching.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<!-- AspectJ v1.6.0 Annotation Value Matching Tests -->
-<suite>
-
-   <ajc-test dir="features160/annotationValueMatching" title="enum references - 1">
-     <compile options="-1.5 -showWeaveInfo" files="Color.java,TrafficLight.java,Fruit.java,Fruity.java,EnumTest1.java"> 
-       <message kind="weave" text="Join point 'method-execution(void a.EnumTest1.m())' in Type 'a.EnumTest1' (EnumTest1.java:9) advised by before advice from 'a.EnumTest1' (EnumTest1.java:13)"/>
-       <message kind="weave" text="Join point 'method-execution(void a.EnumTest1.o())' in Type 'a.EnumTest1' (EnumTest1.java:11) advised by before advice from 'a.EnumTest1' (EnumTest1.java:13)"/>
-     </compile>
-     <run class="a.EnumTest1"/>
-   </ajc-test>
-
-   <ajc-test dir="features160/annotationValueMatching" title="enum references - 2">
-     <compile options="-1.5 -showWeaveInfo" files="Color.java,TrafficLight.java,Fruit.java,Fruity.java,EnumTest2.java"> 
-       <message kind="weave" text="Join point 'method-execution(void a.EnumTest2.m())' in Type 'a.EnumTest2' (EnumTest2.java:9) advised by before advice from 'a.EnumTest2' (EnumTest2.java:13)"/>
-       <message kind="weave" text="Join point 'method-execution(void a.EnumTest2.o())' in Type 'a.EnumTest2' (EnumTest2.java:11) advised by before advice from 'a.EnumTest2' (EnumTest2.java:13)"/>
-     </compile>
-     <run class="a.EnumTest2"/>
-   </ajc-test>
-
-   <ajc-test dir="features160/annotationValueMatching" title="enum references - 3">
-     <compile options="-1.5 -showWeaveInfo" files="Color.java,TrafficLight.java,Fruit.java,Fruity.java,EnumTest3.java"> 
-       <message kind="weave" text="Join point 'method-execution(void a.EnumTest3.m())' in Type 'a.EnumTest3' (EnumTest3.java:9) advised by before advice from 'a.EnumTest3' (EnumTest3.java:13)"/>
-     </compile>
-     <run class="a.EnumTest3"/>
-   </ajc-test>
-
-   <ajc-test dir="features160/annotationValueMatching" title="broken - 1">
-     <compile options="-1.5 -showWeaveInfo" files="Broken1.java"> 
-       <message kind="error" line="28" text="Invalid annotation value 'a', expected enum value"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="features160/annotationValueMatching" title="allkinds">
-     <compile options="-1.5 -showWeaveInfo" files="AllKinds.java"> 
-     </compile>
-   </ajc-test>
-
-   <ajc-test dir="features160/annotationValueMatching" title="int value matching">
-     <compile options="-1.5 -showWeaveInfo" files="IntValueMatching.java"> 
-       <message kind="weave" text="Join point 'method-execution(void IntValueMatching.b())' in Type 'IntValueMatching' (IntValueMatching.java:9) advised by before advice from 'X' (IntValueMatching.java:21)"/>
-     </compile>
-   </ajc-test>
-
-   <ajc-test dir="features160/annotationValueMatching" title="float value matching">
-     <compile options="-1.5 -showWeaveInfo" files="FloatValueMatching.java"> 
-       <message kind="weave" text="methodTwo"/>
-     </compile>
-     <run class="FloatValueMatching"/>
-   </ajc-test>
-
-   <ajc-test dir="features160/annotationValueMatching" title="double value matching">
-     <compile options="-1.5 -showWeaveInfo" files="DoubleValueMatching.java"> 
-       <message kind="weave" text="methodOne"/>
-     </compile>
-     <run class="DoubleValueMatching"/>
-   </ajc-test>
-
-   <ajc-test dir="features160/annotationValueMatching" title="char value matching">
-     <compile options="-1.5 -showWeaveInfo" files="CharValueMatching.java"> 
-       <message kind="weave" text="methodTwo"/>
-     </compile>
-     <run class="CharValueMatching"/>
-   </ajc-test>
-
-   <ajc-test dir="features160/annotationValueMatching" title="long value matching">
-     <compile options="-1.5 -showWeaveInfo" files="LongValueMatching.java"> 
-       <message kind="weave" text="methodOne"/>
-     </compile>
-     <run class="LongValueMatching"/>
-   </ajc-test>
-
-   <ajc-test dir="features160/annotationValueMatching" title="string value matching">
-     <compile options="-1.5 -showWeaveInfo" files="StringValueMatching.java"> 
-       <message kind="weave" text="methodOne"/>
-     </compile>
-     <run class="StringValueMatching"/>
-   </ajc-test>
-
-   <ajc-test dir="features160/annotationValueMatching" title="boolean value matching">
-     <compile options="-1.5 -showWeaveInfo" files="BooleanValueMatching.java"> 
-       <message kind="weave" text="methodOne"/>
-     </compile>
-     <run class="BooleanValueMatching"/>
-   </ajc-test>
-
-   <ajc-test dir="features160/annotationValueMatching" title="byte value matching">
-     <compile options="-1.5 -showWeaveInfo" files="ByteValueMatching.java"> 
-       <message kind="weave" text="methodOne"/>
-     </compile>
-     <run class="ByteValueMatching"/>
-   </ajc-test>
-
-   <ajc-test dir="features160/annotationValueMatching" title="short value matching">
-     <compile options="-1.5 -showWeaveInfo" files="ShortValueMatching.java"> 
-       <message kind="weave" text="methodOne"/>
-     </compile>
-     <run class="ShortValueMatching"/>
-   </ajc-test>
-
-   <ajc-test dir="features160/annotationValueMatching" title="parsing">
-     <compile options="-1.5 -showWeaveInfo Parsing.java"/>
-   </ajc-test>
-      
-   <ajc-test dir="features160/annotationValueMatching" title="simple">
-     <compile options="-1.5 -showWeaveInfo Simple.java">
-       <message kind="weave" text="Join point 'method-execution(void Marked.b())' in Type 'Marked' (Simple.java:18) advised by before advice from 'X' (Simple.java:28)"/>
-       <message kind="weave" text="Join point 'method-execution(void Marked.c())' in Type 'Marked' (Simple.java:21) advised by before advice from 'X' (Simple.java:28)"/>
-     </compile>       
-   </ajc-test>
-
-   <ajc-test dir="features160/annotationValueMatching" title="example one">
-     <compile options="-1.5 -showWeaveInfo ExampleOne.java">
-       <message kind="weave" text="m002"/>
-       <message kind="weave" text="m003"/>
-       <message kind="weave" text="m005"/>
-     </compile>       
-     <run class="ExampleOne">
-       <stderr>
-         <line text="tracing execution(void ExampleOne.m002())"/>
-         <line text="tracing execution(void ExampleOne.m003())"/>
-         <line text="tracing execution(void ExampleOne.m005())"/>
-       </stderr>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="features160/annotationValueMatching" title="error case">
-     <compile options="-1.5 Error.java">
-       <message kind="error" text="Invalid annotation value 'Color.GREEN', expected int value"/>
-       <message kind="error" text="Invalid annotation value 'hello', expected float value"/>
-       <message kind="error" text="Invalid annotation value 'foo', expected byte value"/>
-       <message kind="error" text="Invalid annotation value '123', expected boolean value"/>
-       <message kind="error" text="Invalid annotation value '12', expected enum value"/>
-       <message kind="error" text="Invalid annotation value '4212312312', expected short value"/>
-       <message kind="error" text="Invalid annotation value 'no', expected char value"/>
-       <message kind="error" text="Invalid annotation value '30.0f', expected long value"/>
-       <message kind="error" text="Invalid annotation value 'foo', expected double value"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="features160/annotationValueMatching" title="error - non existing value">
-     <compile options="-1.5 ErrorOne.java">
-       <message kind="error" text="The annotation 'Anno' does not define a value named 'ival'"/>
-     </compile>
-   </ajc-test>
-   
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc160/newfeatures-tests.xml b/tests/src/test/java/org/aspectj/systemtest/ajc160/newfeatures-tests.xml
deleted file mode 100644
index 3b00c8d15..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc160/newfeatures-tests.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<!-- AspectJ v1.6.0 Tests -->
-<suite>
-
-    <ajc-test dir="features160/weavingJavaxPackage" title="weave javax classes - no">
-      <compile files="A.java B.java" />
-      <compile files="X.aj" outjar="code.jar" options="-1.4"/>
-      <run class="javax.foo.A" classpath="code.jar" ltw="aop1.xml">
-      <stderr>
-      <line text="AspectJ Weaver Version"/>
-      <line text="register classloader"/>
-      <line text="using configuration"/>
-      <line text="register aspect X"/>
-      <line text="not being woven"/>
-      </stderr>
-        <stdout>
-           <line text="(A) method running"/>
-           <line text="(B) method running"/>
-        </stdout>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="features160/weavingJavaxPackage" title="weave javax classes - yes">
-      <compile files="A.java B.java" />
-      <compile files="X.aj" outjar="code.jar" options="-1.4"/>
-      <run class="javax.foo.A" classpath="code.jar" ltw="aop2.xml">
-        <stdout>
-           <line text="advised"/>
-           <line text="(A) method running"/>
-           <line text="advised"/>
-           <line text="(B) method running"/>
-        </stdout>
-      </run>
-    </ajc-test>
-
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc160/parameterAnnotations.xml b/tests/src/test/java/org/aspectj/systemtest/ajc160/parameterAnnotations.xml
deleted file mode 100644
index 1f06e2d82..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc160/parameterAnnotations.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<!-- AspectJ v1.6.0 Parameter Annotation Matching Tests -->
-<suite>
-
-   <ajc-test dir="features160/parameterAnnotationMatching" title="deow2">
-     <compile options="-1.5" files="Test2.java">
-       <message kind="warning" line="9" text="mOne"/>
-       <message kind="warning" line="13" text="mTwo"/>
-       <message kind="warning" line="15" text="mTwo"/>
-     </compile>
-   </ajc-test>
-
-   <ajc-test dir="features160/parameterAnnotationMatching" title="deow">
-     <compile options="-1.5" files="Test.java">
-       <message kind="warning" line="43" text="mOne"/>
-       <message kind="warning" line="45" text="mOne"/>
-       <message kind="warning" line="43" text="mTwo"/>
-       <message kind="warning" line="43" text="mThree"/> 
-       <message kind="warning" line="47" text="mFour"/> 
-       <message kind="warning" line="49" text="mFour"/> 
-       <message kind="warning" line="47" text="mFive"/> 
-       <message kind="warning" line="47" text="mSix"/> 
-       <message kind="warning" line="45" text="mSeven"/>
-       <message kind="warning" line="45" text="mEight"/>  
-       <message kind="warning" line="45" text="mNine"/> 
-       <message kind="warning" line="49" text="mTen"/> 
-       <message kind="warning" line="49" text="mEleven"/> 
-       <message kind="warning" line="49" text="mTwelve"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="features160/parameterAnnotationMatching" title="no xlint for wrong target">
-     <compile options="-1.5" files="NonNullAssertionForcer.java"/>
-   </ajc-test>
-
-   <ajc-test dir="features160/parameterAnnotationMatching" title="various combinations">
-     <compile options="-1.5 -showWeaveInfo" files="TestMatching.aj Anno1.java Anno2.java AnnotatedWithAnno1.java AnnotatedWithAnno2.java">
-       <message kind="weave" text="'TestMatching' (TestMatching.aj:4) advised by before advice from 'TestMatching' (TestMatching.aj:3)"/>
-       
-       <message kind="weave" text="'TestMatching' (TestMatching.aj:7) advised by before advice from 'TestMatching' (TestMatching.aj:6)"/>
-       
-       <message kind="weave" text="'TestMatching' (TestMatching.aj:11) advised by before advice from 'TestMatching' (TestMatching.aj:10)"/>
-       
-       <message kind="weave" text="'TestMatching' (TestMatching.aj:16) advised by before advice from 'TestMatching' (TestMatching.aj:15)"/>
-       
-       <message kind="weave" text="'TestMatching' (TestMatching.aj:22) advised by before advice from 'TestMatching' (TestMatching.aj:21)"/>
-
-       <message kind="weave" text="'TestMatching' (TestMatching.aj:27) advised by before advice from 'TestMatching' (TestMatching.aj:26)"/>
-       <message kind="weave" text="'TestMatching' (TestMatching.aj:31) advised by before advice from 'TestMatching' (TestMatching.aj:26)"/>
-       
-       <message kind="weave" text="'TestMatching' (TestMatching.aj:34) advised by before advice from 'TestMatching' (TestMatching.aj:33)"/>
-       
-       <message kind="weave" text="'TestMatching' (TestMatching.aj:40) advised by before advice from 'TestMatching' (TestMatching.aj:39)"/>
-       <message kind="weave" text="'TestMatching' (TestMatching.aj:41) advised by before advice from 'TestMatching' (TestMatching.aj:39)"/>
-       <message kind="weave" text="'TestMatching' (TestMatching.aj:42) advised by before advice from 'TestMatching' (TestMatching.aj:39)"/>
-       
-       <message kind="weave" text="'TestMatching' (TestMatching.aj:47) advised by before advice from 'TestMatching' (TestMatching.aj:46)"/>
-       <message kind="weave" text="'TestMatching' (TestMatching.aj:48) advised by before advice from 'TestMatching' (TestMatching.aj:46)"/>
-       
-       <message kind="weave" text="'TestMatching' (TestMatching.aj:53) advised by before advice from 'TestMatching' (TestMatching.aj:52)"/>
-       <message kind="weave" text="'TestMatching' (TestMatching.aj:54) advised by before advice from 'TestMatching' (TestMatching.aj:52)"/>
-       
-       <message kind="warning" line="57" text="not been applied"/>
-       
-       <message kind="weave" text="'TestMatching' (TestMatching.aj:62) advised by before advice from 'TestMatching' (TestMatching.aj:61)"/>
-       
-     </compile>
-   </ajc-test>
-   
-    <ajc-test dir="features160/parameterAnnotationMatching" title="wildcarded matching">
-     <compile options="-1.5 -showWeaveInfo" files="WildcardedMatching.aj Anno1.java Anno2.java AnnotatedWithAnno1.java AnnotatedWithAnno2.java">
-       <!-- tbd -->
-     </compile>
-   </ajc-test>
-   
-   
-   <ajc-test dir="features160/parameterAnnotationMatching" title="various combinations - ctors">
-     <compile options="-1.5 -showWeaveInfo" files="TestMatchingCtors.aj Anno1.java Anno2.java AnnotatedWithAnno1.java AnnotatedWithAnno2.java">
-       <message kind="weave" text="(TestMatchingCtors.aj:4) advised by before advice from 'TestMatching' (TestMatchingCtors.aj:3)"/>
-       
-       <message kind="weave" text="(TestMatchingCtors.aj:7) advised by before advice from 'TestMatching' (TestMatchingCtors.aj:6)"/>
-       
-       <message kind="weave" text="(TestMatchingCtors.aj:11) advised by before advice from 'TestMatching' (TestMatchingCtors.aj:10)"/>
-       
-       <message kind="weave" text="(TestMatchingCtors.aj:16) advised by before advice from 'TestMatching' (TestMatchingCtors.aj:15)"/>
-       
-       <message kind="weave" text="(TestMatchingCtors.aj:22) advised by before advice from 'TestMatching' (TestMatchingCtors.aj:21)"/>
-
-       <message kind="weave" text="(TestMatchingCtors.aj:27) advised by before advice from 'TestMatching' (TestMatchingCtors.aj:26)"/>
-       <message kind="weave" text="(TestMatchingCtors.aj:31) advised by before advice from 'TestMatching' (TestMatchingCtors.aj:26)"/>
-       
-       <message kind="weave" text="(TestMatchingCtors.aj:34) advised by before advice from 'TestMatching' (TestMatchingCtors.aj:33)"/>
-       
-       <message kind="weave" text="(TestMatchingCtors.aj:40) advised by before advice from 'TestMatching' (TestMatchingCtors.aj:39)"/>
-       <message kind="weave" text="(TestMatchingCtors.aj:41) advised by before advice from 'TestMatching' (TestMatchingCtors.aj:39)"/>
-       <message kind="weave" text="(TestMatchingCtors.aj:42) advised by before advice from 'TestMatching' (TestMatchingCtors.aj:39)"/>
-       
-       <message kind="weave" text="(TestMatchingCtors.aj:47) advised by before advice from 'TestMatching' (TestMatchingCtors.aj:46)"/>
-       <message kind="weave" text="(TestMatchingCtors.aj:48) advised by before advice from 'TestMatching' (TestMatchingCtors.aj:46)"/>
-       
-       <message kind="weave" text="(TestMatchingCtors.aj:53) advised by before advice from 'TestMatching' (TestMatchingCtors.aj:52)"/>
-       <message kind="weave" text="(TestMatchingCtors.aj:54) advised by before advice from 'TestMatching' (TestMatchingCtors.aj:52)"/>
-       
-       <message kind="warning" line="57" text="not been applied"/>
-       
-       <message kind="weave" text="(TestMatchingCtors.aj:62) advised by before advice from 'TestMatching' (TestMatchingCtors.aj:61)"/>
-       
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="features160/parameterAnnotationMatching" title="hasmethod">
-     <compile options="-1.5 -showWeaveInfo -XhasMember" files="HasMethodMatching.aj Anno1.java Anno2.java AnnotatedWithAnno1.java AnnotatedWithAnno2.java">
-       <message kind="weave" text="Extending interface set for type 'Target1' (HasMethodMatching.aj) to include 'java.io.Serializable' (HasMethodMatching.aj)"/>
-       <message kind="weave" text="Extending interface set for type 'Target3' (HasMethodMatching.aj) to include 'java.io.Serializable' (HasMethodMatching.aj)"/>
-       <message kind="weave" text="Extending interface set for type 'Target4' (HasMethodMatching.aj) to include 'java.io.Serializable' (HasMethodMatching.aj)"/>
-     </compile>  
-     <run class="HasMethodMatching">
-       <stdout>
-         <line text="Target1? true"/>
-         <line text="Target2? false"/>
-         <line text="Target3? true"/>
-         <line text="Target4? true"/>
-         <line text="Target5? false"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="features160/parameterAnnotationMatching" title="binary weaving">
-     <compile options="-1.5" files="SimpleType.java Anno1.java Anno2.java AnnotatedWithAnno1.java AnnotatedWithAnno2.java AnnotatedWithBoth.java" outjar="code.jar"/>
-     <compile options="-1.5 -showWeaveInfo" files="SimpleAspect.java" inpath="code.jar">
-        <message kind="weave" text="(SimpleType.java:2) advised by before advice from 'SimpleAspect' (SimpleAspect.java:2)"/>
-        <message kind="weave" text="(SimpleType.java:3) advised by before advice from 'SimpleAspect' (SimpleAspect.java:4)"/>
-        <message kind="weave" text="(SimpleType.java:4) advised by before advice from 'SimpleAspect' (SimpleAspect.java:6)"/>
-        <message kind="weave" text="(SimpleType.java:4) advised by before advice from 'SimpleAspect' (SimpleAspect.java:4)"/>
-        <message kind="weave" text="(SimpleType.java:4) advised by before advice from 'SimpleAspect' (SimpleAspect.java:3)"/>
-        <message kind="weave" text="(SimpleType.java:5) advised by before advice from 'SimpleAspect' (SimpleAspect.java:5)"/>
-        <message kind="weave" text="(SimpleType.java:5) advised by before advice from 'SimpleAspect' (SimpleAspect.java:4)"/>
-        <message kind="weave" text="(SimpleType.java:6) advised by before advice from 'SimpleAspect' (SimpleAspect.java:7)"/>
-        <message kind="weave" text="(SimpleType.java:6) advised by before advice from 'SimpleAspect' (SimpleAspect.java:6)"/>
-        <message kind="weave" text="(SimpleType.java:6) advised by before advice from 'SimpleAspect' (SimpleAspect.java:5)"/>
-        <message kind="weave" text="(SimpleType.java:6) advised by before advice from 'SimpleAspect' (SimpleAspect.java:4)"/>
-        <message kind="weave" text="(SimpleType.java:6) advised by before advice from 'SimpleAspect' (SimpleAspect.java:3)"/>
-        <message kind="weave" text="(SimpleType.java:6) advised by before advice from 'SimpleAspect' (SimpleAspect.java:2)"/>
-     </compile>
-   </ajc-test>
-   
-   
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc160/sanity-tests.xml b/tests/src/test/java/org/aspectj/systemtest/ajc160/sanity-tests.xml
deleted file mode 100644
index 3d5654361..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc160/sanity-tests.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<!-- AspectJ v1.6.0 Tests -->
-<suite>
-
-    <!-- empty class -->
-    <ajc-test dir="bugs160/simplejava" title="simple - a">
-      <compile files="SimpleA.java" options="-1.5"/>
-    </ajc-test>
-
-    <!-- class with one method -->
-    <ajc-test dir="bugs160/simplejava" title="simple - b">
-      <compile files="SimpleB.java" options="-1.5"/>
-      <run class="SimpleB"/>
-    </ajc-test>
-    
-    <!-- empty aspect -->
-    <ajc-test dir="bugs160/simplejava" title="simple - c">
-      <compile files="SimpleC.java" options="-1.5"/>
-    </ajc-test>
-    
-    <!-- simple before -->
-    <ajc-test dir="bugs160/simplejava" title="simple - d">
-      <compile files="SimpleD.java" options="-1.5"/>
-    </ajc-test>
-    
-    <!-- simple itd field -->
-    <ajc-test dir="bugs160/simplejava" title="simple - e">
-      <compile files="SimpleE.java" options="-1.5"/>
-    </ajc-test>
-    
-    <!-- aspect with main calling a static method -->
-    <ajc-test dir="bugs160/simplejava" title="simple - f">
-      <compile files="SimpleF.java" options="-1.5"/>
-    </ajc-test>
-    
-    <!-- pertarget -->
-    <ajc-test dir="bugs160/simplejava" title="simple - g">
-      <compile files="SimpleG.java" />
-    </ajc-test>
-    
-    <!-- generic ctor itds -->
-    <ajc-test dir="bugs160/simplejava" title="simple - h">
-      <compile files="SimpleH.java" options="-1.5"/>
-    </ajc-test>
-    
-    <!-- overriding generic itd methods -->
-    <ajc-test dir="bugs160/simplejava" title="simple - i">
-      <compile files="SimpleI.java" options="-1.5"/>
-    </ajc-test>
-    
-    <!-- check class file version is 50.0 -->
-    <ajc-test dir="bugs160/simplejava" title="simple - j">
-      <compile files="SimpleJ.java" options="-1.6"/>
-    </ajc-test>
-
-    <!-- check class file version is 50.0 -->
-    <ajc-test dir="bugs160/simplejava" title="simple - k">
-      <compile files="SimpleJ.java" options="-source 1.6"/>
-    </ajc-test>
-
-    <!-- check class file version is 50.0 -->
-    <ajc-test dir="bugs160/simplejava" title="simple - l">
-      <compile files="SimpleJ.java" options="-source 1.6 -target 1.6"/>
-    </ajc-test>
-
-    <!-- check class file version is 49.0 -->
-    <ajc-test dir="bugs160/simplejava" title="simple - m">
-      <compile files="SimpleJ.java" options="-1.5"/>
-    </ajc-test>
-
-
-    <ajc-test dir="bugs160/simplejava" title="simple - n">
-      <compile files="SimpleN.java" options="-1.6"/>
-    </ajc-test>
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc161/ajc161.xml b/tests/src/test/java/org/aspectj/systemtest/ajc161/ajc161.xml
deleted file mode 100644
index abc3e058e..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc161/ajc161.xml
+++ /dev/null
@@ -1,321 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<!-- AspectJ v1.6.1 Tests -->
-<suite>
-
-
-	<ajc-test dir="bugs161/pr237447" title="signature processing">
-    	<compile files="GenericClass.java SomeClass.java GenericGenericMemberClass.java UnrelatedAspect.java" options="-1.5"/>
-    </ajc-test>
-
-	<ajc-test dir="bugs161/pr173978" title="lv table for around">
-    	<compile files="TestAroundAspect.java Test.java" options="-1.5"/>
-    </ajc-test>
-    
-	<ajc-test dir="bugs161/pr237419" title="generics ataround">
-    	<compile files="problem/aspect/AnyAspect.java problem/SpecificService.java problem/Specific.java problem/GenericService.java problem/Generic.java" options="-1.5"/>
-    	<run class="problem.SpecificService"/>
-    </ajc-test>
-    
-	<ajc-test dir="bugs161/pr203367" title="generic marker match">
-    	<compile files="CantMatchOnInterfaceIntroducedToGenericClass.java" options="-1.5"/>
-    	<run class="bug.CantMatchOnInterfaceIntroducedToGenericClass"/>
-    </ajc-test>
-    
-	<ajc-test dir="bugs161/pr198196" title="super itds - 2">
-    	<compile files="Marker.java Foo.java MarkerAspect2.java"/>
-    	<run class="Foo">
-	    	<stdout>
-	    		<line text="a"/>
-	    		<line text="a"/>
-	    		<line text="a"/>
-	    		<line text="a"/>
-	    		<line text="a"/>
-	    		<line text="a"/>
-	    	</stdout>
-    	</run>
-    </ajc-test>
-    
-	<ajc-test dir="bugs161/pr198196" title="super itds - 3">
-    	<compile files="Marker.java Foo.java MarkerAspect1.java"/>
-    	<run class="Foo"/>
-    </ajc-test>
-    
-	<ajc-test dir="bugs161/pr198196" title="super itds - 4">
-    	<compile files="Marker.java Foo.java MarkerAspect3.java"/>
-    	<run class="Foo"/>
-    </ajc-test>
-    
-	<ajc-test dir="bugs161/pr134425" title="super itds">
-    	<compile files="Derived.java Base.java"/>
-    	<run class="pkg.Derived"/>
-    </ajc-test>
-    
-	<ajc-test dir="bugs161/pr237381" title="ataspectj deow - 1">
-    	<compile files="Deow1.java" options="-1.5">
-    	  <message kind="warning" line="7" text="fromX"/>
-    	  <message kind="warning" line="15" text="fromY"/>
-    	</compile>
-    </ajc-test>
-    
-	<ajc-test dir="bugs161/pr237381" title="ataspectj deow - 2">
-    	<compile files="Deow2.java" options="-1.5">
-    	  <message kind="error" line="7" text="fromX"/>
-    	  <message kind="error" line="15" text="fromY"/>
-    	</compile>
-    </ajc-test>
-    
-	<ajc-test dir="bugs161/pr102733" title="running broken code">
-    	<compile files="Invoker.java C.java" options="-proceedOnError">
-    	  <message kind="error" line="2" text="Syntax error"/>
-    	</compile>
-    	<run class="Invoker"/>
-    </ajc-test>
-    
-	<ajc-test dir="bugs161/pr102733" title="running broken code - 2">
-    	<compile files="Invoker2.java C2.java" options="-proceedOnError">
-    	  <message kind="error" line="5"/>
-    	</compile>
-    	<run class="Invoker2"/>
-    </ajc-test>
-    
-	<ajc-test dir="bugs161/pr168982" title="error on non-abstract generic ataspectj aspect">
-    	<compile files="TracingAspect2.java" options="-1.5">
-    	  <message kind="error" line="9"/>
-    	</compile>
-    </ajc-test>
-    
-	<ajc-test dir="bugs161/pr234933" title="ignoring type level suppress">
-    	<compile files="Foobar.java" options="-1.5 -Xlint:error"/>
-    </ajc-test>
-    
-	<ajc-test dir="bugs161/pr223226" title="duplicate method signature - 2">
-    	<compile files="AspectX.java BInterface.java FooInterface.java AspectXMarker.java Foo.java Test.java" options="-1.5"/>
-    	<run class="Test"/>
-    </ajc-test>
-    
-	<ajc-test dir="bugs161/pr223226" title="duplicate method signature">
-    	<compile files="AspectX.java BInterface.java FooInterface.java AspectXMarker.java Foo.java Test.java" options="">
-    	  <message kind="error" line="1"/>
-    	  <message kind="error" line="2"/>
-    	  <message kind="error" line="3"/>
-    	  <message kind="error" line="5"/>
-    	</compile>
-    </ajc-test>
-
-	<ajc-test dir="bugs161/pr197719" title="protected methods and around advice - again - 2">
-    	<compile files="test/aspects/C1.java test/aspects/C3.java test/aspects/MyAnn.java test/aspects/MyAnnAspect.java test/aspects2/C2.java" options="-1.5 -showWeaveInfo">
-    	  <message kind="weave" text="Join point 'method-call(void test.aspects.C1.aMethod())' in Type 'test.aspects.C1' (C1.java:12) "/>
-    	  
-    	  <!-- first of these through accessor - so line number wrong and target wrong -->
-    	  <message kind="weave" text="Join point 'method-call(void test.aspects2.C2.aMethod())' in Type 'test.aspects2.C2' (C2.java:1) "/><!-- was line 18 -->
-    	  <message kind="weave" text="Join point 'method-call(void test.aspects2.C2.aMethod())' in Type 'test.aspects2.C2' (C2.java:8) "/>
-    	  <message kind="weave" text="Join point 'method-call(void test.aspects2.C2.aMethod())' in Type 'test.aspects2.C2' (C2.java:29) "/>
-
-    	  <message kind="weave" text="Join point 'method-call(void test.aspects.C1.aMethod())' in Type 'test.aspects.C3' (C3.java:10) "/>
-    	  <message kind="weave" text="Join point 'method-call(void test.aspects2.C2.aMethod())' in Type 'test.aspects.C3' (C3.java:13) "/>
-    	  <message kind="weave" text="Join point 'method-call(void test.aspects.C1.aMethod())' in Type 'test.aspects.C3$InnerClass' (C3.java:24) "/>
-    	  <message kind="weave" text="Join point 'method-call(void test.aspects2.C2.aMethod())' in Type 'test.aspects.C3$InnerClass' (C3.java:27) "/>
-    	  <message kind="weave" text="Join point 'method-call(void test.aspects.C1.aMethod())' in Type 'test.aspects.C3' (C3.java:34) "/>
-
-    	</compile>
-
-    	<run class="test.aspects.C3">
-    	</run>
-    </ajc-test>
-    
-	<ajc-test dir="bugs161/pr197719" title="protected methods and around advice - again">
-    	<compile files="A.java B.java X.java" options="-1.5"/>
-    	<run class="b.B">
-    	  <stdout>
-    	    <line text="calling m()"/>
-    	    <line text="advice running"/>
-    	    <line text="m() running"/>
-    	  </stdout>
-    	</run>
-    </ajc-test>
-
-	<ajc-test dir="bugs161/pr230075" title="protected methods and around advice">
-    	<compile files="A.java B.java C.java X.java" options="-1.5"/>
-    	<run class="a.C"/>
-    </ajc-test>
-    
-	<ajc-test dir="bugs161/pr174385" title="static strings in annotation pointcuts">
-    	<compile files="StaticFinalStringInPointcutAspect.java" options="-1.5"/>
-    	<run class="bug.StaticFinalStringInPointcutAspect"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs161/pr199130" title="complex bounds on generic aspect - 1">
-    	<compile files="Simple.java" options="-1.5"/>
-    	<run class="Simple">
-    	</run>
-    </ajc-test>
-    
-	<ajc-test dir="bugs161/pr199130" title="complex bounds on generic aspect - 2">
-    	<compile files="Complex.java" options="-1.5"/>
-    	<run class="Complex">
-    	</run>
-    </ajc-test>
-    
-	<ajc-test dir="bugs161/pr199130" title="complex bounds on generic aspect - 3">
-    	<compile files="Complex2.java" options="-1.5"/>
-    	<run class="Complex2">
-    	</run>
-    </ajc-test>
-
-	<ajc-test dir="bugs161/pr226201" title="generic aspect around advice">
-    	<compile files="IntAspTest.java" options="-1.5"/>
-    	<run class="IntAspTest">
-    	</run>
-    </ajc-test>
-
-	<ajc-test dir="bugs161/pr235829" title="crazy generics and inner types">
-    	<compile files="Main.java a/Adapter.java a/b/Adapter.java" options="-1.5"/>
-    	<run class="Main"/>
-    </ajc-test>    
-
-    <ajc-test dir="bugs161/pr235597" title="annotation exposure and generics">
-        <compile files="AnnotationTest1.java SomeAnnotation.java SomeAspect.java" options="-1.5"/>
-        <run class="AnnotationTest1">
-          <stdout>
-            <line text="@someAspect annotation parameter (call)"/>
-            <line text="@someAspect annotation no parameter"/>
-            <line text="@someAspect method name"/>
-            <line text="@someAspect annotation parameter (execution)"/>
-            <line text="test 1"/>
-            <line text="@someAspect annotation parameter (call)"/>
-            <line text="@someAspect annotation no parameter"/>
-            <line text="@someAspect method name"/>
-            <line text="@someAspect annotation parameter (execution)"/>
-            <line text="test 2"/>
-            <line text="@someAspect annotation parameter (call)"/>
-            <line text="@someAspect annotation no parameter"/>
-            <line text="@someAspect method name"/>
-            <line text="@someAspect annotation parameter (execution)"/>
-            <line text="test 3"/>
-          </stdout>
-        </run>
-    </ajc-test>
-    
-
-    <ajc-test dir="bugs161/pr235204" title="incorrect call relationship">
-        <compile files="RecursiveCatcher.java" options="-1.5 -emacssym"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs161/pr233838" title="itd precedence - 1">
-        <compile files="Z.java" options="-1.5"/>
-        <run class="Z">
-          <stdout>
-            <line text="X.test()"/>
-          </stdout>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="bugs161/pr233838" title="itd precedence - 2">
-        <compile files="Z2.java" options="-1.5"/>
-        <run class="Z2">
-          <stdout>
-            <line text="Y.test()"/>
-          </stdout>
-        </run>
-    </ajc-test>
-    
-
-    <ajc-test dir="bugs161/pr227401" title="getfield problem with generics">
-        <compile files="Instrumentation.java Fails.java" options="-1.5"/>
-        <run class="Fails">
-          <stdout>
-            <line text="getField(* protS)  getField()='protected java.lang.String Fails$A.protS'  getDeclaringType()='class Fails$A'"/>
-            <line text="getField(* prot)  getField()='protected int Fails$A.prot'  getDeclaringType()='class Fails$A'"/>
-            <line text="22"/>
-            <line text="getField(* defS)  getField()='java.lang.String Fails$A.defS'  getDeclaringType()='class Fails$A'"/>
-            <line text="getField(* def)  getField()='int Fails$A.def'  getDeclaringType()='class Fails$A'"/>
-            <line text="11"/>
-            <line text="getField(* defS)  getField()='java.lang.String Fails$A.defS'  getDeclaringType()='class Fails$A'"/>
-            <line text="getField(* def)  getField()='int Fails$A.def'  getDeclaringType()='class Fails$A'"/>
-            <line text="22"/>
-          </stdout>
-        </run>
-    </ajc-test> 
-    
-    <ajc-test dir="bugs161/pr231478" title="generic abstract aspects">
-        <compile files="Base.java Sub.java AbstractComponent.java AbstractWindow.java" options="-1.5"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs161/pr227993" title="field jp anno value">
-        <compile files="FieldJP.java" options="-1.5"/>
-        <run class="FieldJP">
-          <stderr>
-            <line text="get of YES field"/>
-            <line text="fone=0"/>
-            <line text="get of NO field"/>
-            <line text="ftwo=0"/>
-            <line text="fthr=0"/>
-            <line text="set of YES field"/>
-            <line text="set of NO field"/>
-          </stderr>
-        </run>
-    </ajc-test> 
-
-    <ajc-test dir="bugs161/pr231187x" title="generics bounds decp">
-        <compile files="Cement.java ConcreteClass.java SuperClass.java SuperClassAspect.aj WetCement.java Main.java" options="-1.5"/>
-        <run class="concrete.Main">
-          <stdout>
-            <line text="ran!"/>
-          </stdout>
-        </run>
-    </ajc-test> 
-    
-    <ajc-test dir="bugs161/pr231187x" title="generics bounds decp - 2">
-        <compile files="Cement.java ConcreteClass.java SuperClass.java WetCement.java" options="-1.5">
-          <message kind="error" text="The type WetCement is not a valid substitute for the bounded parameter"/>
-        </compile>
-    </ajc-test> 
-    
-    <ajc-test dir="bugs161/pr230134" title="ltw inherited cflow">
-      <compile files="HW.java"/>
-      <compile files="SimpleTracing.java Tracing.java HelloWorldTracing.java" outjar="foo.jar" options="-1.4"/>
-      <run class="hello.HW" classpath="$sandbox/foo.jar" ltw="aop.xml">
-        <stdout>
-          <line text="Hello World"/>
- 	    </stdout>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs161/pr229910" title="around advice on field set">
-        <compile files="Test.java" options="-1.5"/>
-        <run class="Test"/>
-    </ajc-test> 
-    
-    <ajc-test dir="bugs161/pr226567" title="pipeline compilation and generic return type">
-        <compile files="BarAspect.aj Foo.java Bar.java" options="-1.5"/>
-        <compile files="BarAspect.aj Bar.java Foo.java" options="-1.5"/>
-    </ajc-test> 
-    
-    <ajc-test dir="bugs161/pr235505" title="privileged generic aspect">
-        <compile files="A.java" options="-1.5"/>
-    </ajc-test> 
-    
-    <ajc-test dir="bugs161/pr235505" title="privileged generic aspect - 2">
-        <compile files="B.java" options="-1.5"/>
-        <run class="B">
-          <stdout>
-            <line text="Hello World"/>
-            <line text="Hello World"/>
-          </stdout>
-        </run>
-    </ajc-test> 
-    
-    <ajc-test dir="bugs161/pr64222" title="parsing around advice no return">
-        <compile files="C.java" options="-1.5">
-          <message kind="error" line="6" text="to complete around advice declaration"/>
-        </compile>
-    </ajc-test> 
-
-    <ajc-test dir="bugs161/pr159268" title="before array name">
-        <compile files="C.java" options="-1.5"/>
-    </ajc-test> 
-    
-    
-
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc161/annotationFieldBinding.xml b/tests/src/test/java/org/aspectj/systemtest/ajc161/annotationFieldBinding.xml
deleted file mode 100644
index 94b99951a..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc161/annotationFieldBinding.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<!-- AspectJ v1.6.1 Optimized Annotation Field Binding Tests -->
-<suite>
-
-   <ajc-test dir="features161/optimizedAnnotationBinding" title="case one - syntax">
-     <compile options="-1.5" files="CaseOne.java"/> 
-     <run class="CaseOne">
-       <stdout>
-         <line text="ONE"/>
-         <line text="TWO"/>
-         <line text="THREE"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="features161/optimizedAnnotationBinding" title="case two - no such field">
-     <compile options="-1.5" files="CaseTwo.java">
-       <message kind="error" line="30" text="No field of type 'Level' exists on annotation type 'Anno'"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="features161/optimizedAnnotationBinding" title="case three - ambiguous">
-     <compile options="-1.5" files="CaseThree.java">
-       <message kind="error" line="31" text="The field type 'Level' is ambiguous for annotation type 'Anno'"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="features161/optimizedAnnotationBinding" title="case four - default value">
-     <compile options="-1.5" files="CaseFour.java"/> 
-     <run class="CaseFour">
-       <stdout>
-         <line text="ONE"/>
-         <line text="TWO"/>
-         <line text="ONE"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="features161/optimizedAnnotationBinding" title="case five - not an enum - compiler limitation">
-     <compile options="-1.5" files="CaseFive.java">
-       <message kind="error" line="20" text="The field within the annotation must be an enum, string or int. 'float' is not"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="features161/optimizedAnnotationBinding" title="case six - not an execution join point - compiler limitation">
-     <compile options="-1.5" files="CaseSix.java">
-       <message kind="error" line="20" text="Annotation field binding is only supported at method-execution join points"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="features161/optimizedAnnotationBinding" title="case seven - annos in packages one">
-     <compile options="-1.5" files="CaseSeven.java"/> 
-     <run class="p.q.r.CaseSeven">
-       <stdout>
-         <line text="ONE"/>
-         <line text="TWO"/>
-         <line text="THREE"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="features161/optimizedAnnotationBinding" title="case eight - annos in packages two">
-     <compile options="-1.5" files="CaseEight.java"/> 
-     <run class="p.q.r.CaseEight">
-       <stdout>
-         <line text="ONE"/>
-         <line text="TWO"/>
-         <line text="THREE"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="features161/optimizedAnnotationBinding" title="case nine - everything in different packages">
-     <compile options="-1.5" files="CaseNine.java Level.java Anno.java"/> 
-     <run class="p.q.r.CaseNine">
-       <stdout>
-         <line text="ONE"/>
-         <line text="TWO"/>
-         <line text="THREE"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="features161/optimizedAnnotationBinding" title="case ten - binding multiple things">
-     <compile options="-1.5" files="CaseTen.java"/> 
-     <run class="CaseTen">
-       <stdout>
-         <line text="ONE:3"/>
-         <line text="TWO:4"/>
-         <line text="THREE:5"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="features161/optimizedAnnotationBinding" title="case eleven - binding multiple annotation fields">
-     <compile options="-1.5" files="CaseEleven.java"/> 
-     <run class="CaseEleven">
-       <stdout>
-         <line text="ONE:GREEN"/>
-         <line text="TWO:GREEN"/>
-         <line text="THREE:BLUE"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="features161/optimizedAnnotationBinding" title="case twelve - binding anno and anno value">
-     <compile options="-1.5" files="CaseTwelve.java"/> 
-     <run class="CaseTwelve">
-       <stdout>
-         <line text="ONE:GREEN"/>
-         <line text="TWO:GREEN"/>
-         <line text="THREE:BLUE"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   
-   <ajc-test dir="features161/optimizedAnnotationBinding" title="case thirteen - bug npe">
-     <compile options="-1.5" files="CaseThirteen.java">
-       <message kind="error" line="31" text="No field of type 'java.lang.String'"/>
-       <message kind="error" line="31" text="When using @annotation"/>
-       <message kind="error" line="32" text="cannot be resolved"/>
-     </compile>
-   </ajc-test>
-   
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1610/ajc1610.xml b/tests/src/test/java/org/aspectj/systemtest/ajc1610/ajc1610.xml
deleted file mode 100644
index 7dce456b7..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc1610/ajc1610.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-
-
-  <ajc-test dir="bugs1610/pr363962" title="pr363962">
-    <compile files="Code.java" options="-1.5"/>
-    <run class="Code">
-    <stdout>
-	    <line text="OK"/>
-    </stdout>
-    </run>
-  </ajc-test>
-  
-  
-  <ajc-test dir="bugs1610/pr324932" title="pr324932">
-    <compile files="A.java" options="-1.5"/>
-    <compile files="X.aj" options="-1.5 -Xlint:ignore" />
-    <run class="A" ltw="aop.xml">
-    <stdout>
-	    <line text="It WORKS"/>
-    </stdout>
-    </run>
-  </ajc-test>
-  
-  <ajc-test dir="bugs1610/pr324932_2" title="pr324932 - 2">
-    <compile files="A.java" options="-1.5"/>
-    <run class="A" ltw="aop.xml">
-    <stdout>
-	    <line text="It WORKS"/>
-    </stdout>
-    </run>
-  </ajc-test>
-  
-  <ajc-test dir="bugs1610/pr322446" title="declare parents abstract aspect">
-    <compile files="Super.java I.java" outjar="aspects.jar" options="-1.5"/>
-    <compile files="Code.java" classpath="aspects.jar" options="-1.5 -emacssym"/>
-    <run class="Code">
-    <stdout>
-    <line text="true"/>
-    </stdout></run>
-  </ajc-test>
-  
-  <ajc-test dir="bugs1610/prx" title="duplicate annotation">
-    <compile files="A.java" options="-1.5">
-    </compile>
-  </ajc-test>
-  
-  <ajc-test dir="bugs1610/pr319431" title="loading old code">
-    <compile files="Azpect2.java" inpath="builtWith168.jar" options="-1.5">
-    </compile>
-  </ajc-test>
-  
-  <ajc-test dir="bugs1610/pr322272" title="abstract aspects and declares">
-    <compile files="Base.java" outjar="superaspect.jar" options="-1.5"/>
-    <compile files="F1.java" classpath="superaspect.jar" options="-1.5">
-    </compile>
-    <run class="F1">
-    <stdout>
-    <line text="@Anno()"/>
-    </stdout>
-    </run>
-  </ajc-test>
-  
-  <ajc-test dir="bugs1610/pr322272" title="abstract aspects and declares - 2">
-    <compile files="Base2.java" outjar="superaspect.jar" options="-1.5"/>
-    <compile files="F2.java" classpath="superaspect.jar" options="-1.5">
-    </compile>
-    <run class="F2">
-    <stdout>
-    <line text="@Anno()"/>
-    </stdout>
-    </run>
-  </ajc-test>
-  
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1610/newfeatures-tests.xml b/tests/src/test/java/org/aspectj/systemtest/ajc1610/newfeatures-tests.xml
deleted file mode 100644
index d6a2b7652..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc1610/newfeatures-tests.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<!-- AspectJ v1.6.0 Tests -->
-<suite>
-
-"makeSJP optimization - LDC - YES
-
-  
-  
-      <ajc-test dir="features1610/makeSJPOptimization" title="makeSJP optimization - LDC - No">
-      <compile files="B.java Azpect.aj" options="-1.4"/>
-      <run class="B">
- 	   	<stdout>
-   		 <line text="execution(public static void B.main(java.lang.String[]))"/>
-   		 <line text="execution(public java.lang.Object B.method1(java.lang.String))"/>
-   		 <line text="execution(public java.lang.Object B.method2(java.lang.String, java.lang.Integer))"/>   		 
-   		 <line text="execution(private void B.method3())"/>
-   		 <line text="execution(public static void B.method4())"/>
-      	</stdout>
-      </run>
-    </ajc-test>
- 
-      <ajc-test dir="features1610/makeSJPOptimization" title="makeSJP optimization - LDC - Yes">
-      <compile files="B.java Azpect.aj" options="-1.5"/>
-      <run class="B">
- 	   	<stdout>
-   		 <line text="execution(public static void B.main(java.lang.String[]))"/>
-   		 <line text="execution(public java.lang.Object B.method1(java.lang.String))"/>
-   		 <line text="execution(public java.lang.Object B.method2(java.lang.String, java.lang.Integer))"/>   		 
-   		 <line text="execution(private void B.method3())"/>
-   		 <line text="execution(public static void B.method4())"/>
-      	</stdout>
-      </run>
-    </ajc-test>
- 
-     <ajc-test dir="features1610/makeSJPOptimization" title="makeSJP optimization - Collapsed SJP - Yes">
-      <compile files="B.java Azpect.aj" options="-1.5 -Xset:targetRuntime1_6_10=true"/>
-      <run class="B">
-	   	<stdout>
-   		 <line text="execution(public static void B.main(java.lang.String[]))"/>
-   		 <line text="execution(public java.lang.Object B.method1(java.lang.String))"/>
-   		 <line text="execution(public java.lang.Object B.method2(java.lang.String, java.lang.Integer))"/>   		 
-   		 <line text="execution(private void B.method3())"/>
-   		 <line text="execution(public static void B.method4())"/>
-     	</stdout>
-      </run>
-    </ajc-test>  
- 
-      <ajc-test dir="features1610/makeSJPOptimization" title="makeSJP optimization - Collapsed SJP - Yes 1.4">
-      <compile files="B.java Azpect.aj" options="-1.4 -Xset:targetRuntime1_6_10=true"/>
-      <run class="B">
-	   	<stdout>
-   		 <line text="execution(public static void B.main(java.lang.String[]))"/>
-   		 <line text="execution(public java.lang.Object B.method1(java.lang.String))"/>
-   		 <line text="execution(public java.lang.Object B.method2(java.lang.String, java.lang.Integer))"/>   		 
-   		 <line text="execution(private void B.method3())"/>
-   		 <line text="execution(public static void B.method4())"/>
-     	</stdout>
-      </run>
-    </ajc-test>  
- 
-    <ajc-test dir="features1610/makeSJPOptimization" title="makeSJP optimization - Collapsed SJP - No">
-      <compile files="B.java Azpect.aj" options="-1.5 -Xset:targetRuntime1_6_10=false"/>
-      <run class="B">
- 	   	<stdout>
-   		 <line text="execution(public static void B.main(java.lang.String[]))"/>
-   		 <line text="execution(public java.lang.Object B.method1(java.lang.String))"/>
-   		 <line text="execution(public java.lang.Object B.method2(java.lang.String, java.lang.Integer))"/>   		 
-   		 <line text="execution(private void B.method3())"/>
-   		 <line text="execution(public static void B.method4())"/>
-      	</stdout>
-     </run>
-    </ajc-test>
-    
-    <ajc-test dir="features1610/makeSJPOptimization" title="makeSJP optimization - No Exception - No">
-      <compile files="B.java Azpect.aj" options="-1.5 -Xset:targetRuntime1_6_10=false"/>
-      <run class="B">
- 	   	<stdout>
-   		 <line text="execution(public static void B.main(java.lang.String[]))"/>
-   		 <line text="execution(public java.lang.Object B.method1(java.lang.String))"/>
-   		 <line text="execution(public java.lang.Object B.method2(java.lang.String, java.lang.Integer))"/>   		 
-   		 <line text="execution(private void B.method3())"/>
-   		 <line text="execution(public static void B.method4())"/>
-      	</stdout>
-     </run>
-    </ajc-test>
-    
-      <ajc-test dir="features1610/makeSJPOptimization" title="makeSJP optimization - No Exception - Yes">
-      <compile files="B.java Azpect.aj" options="-1.5 -Xset:targetRuntime1_6_10=true"/>
-      <run class="B">
- 	   	<stdout>
-   		 <line text="execution(public static void B.main(java.lang.String[]))"/>
-   		 <line text="execution(public java.lang.Object B.method1(java.lang.String))"/>
-   		 <line text="execution(public java.lang.Object B.method2(java.lang.String, java.lang.Integer))"/>   		 
-   		 <line text="execution(private void B.method3())"/>
-   		 <line text="execution(public static void B.method4())"/>
-      	</stdout>
-     </run>
-    </ajc-test>
-  
-        <ajc-test dir="features1610/makeSJPOptimization" title="makeSJP optimization - Remove Colon">
-      <compile files="B.java Azpect.aj" options="-1.5"/>
-      <run class="B">
- 	   	<stdout>
-   		 <line text="execution(public static void B.main(java.lang.String[]))"/>
-   		 <line text="execution(public java.lang.Object B.method1(java.lang.String))"/>
-   		 <line text="execution(public java.lang.Object B.method2(java.lang.String, java.lang.Integer))"/>   		 
-   		 <line text="execution(private void B.method3())"/>
-   		 <line text="execution(public static void B.method4())"/>
-      	</stdout>
-     </run>
-    </ajc-test>
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1611/ajc1611.xml b/tests/src/test/java/org/aspectj/systemtest/ajc1611/ajc1611.xml
deleted file mode 100644
index beb922924..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc1611/ajc1611.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-
-  <ajc-test dir="bugs1611/pr336880" title="bounds check confusion">
-  	<compile files="First.java" options="-1.5"/>
-  	<compile files="Second.java" aspectpath="." options="-1.5"/>
-  </ajc-test>
-  
-  <ajc-test dir="bugs1611/pr336774" title="clashing itds">
-  	<compile files="First.java" options="-1.5"/>
-  	<compile files="Test.java" aspectpath="." options="-1.5"/>
-  </ajc-test>
-  
-  <ajc-test dir="bugs1611/pr336745" title="incorrect signature">
-  	<compile files="Foo.aj" options="-1.5"/>
-  </ajc-test>
-  
-  <ajc-test dir="bugs1611/pr336471" title="esjp">
-  	<compile files="Tester.aj" options="-1.5 -Xset:targetRuntime1_6_10=true"/>
-  	<run class="Tester">
-	  	<stdout>
-		  	<line text="execution(void Tester.main(String[]))"/>
-		  	<line text="execution(void Foo.run())"/>
-		  	<line text="hello"/>
-	  	</stdout>
-  	</run>
-  </ajc-test>
-  
-  <ajc-test dir="bugs1611/pr336136" title="itit">
-    <compile files="Country_Roo_Op4j.java">
-    <message kind="error" text="The import com.foo cannot be resolved" line="1"/>
-    <message kind="error" text="The import org.javaruntype cannot be resolved" line="3"/>
-    <message kind="error" text="The import org.op4j cannot be resolved" line="4"/>
-    <message kind="error" text="The import org.op4j cannot be resolved" line="5"/>
-    <message kind="error" text="Country cannot be resolved to a type" line="9"/>
-    <message kind="error" text="Function cannot be resolved to a type" line="11"/>
-    <message kind="error" text="can't determine modifiers of missing type Country_Roo_Op4j$Keys"/>
-    </compile>"
-  </ajc-test>
-  
-  
-  <ajc-test dir="bugs1611/pr336136" title="itit - 2">
-    <compile files="Country_Roo_Op4j2.java" options="-1.5">
-    <message kind="error" text="The import com.foo cannot be resolved" line="1"/>
-    <message kind="error" text="The import org.javaruntype cannot be resolved" line="3"/>
-    <message kind="error" text="The import org.op4j cannot be resolved" line="4"/>
-    <message kind="error" text="The import org.op4j cannot be resolved" line="5"/>
-    <message kind="error" text="Country cannot be resolved to a type" line="9"/>
-    <message kind="error" text="Country cannot be resolved to a type" line="11"/>
-    <message kind="error" text="Function cannot be resolved to a type" line="11"/>
-    <message kind="error" text="Get cannot be resolved" line="11"/>
-    <message kind="error" text="Types cannot be resolved" line="11"/>
-    <message kind="error" text="can't determine modifiers of missing type Country_Roo_Op4j2$Keys"/>
-    </compile>"
-  </ajc-test>
-  
-
-  <ajc-test dir="bugs1611/pr335682" title="pr335682">
-    <compile inpath="foo.jar" options="-1.4" outjar="bar.jar"/>
-  </ajc-test>
-
-  <ajc-test dir="bugs1611/pr335682" title="pr335682 - 2">
-    <compile inpath="case2.jar" options="-1.4" outjar="bar.jar"/>
-  </ajc-test>
-  
-  <ajc-test dir="bugs1611/pr335682" title="pr335682 - 3">
-    <compile inpath="case3.jar" options="-1.4" outjar="bar.jar"/>
-  </ajc-test>  
-  
-  <ajc-test dir="bugs1611/pr335682" title="pr335682 - 5">
-    <compile inpath="case5.jar" options="-1.4" outjar="bar.jar"/>
-  </ajc-test>  
-
-  <ajc-test dir="bugs1611/pr335783" title="pr335783">
-    <compile files="A.java" options="-1.5"/>
-    <compile files="X.aj" options="-1.5 -Xlint:ignore" />
-    <run class="A" ltw="aop.xml">
-    <stdout>
-	    <line text="OK"/>
-    </stdout>
-    </run>
-  </ajc-test>
-  
-  <ajc-test dir="bugs1611/pr333274" title="anno style advice chain">
-  <compile files="ma/Annotation1.java  ma/aspect1/Aspect1.java  ma/aspect3/Aspect3.java ma/Main.java ma/Precedence.java" options="-1.5"/>
-  <run class="ma.Main">
-  <stdout>
-  <line text="&gt;In Aspect1"/>
-  <line text="&gt;In Aspect3"/>
-  <line text="Method call"/>
-  <line text="&lt;In Aspect3"/>
-  <line text="=In Aspect1"/>
-  <line text="&gt;In Aspect3"/>
-  <line text="Method call"/>
-  <line text="&lt;In Aspect3"/>
-  <line text="&lt;In Aspect1"/>
-  </stdout>
-  </run>
-  </ajc-test>
-  
-  <ajc-test dir="bugs1611/pr333274" title="code style advice chain - no inline">
-  <compile files="ma2/Annotation1.java  ma2/aspect1/Aspect1.java  ma2/aspect3/Aspect3.java ma2/Main.java ma2/Precedence.java" options="-1.5 -XnoInline"/>
-  <run class="ma2.Main">
-  <stdout>
-  <line text="&gt;In Aspect1"/>
-  <line text="&gt;In Aspect3"/>
-  <line text="Method call"/>
-  <line text="&lt;In Aspect3"/>
-  <line text="=In Aspect1"/>
-  <line text="&gt;In Aspect3"/>
-  <line text="Method call"/>
-  <line text="&lt;In Aspect3"/>
-  <line text="&lt;In Aspect1"/>
-  </stdout>
-  </run>
-  </ajc-test>
-  
-  <ajc-test dir="bugs1611/pr333274" title="code style advice chain">
-  <compile files="ma2/Annotation1.java  ma2/aspect1/Aspect1.java  ma2/aspect3/Aspect3.java ma2/Main.java ma2/Precedence.java" options="-1.5 "/>
-  <run class="ma2.Main">
-  <stdout>
-  <line text="&gt;In Aspect1"/>
-  <line text="&gt;In Aspect3"/>
-  <line text="Method call"/>
-  <line text="&lt;In Aspect3"/>
-  <line text="=In Aspect1"/>
-  <line text="&gt;In Aspect3"/>
-  <line text="Method call"/>
-  <line text="&lt;In Aspect3"/>
-  <line text="&lt;In Aspect1"/>
-  </stdout>
-  </run>
-  </ajc-test>
-
-  <ajc-test dir="bugs1611/pr328840" title="pr328840">
-    <compile files="Wibble.aj" options="-1.5 -showWeaveInfo">
-    <message kind="weave" text="Join point 'field-get(XX Song.i)' in Type 'Song' (Wibble.aj:26) advised by before advice from 'Wibble' (Wibble.aj:9)"/>
-    <message kind="weave" text="'XX i' of type 'Song' (Wibble.aj) is annotated with @Foo field annotation from 'Wibble' (Wibble.aj:7)"/>
-    </compile>
-    <run class="Wibble">
-    <stdout>
-    <line text="@Foo()"/>
-    </stdout></run>
-  </ajc-test>
-  
-  <ajc-test dir="bugs1611/pr332388" title="pr332388">
-     <compile files="M.java" outjar="M.jar" options="-1.5"/>
-     <compile files="A.java B.java" classpath="M.jar" outjar="AB.jar" options="-1.5"/>
-     <compile files="MyAspect.java" outjar="aspects.jar" options="-1.5"/>
-     <compile files="" aspectpath="aspects.jar" inpath="AB.jar" options="-1.5">
-     <message kind="error" text="Unable to find type for generic bound.  Missing type is M [Xlint:cantFindType]"/>
-     </compile>
-  </ajc-test>
-  
-  <ajc-test dir="bugs1611/pr333469" title="pr333469">
-     <compile files="MyList.java MyList_Serializable.java" options="-1.5"/>
-     <run class="MyList">
-     <stdout><line text="ser=1"/></stdout>
-     </run>
-  </ajc-test>
-  
-  <ajc-test dir="bugs1611/pr332388_2" title="pr332388 - 2">
-     <compile files="M.java" outjar="M.jar" options="-1.5"/>
-     <compile files="A.java" classpath="M.jar" outjar="A.jar" options="-1.5"/>
-     <compile files="MyAspect.java" outjar="aspects.jar" options="-1.5"/>
-     <compile files="" aspectpath="aspects.jar" inpath="A.jar" options="-1.5">
-     <message kind="error" text="Unable to find type (for bound): M [Xlint:cantFindType]"/>
-     </compile>
-  </ajc-test>
-  
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1611/newfeatures-tests.xml b/tests/src/test/java/org/aspectj/systemtest/ajc1611/newfeatures-tests.xml
deleted file mode 100644
index 914042633..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc1611/newfeatures-tests.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<!-- AspectJ v1.6.11 Tests -->
-<suite>
-
-  <ajc-test dir="features1611/declareMinus" title="adding and removing - 3">
-  	<compile files="OnOffITD.java" options="-1.5 -showWeaveInfo">
-  	  <message kind="weave" text="'public int field2' of type 'OnOffITD' (OnOffITD.java) is annotated with @Anno field annotation from 'Foo' (OnOffITD.java:12)"/>
-  	  <message kind="weave" text="'public int field2' of type 'OnOffITD' (OnOffITD.java) has had @Anno field annotation removed by 'Foo' (OnOffITD.java:13)"/>
-  	  <message kind="weave" text="'public static int field' of type 'OnOffITD' (OnOffITD.java) is annotated with @Anno field annotation from 'Foo' (OnOffITD.java:9)"/>
-  	  <message kind="weave" text="'public static int field' of type 'OnOffITD' (OnOffITD.java) has had @Anno field annotation removed by 'Foo' (OnOffITD.java:8)"/>
-  	  <message kind="weave" text="Type 'OnOffITD' (OnOffITD.java) has intertyped field from 'B' (OnOffITD.java:'int OnOffITD.field')"/>
-  	  <message kind="weave" text="Type 'OnOffITD' (OnOffITD.java) has intertyped field from 'B' (OnOffITD.java:'int OnOffITD.field2')"/>
-  	</compile>
-  	<run class="OnOffITD">
-  	  <stdout>
-  		<line text="field annotated? no"/>
-  		<line text="field2 annotated? no"/>
-  	  </stdout>
-  	</run>
-  </ajc-test>
-  
-  <ajc-test dir="features1611/declareMinus" title="adding and removing">
-  	<compile files="OnOff.java" options="-1.5 -showWeaveInfo">
-  	  <message kind="weave" text="'public int field2' of type 'OnOff' (OnOff.java) is annotated with @Anno field annotation from 'Foo' (OnOff.java:12)"/>
-  	  <message kind="weave" text="'public int field2' of type 'OnOff' (OnOff.java) has had @Anno field annotation removed by 'Foo' (OnOff.java:13)"/>
-  	  <message kind="weave" text="'public static int field' of type 'OnOff' (OnOff.java) is annotated with @Anno field annotation from 'Foo' (OnOff.java:9)"/>
-  	  <message kind="weave" text="'public static int field' of type 'OnOff' (OnOff.java) has had @Anno field annotation removed by 'Foo' (OnOff.java:8)"/>
-  	</compile>
-  	<run class="OnOff">
-  	  <stdout>
-  		<line text="field annotated? no"/>
-  		<line text="field2 annotated? no"/>
-  	  </stdout>
-  	</run>
-  </ajc-test>
-  
-  
-  <ajc-test dir="features1611/declareMinus" title="adding and removing - 2">
-  	<compile files="OnOff2.java" options="-1.5 -showWeaveInfo">
-  	  <message kind="weave" text="'public int field2' of type 'OnOff2' (OnOff2.java) is annotated with @Anno field annotation from 'Foo' (OnOff2.java:8)"/>
-  	  <message kind="weave" text="'public int field2' of type 'OnOff2' (OnOff2.java) has had @Anno field annotation removed by 'Foo' (OnOff2.java:7)"/>
-  	  <message kind="weave" text="'public static int field' of type 'OnOff2' (OnOff2.java) is annotated with @Anno field annotation from 'Foo' (OnOff2.java:8)"/>
-  	  <message kind="weave" text="'public static int field' of type 'OnOff2' (OnOff2.java) has had @Anno field annotation removed by 'Foo' (OnOff2.java:7)"/>
-  	</compile>
-  	<run class="OnOff2">
-  	  <stdout>
-  		<line text="field annotated? no"/>
-  		<line text="field2 annotated? no"/>
-  	  </stdout>
-  	</run>
-  </ajc-test>
-  
-  <ajc-test dir="features1611/declareMinus" title="declare minus - 1">
-  	<compile files="Code.java" options="-1.5"/>
-  	<run class="Code"> 	<stdout>
-  	<line text="no annotation"/>
-  	</stdout></run>
-  </ajc-test>
-  
-  <ajc-test dir="features1611/declareMinus" title="declare minus - itd">
-  	<compile files="Code2.java" options="-1.5"/>
-  	<run class="Code2">
-  	<stdout>
-  	<line text="no annotation"/>
-  	</stdout></run>
-  </ajc-test>
-  
-  <ajc-test dir="features1611/declareMinus" title="declare minus - 2 annos">
-  	<compile files="Code3.java" options="-1.5"/>
-  	<run class="Code3">
-  	<stdout>
-  	<line text="no Anno"/>
-  	<line text="has AnnoB"/>
-  	</stdout></run>
-  </ajc-test>
-  
-  <ajc-test dir="features1611/declareMinus" title="declare minus - multifiles">
-  	<compile files="aspectjtest/AnnotationA.java aspectjtest/AnnotationB.java aspectjtest/ExampleItd.aj aspectjtest/HelloTest.java aspectjtest/MyEntity.java" options="-1.5"/>
-  	<run class="aspectjtest.HelloTest">
-  	<stdout>
-  	<line text="1"/>
-  	<line text="interface aspectjtest.AnnotationB"/>
-  	</stdout></run>
-  </ajc-test>
-  
-  <!--  different ordering -->
-  <ajc-test dir="features1611/declareMinus" title="declare minus - multifiles - 2">
-  	<compile files="aspectjtest/MyEntity.java aspectjtest/AnnotationA.java aspectjtest/AnnotationB.java aspectjtest/ExampleItd.aj aspectjtest/HelloTest.java" options="-1.5"/>
-  	<run class="aspectjtest.HelloTest">
-  	<stdout>
-  	<line text="1"/>
-  	<line text="interface aspectjtest.AnnotationB"/>
-  	</stdout></run>
-  </ajc-test>
-
-  <!--  different ordering -->
-  <ajc-test dir="features1611/declareMinus" title="declare minus - multifiles - 3">
-  	<compile files="aspectjtest/ExampleItd.aj aspectjtest/AnnotationA.java aspectjtest/AnnotationB.java aspectjtest/MyEntity.java  aspectjtest/HelloTest.java" options="-1.5"/>
-  	<run class="aspectjtest.HelloTest">
-  	<stdout>
-  	<line text="1"/>
-  	<line text="interface aspectjtest.AnnotationB"/>
-  	</stdout></run>
-  </ajc-test>
-  
-  <ajc-test dir="features1611/declareMinus" title="declare minus - with values">
-    <compile files="WithValues.java" options="-1.5"/>
-    <run class="WithValues">
-    <stdout>
-    <line text="i does not have Anno"/>
-    <line text="j has Banno:@Banno(hoo=abc)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-    <line text="j has Banno:@Banno(hoo=&quot;abc&quot;)" vm="9+"/>
-    <line text="j does not have Anno"/>
-    </stdout></run>
-  </ajc-test>
-  
-  <ajc-test dir="features1611/declareMinus" title="declare minus - unsupported">
-    <compile files="Unsupported.java" options="-1.5">
-        <message kind="error" line="19" text="Annotation removal only supported for declare @field (compiler limitation)"/>
-        <message kind="error" line="20" text="Annotation removal only supported for declare @field (compiler limitation)"/>
-        <message kind="error" line="21" text="Annotation removal does not allow values to be specified for the annotation (compiler limitation)"/>
-    </compile>
-  </ajc-test>
-  
-  <ajc-test dir="features1611/declareMinus" title="binary weaving">
-    <compile files="aspectjtest/AnnotationA.java aspectjtest/AnnotationB.java aspectjtest/MyEntity.java aspectjtest/HelloTest.java" outjar="code.jar" options="-1.5"/>
-    <compile files="aspectjtest/ExampleItd.aj" inpath="code.jar" options="-1.5 -showWeaveInfo">
-    <message kind="weave" text="'private String myField [RuntimeVisibleAnnotations]' of type 'aspectjtest.MyEntity' (MyEntity.java) has had @AnnotationA field annotation removed by"/>
-    <message kind="weave" text="'private String myField [RuntimeVisibleAnnotations]' of type 'aspectjtest.MyEntity' (MyEntity.java) is annotated with @AnnotationB field"/>
-    </compile>
-  	<run class="aspectjtest.HelloTest">
-  	<stdout>
-  	<line text="1"/>
-  	<line text="interface aspectjtest.AnnotationB"/>
-  	</stdout></run>
-  </ajc-test>
-  
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1612/ajc1612.xml b/tests/src/test/java/org/aspectj/systemtest/ajc1612/ajc1612.xml
deleted file mode 100644
index 38f46c7d6..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc1612/ajc1612.xml
+++ /dev/null
@@ -1,755 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-
- <ajc-test dir="bugs1612/pr327141" title="classcast">
-     <compile files="AspectWithConstant.aj" options="-1.5"/>
-     <run class="AspectWithConstant">
-     <stdout>
-     <line text="MAX=9"/>
-     <line text="@AspectWithConstant$Loggable()"/>
-     </stdout></run>
-   </ajc-test>
-   
- <ajc-test dir="bugs1612/xmldefs" title="xml defined advice">
-     <compile files="Hello.java JavaHelper.java"/>
-     <run class="Hello" ltw="aop.xml">
-       <stdout>
-           <line text="Hello"/>
-           <line text="in advice"/>
-           <line text="World"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
- <ajc-test dir="bugs1612/xmldefs" title="xml defined advice 2">
-     <compile files="Hello.java JavaHelper.java"/>
-     <run class="Hello" ltw="aop2.xml">
-       <stdout>
-           <line text="Hello"/>
-           <line text="World"/>
-       </stdout>
-       <stderr>
-       <line text="info AspectJ Weaver"/>
-       <line text="info register classloader"/>
-       <line text="info using config"/>
-       <line text="info define aspect"/>
-       <line text="error Class to invoke cannot be found: 'com.DoesNotExist'"/>
-       <line text="info weaver operating"/>
-       </stderr>
-     </run>
-   </ajc-test>
-   
- <ajc-test dir="bugs1612/xmldefs" title="xml defined advice 3">
-     <compile files="Hello.java JavaHelper.java"/>
-     <run class="Hello" ltw="aop3.xml">
-       <stdout>
-           <line text="Hello"/>
-           <line text="World"/>
-       </stdout>
-       <stderr>
-       <line text="info AspectJ Weaver"/>
-       <line text="info register classloader"/>
-       <line text="info using config"/>
-       <line text="info define aspect"/>
-       <line text="error Cannot find type specified as parameter: 'String' from signature '(String)'"/>
-       <line text="info weaver operating"/>
-       </stderr>
-     </run>
-   </ajc-test>
-   
- <ajc-test dir="bugs1612/xmldefs" title="xml defined advice 4">
-     <compile files="Hello.java JavaHelper.java"/>
-     <run class="Hello" ltw="aop4.xml">
-       <stdout>
-           <line text="Hello"/>
-           <line text="World"/>
-       </stdout>
-       <stderr>
-       <line text="info AspectJ Weaver"/>
-       <line text="info register classloader"/>
-       <line text="info using config"/>
-       <line text="info define aspect"/>
-       <line text="error Cannot find type specified as parameter: 'java.lang.String:List' from signature '(java.lang.String:List)'"/>
-       <line text="info weaver operating"/>
-       </stderr>
-     </run>
-   </ajc-test>
-   
-   
- <ajc-test dir="bugs1612/xmldefs" title="xml defined advice 5">
-     <compile files="Hello2.java JavaHelper.java"/>
-     <run class="Hello2" ltw="aop5.xml">
-       <stdout>
-           <line text="hello"/>
-           <line text="in advice: s=world"/>
-           <line text="world"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   
- <ajc-test dir="bugs1612/xmldefs" title="xml defined advice 6">
-     <compile files="Hello2.java JavaHelper.java"/>
-     <run class="Hello2" ltw="aop6.xml">
-       <stdout>
-           <line text="hello"/>
-           <line text="in advice: s=world"/>
-           <line text="world"/>
-           <line text="in advice3: s=world"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
- <ajc-test dir="bugs1612/xmldefs" title="xml defined advice 7">
-     <compile files="Hello2.java JavaHelper.java"/>
-     <run class="Hello2" ltw="aop7.xml">
-       <stdout>
-           <line text="hello"/>
-           <line text="in advice4: s=world at execution(int Hello2.say2(String))"/>
-           <line text="world"/>
-           <line text="in advice5: s=world at execution(int Hello2.say2(String))"/>
-       </stdout>
-     </run>
-   </ajc-test>
-
- <ajc-test dir="bugs1612/xmldefs" title="xml defined advice 8">
-     <compile files="Hello2.java JavaHelper.java"/>
-     <run class="Hello2" ltw="aop8.xml">
-       <stdout>
-           <line text="hello"/>
-           <line text="in advice6: s=world at execution(int Hello2.say2(String))"/>
-           <line text="world"/>
-           <line text="in advice7: s=world at execution(int Hello2.say2(String))"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
- <ajc-test dir="bugs1612/xmldefs" title="xml defined advice 9">
-     <compile files="Hello2.java JavaHelper.java"/>
-     <run class="Hello2" ltw="aop9.xml">
-       <stdout>
-           <line text="in around advice: s=hello at execution(void Hello2.say1(String))"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
- <ajc-test dir="bugs1612/xmldefs" title="xml defined advice 10">
-     <compile files="Hello2.java JavaHelper.java"/>
-     <run class="Hello2" ltw="aop10.xml">
-       <stdout>
-           <line text="hello"/>
-           <line text="in around2 advice: s=world at execution(int Hello2.say2(String))"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
- <ajc-test dir="bugs1612/xmldefs" title="xml defined advice 11">
-     <compile files="Hello2.java JavaHelper.java"/>
-     <run class="Hello2" ltw="aop11.xml">
-       <stdout>
-           <line text="hello"/>
-           <line text="abcde"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
- <ajc-test dir="bugs1612/xmldefs" title="xml defined advice 12">
-     <compile files="Hello3.java JavaHelper.java"/>
-     <run class="Hello3" ltw="aop12.xml">
-       <stdout>
-           <line text="hello"/>
-           <line text="around4 running"/>
-           <line text="abcde"/>
-           <line text="from say2=xyz"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
- <ajc-test dir="bugs1612/xmldefs" title="xml defined advice 13">
-     <compile files="Hello2.java JavaHelper2.java"/>
-     <run class="Hello2" ltw="aop13.xml">
-       <stdout>
-           <line text="in advice"/>
-           <line text="hello"/>
-           <line text="in advice"/>
-           <line text="world"/>
-       </stdout>
-     </run>
-   </ajc-test>
-
-<ajc-test dir="bugs1612/pr354470" title="perthis too pervasive">
-<compile files="Code.java" options="-1.5"/>
-<run class="Code">
-<stdout>
-	<line text="AAA"/>
-	<line text="BBB"/>
-	<line text="CCC"/>
-	<line text="interface Code$ajcMightHaveAspect"/>
-	<line text="private transient Code CCC.ajc$Code$perObjectField"/>
-</stdout></run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr354470" title="perthis too pervasive 2">
-<compile files="Code2.java" options="-1.5"/>
-<run class="Code2">
-<stdout>
-	<line text="execution(void CCC.m())"/>
-</stdout></run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr354470" title="perthis too pervasive 3">
-<compile files="Code3.java" options="-1.5"/>
-<run class="Code3">
-<stdout>
-	<line text="execution(void CCC.m())"/>
-</stdout></run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/prx" title="class reference in annotation value">
-<compile files="C.java" options="-1.5 -showWeaveInfo">
-<message kind="weave" text="Join point 'field-get(int C.i)' in Type 'C' (C.java:17) advised by before advice from 'X' (C.java:22)"/>
-</compile>
-<run class="C">
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/prx" title="annotation values not equal">
-<compile files="D.java" options="-1.5 -showWeaveInfo">
-<message kind="weave" text="Join point 'field-get(int D.i)' in Type 'D' (D.java:20) advised by before advice from 'X' (D.java:26)"/>
-<message kind="weave" text="Join point 'field-get(int D.j)' in Type 'D' (D.java:21) advised by before advice from 'X' (D.java:26)"/>
-</compile>
-<run class="D">
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/prx" title="class reference in annotation value 3">
-<compile files="E.java" options="-1.5 -showWeaveInfo">
-<message kind="weave" text="Join point 'field-get(int E.i)' in Type 'E' (E.java:17) advised by before advice from 'X' (E.java:22)"/>
-</compile>
-<run class="E">
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/prx" title="annotation values not equal 2">
-<compile files="F.java" options="-1.5 -showWeaveInfo">
-<message kind="weave" text="Join point 'field-get(int F.i)' in Type 'F' (F.java:20) advised by before advice from 'X' (F.java:26)"/>
-<message kind="weave" text="Join point 'field-get(int F.j)' in Type 'F' (F.java:21) advised by before advice from 'X' (F.java:26)"/>
-</compile>
-<run class="F">
-</run>
-</ajc-test>
-
-
-<ajc-test dir="bugs1612/prx" title="class reference in annotation value - invalid typename">
-<compile files="G.java" options="-1.5">
-<message kind="error" text="Unable to resolve type 'Foo.class' specified for value 'value'"/>
-</compile>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr356612" title="annotation field binding optimization">
-<compile files="AnnoBinding.java" options="-1.5"/>
-<run class="AnnoBinding">
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr356612" title="annotation field binding optimization - 2">
-<compile files="AnnoBinding2.java" options="-1.5"/>
-<run class="AnnoBinding2">
-<stdout>
-<line text="get(int AnnoBinding2.field1) @Marker(message=foo)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-<line text="get(int AnnoBinding2.field1) @Marker(message=&quot;foo&quot;)" vm="9+"/>
-<line text="get(int AnnoBinding2.field2) @Marker(message=bar)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-<line text="get(int AnnoBinding2.field2) @Marker(message=&quot;bar&quot;)" vm="9+"/>
-<line text="2 ajc$anno$NNN fields"/>
-</stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr354683" title="itd split compilation">
-<compile files="util/CommonData.java util/CommonDataImpl.java util/CommonDataImplementation.aj util/DerivedCommonDataInterface.java util/DerivedCommonDataInterfaceImpl.java util/DerivedCommonDataInterfaceImplementation.aj" options="-1.5" outjar="code.jar"/>
-<compile files="main/AbstractBaseClass.java main/DerivedClass.java main/Whatever.java " options="-1.5" aspectpath="code.jar"/>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr239649" title="thisAspectInstance - 1">
-<compile files="One.java" options="-1.5"/>
-<run class="One">
-  <stdout>
-  <line text="In instance check method doit()"/>
-  <line text="In advice()"/>
-  <line text="Method m() running"/>
-  </stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr239649" title="thisAspectInstance - 2">
-<compile files="Two.java" options="-1.5"/>
-<run class="Two">
-  <stdout>
-  <line text="In instance check method, count=1 so doit returns false"/>
-  <line text="Method m() running"/>
-  <line text="In instance check method, count=2 so doit returns true"/>
-  <line text="In advice()"/>
-  <line text="Method m() running"/>
-  <line text="In instance check method, count=3 so doit returns false"/>
-  <line text="Method m() running"/>
-  <line text="In instance check method, count=4 so doit returns true"/>
-  <line text="In advice()"/>
-  <line text="Method m() running"/>
-  </stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr239649" title="thisAspectInstance - 3">
-<compile files="Three.java" options="-1.5"/>
-<run class="Three">
-  <stdout>
-  <line text="Method m() running"/>
-  <line text="In instance check method, count=1 so doit returns false"/>
-  <line text="Method m() running"/>
-  <line text="In instance check method, count=2 so doit returns true"/>
-  <line text="In advice()"/>
-  <line text="Method m() running"/>
-  <line text="In instance check method, count=3 so doit returns false"/>
-  <line text="Method m() running"/>
-  <line text="In instance check method, count=4 so doit returns true"/>
-  <line text="In advice()"/>
-  </stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr239649" title="thisAspectInstance - 4">
-<compile files="Four.java" options="-1.5"/>
-<run class="Four">
-  <stdout>
-  <line text="In instance check method doit()"/>
-  <line text="In advice() execution(void Four.m())"/>
-  <line text="Method m() running"/>
-  </stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr239649" title="thisAspectInstance - 5">
-<compile files="Five.java" options="-1.5"/>
-<run class="Five">
-  <stdout>
-  <line text="In instance check method doit()"/>
-  <line text="In advice() arg0=abc"/>
-  <line text="Method m() running"/>
-  </stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr239649" title="thisAspectInstance - 6">
-<compile files="Six.java" options="-1.5"/>
-<run class="Six">
-  <stdout>
-  <line text="In instance check method doit()"/>
-  <line text="In advice() execution(void Six.main(String[]))"/>
-  <line text="Method m() running"/>
-  </stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr239649" title="thisAspectInstance - 7">
-<compile files="Seven.java" options="-1.5"/>
-<run class="Seven">
-  <stdout>
-  <line text="In instance check method doit()"/>
-  <line text="In advice() call(void Seven.m()) execution(void Seven.main(String[]))"/>
-  <line text="Method m() running"/>
-  </stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr239649" title="thisAspectInstance - 8">
-<compile files="Eight.java" options="-1.5"/>
-<run class="Eight">
-  <stdout>
-  <line text="in doit(): class=X"/>
-  <line text="In advice()"/>
-  <line text="Method m() running"/>
-  </stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr239649" title="thisAspectInstance - 9">
-<compile files="Nine.java" options="-1.5"/>
-<run class="Nine">
-  <stdout>
-  <line text="in doit(): class=X"/>
-  <line text="In advice()"/>
-  <line text="Method m() running"/>
-  </stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr239649" title="thisAspectInstance - 10">
-<compile files="Ten.java" options="-1.5"/>
-<run class="com.foo.bar.Ten">
-  <stdout>
-  <line text="In instance check method doit() class=com.foo.bar.X"/>
-  <line text="In advice()"/>
-  <line text="Method m() running"/>
-  </stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr239649" title="thisAspectInstance - 11">
-<compile files="Eleven.java" options="-1.5">
-<message kind="error" text="thisAspectInstance can only be used inside an if() clause for singleton aspects (compiler limitation)"/>
-</compile>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr239649" title="thisAspectInstance - 12">
-<compile files="Twelve.java" options="-1.5"/>
-<run class="Twelve">
-  <stdout>
-  <line text="In instance check method doit()"/>
-  <line text="In advice() arg=abc tjpsp=execution(void Twelve.m(String))"/>
-  <line text="Method m() running"/>
-  </stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr239649" title="thisAspectInstance - 13">
-<compile files="Thirteen.java" options="-1.5"/>
-<run class="Thirteen">
-  <stdout>
-  <line text="instance is X"/>
-  <line text="In advice() arg=abc tjpsp=execution(void Thirteen.m(String))"/>
-  <line text="Method m() running"/>
-  </stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr239649" title="thisAspectInstance - 14">
-<compile files="Fourteen.java" options="-1.5"/>
-<run class="Fourteen">
-  <stdout>
-  <line text="instance is X"/>
-  <line text="In advice()"/>
-  <line text="Method m() running"/>
-  </stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr239649" title="thisAspectInstance - 15">
-<compile files="Fifteen.java" options="-1.5"/>
-<run class="Fifteen">
-  <stdout>
-  <line text="in doit(): class=X"/>
-  <line text="In advice()"/>
-  <line text="Method m() running"/>
-  </stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/doubleITDF" title="double itdf">
-<compile files="A.java" options="-1.7"/>
-<run class="A">
-  <stdout>
-  <line text="AA"/>
-  </stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/verify" title="verify perthis">
-<compile files="Runner.aj" inpath="code.jar" classpath="groovy-1.8.0.jar;asm-3.2.jar" options="-1.6 -Xset:generateStackMaps=true"/>
-<run class="Runner">
-  <stdout>
-  <line text="AA"/>
-  </stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr353936" title="local variable tables">
-<compile files="Code.java" options="-1.5"/>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr352363" title="empty pattern">
-<compile files="Code.java" options="-1.5">
-  <message line="12" kind="warning" text="name is empty1"/>
-  <message line="13" kind="warning" text="name is empty2"/>
-</compile>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr351592" title="generics issue">
-<compile files="Test.java Fib.java FibCaching.aj Caching.aj" options="-1.5"/>
-<run class="caching.Test"/>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr351592" title="generics issue - 2">
-<compile files="Test.java Fib.java FibCaching.aj Caching.aj" options="-1.5"/>
-<run class="caching.Test"/>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr350800" title="generics npe">
-<compile files="AbstractAdapter.java AbstractProbingAspect.java Adapter.java ProbingAspect.java" options="-1.5"/>
-<!--  run class="com.example.MyAspectTest" -->
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr350800_2" title="generics npe - code">
-<compile files="AbstractAdapter.java AbstractProbingAspect.java Adapter.java ProbingAspect.java" options="-1.5"/>
-<!--  run class="com.example.MyAspectTest" -->
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr350800_3" title="generics npe - 3">
-<compile files="AbstractAdapter.java AbstractProbingAspect.java Adapter.java ProbingAspect.java" options="-1.5"/>
-<run class="test.aop.Adapter">
-<stdout>
-<line text="&gt;hello"/>
-</stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr349961" title="ordering">
-<compile files="MyParameterAnnotation.java MyAspect.java MyAspectTest.java A.java ABean.java" options="-1.5"/>
-<run class="com.example.MyAspectTest">
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr349961" title="ordering - 2">
-<compile files="MyParameterAnnotation.java MyAspect.java MyAspectTest.java ABean.java A.java" options="-1.5"/>
-<run class="com.example.MyAspectTest">
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr347395" title="verifyerror - inline">
-<compile files="Target.java Task.java TaskHistoryAspect.aj TaskModification.java" options="-1.5"/>
-<run class="xxx.util.Target">
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr349398" title="duplicate methods">
-<compile files="DataGenerator.java CacheAspect.java DataGeneratorCacheAspect.java DataGeneratorTest.java" options="-1.5"/>
-<run class="DataGeneratorTest">
-</run>
-</ajc-test>
-
-
-<ajc-test dir="bugs1612/pr347684" title="binding ints">
-<compile files="BindingInts.java" options="-1.5"/>
-<run class="BindingInts">
-  <stdout>
-  <line text="execution(void BindingInts.a()) 37"/>
-  </stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr347684" title="binding ints - 2">
-<compile files="BindingInts2.java" options="-1.5"/>
-<run class="BindingInts2">
-  <stdout>
-  <line text="execution(void BindingInts2.a()) 99"/>
-  </stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr347684" title="binding ints - 3">
-<compile files="BindingInts3.java" options="-1.5"/>
-<run class="BindingInts3">
-  <stdout>
-  <line text="execution(void BindingInts3.a()) abc"/>
-  </stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr347684" title="binding ints - 4">
-<compile files="BindingInts4.java" options="-1.5"/>
-<run class="BindingInts4">
-  <stdout>
-  <line text="execution(void BindingInts4.a()) 37 48"/>
-  </stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr347684" title="binding ints - 5">
-<compile files="BindingInts5.java" options="-1.5"/>
-<run class="BindingInts5">
-  <stdout>
-  <line text="execution(void BindingInts5.a()) 37"/>
-  </stdout>
-</run>
-</ajc-test>
-
-
-<ajc-test dir="bugs1612/pr347684" title="binding ints - 6">
-<compile files="BindingInts6.java" options="-1.5"/>
-<run class="BindingInts6">
-  <stdout>
-  <line text="execution(void BindingInts6.a()) 37 1 99"/>
-  </stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr345515" title="anno copying">
-<compile files="Code.java" options="-1.5"/>
-<run class="Code"></run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr327867" title="synthetic methods">
-<compile files="Foo.java" options="-1.5 -showWeaveInfo">
-<message kind="weave" text="Join point 'method-execution(void Foo.main(java.lang.String[]))' in Type 'Foo' (Foo.java:3) advised by before advice from 'X' (Foo.java:17)"/>
-<message kind="weave" text="Join point 'method-execution(void Foo.m())' in Type 'Foo' (Foo.java:7) advised by before advice from 'X' (Foo.java:17)"/>
-</compile>
-<run class="Foo"/>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr345172" title="incorrect annos">
-<compile files="InterType.java" options="-1.5 -showWeaveInfo">
-<message kind="weave" text="Join point 'method-execution(void InterType$InterTypeIfc.m1(int))' in Type 'InterType' (InterType.java:21) advised by around advice from 'InterType$AroundMethod' (InterType.java:12)"/>
-<!-- 
-<message kind="weave" text="Join point 'method-execution(void InterType$InterTypeIfc.m1(int, int))' in Type 'InterType' (InterType.java:24) advised by around advice from 'InterType$AroundMethod' (InterType.java:12)"/>
-<message kind="weave" text="Join point 'method-execution(void InterType.m1(int))' in Type 'InterType' (InterType.java:28) advised by around advice from 'InterType$AroundMethod' (InterType.java:12)"/>
--->
-<message kind="weave" text="Type 'InterType$InterTypeIfc' (InterType.java) has intertyped method from 'InterType' (InterType.java:'void InterType$InterTypeIfc.m1(int)')"/>
-<message kind="weave" text="Type 'InterType$InterTypeIfc' (InterType.java) has intertyped method from 'InterType' (InterType.java:'void InterType$InterTypeIfc.m1(int, int)')"/>
-</compile>
-<run class="InterType"/>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr345172" title="incorrect annos 2">
-<compile files="InterType2.java" options="-1.5">
-</compile>
-<run class="InterType2">
-<stdout>
-<line text="execution(void InterType2.InterTypeIfc.m1(int))"/>
-</stdout></run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr345172" title="incorrect annos 3">
-<compile files="InterType3.java" options="-1.5">
-</compile>
-<run class="InterType3">
-<stdout>
-<line text="execution(void InterType3.InterTypeIfc.m1(int, String))"/>
-</stdout></run>
-</ajc-test>
-
-
-
-
-<ajc-test dir="bugs1612/pr328099" title="signed jar ltw">
-<compile files="X.java" classpath="code.jar"/>
-<run class="foo.bar.FooLaunch" ltw="aop.xml" classpath="$sandbox/code.jar">
-<stdout>
-<line text="pre...Foo.bar()...post"/>
-</stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr315398" title="verifyerror">
-<compile files="Code.java" options="-1.5">
-</compile>
-<run class="Code">
-<stdout>
-<line text="1"/>
-<line text="advice"/>
-<line text="2"/>
-</stdout></run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr315398" title="verifyerror - 2">
-<compile files="Code2.java" options="-1.5">
-</compile>
-<run class="Code2"></run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr335810" title="rawtype warning">
-<compile files="One.java" options="-1.5 -warn:+raw -warn:+unchecked -warn:+warningToken">
-</compile>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr327134" title="rawtype pointcut">
-<compile files="Code.java" options="-1.5 -warn:+raw -warn:+warningToken">
-</compile>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr344005" title="decp generics">
-<compile files="Anno.java Types.java Azpect.java" options="-1.5 -showWeaveInfo">
-<message kind="weave" text="XX"/>
-</compile>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr343051" title="illegalaccesserror">
-<compile files="Code.java Code2.java Azpect.java" options="-1.5"/>
-<run class="p.Code">
-<stdout>
-<line text="abc"/>
-</stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr339974" title="itit npe">
-<compile files="City.java TrafficCalculator.java" options="-1.5">
-<message kind="error" text="The nested type TrafficCalculator cannot hide an enclosing type"/>
-</compile>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr342605" title="noimporterror">
-<compile files="Code.java" options="-1.5 -noImportError"/>
-<run class="Code"/>
-</ajc-test>
-
-  <ajc-test dir="bugs1612/pr342323" title="clashing local types">
-  	<compile files="Runner.java Bean.java Azpect.java" options="-1.5"/>
-  	<run class="ppp.Runner">
-  	<stdout>
-	  	<line text="Calling regular method"/>
-	  	<line text="class"/>
-	  	<line text="Calling itd method"/>
-	  	<line text="aspect foo"/>
-  	</stdout>
-  	</run>
-  </ajc-test>
-
-<ajc-test dir="bugs1612/pr338175" title="itit">
-<compile files="pack1/Aspect.java pack2/Java.java pack2/Java2.java" options="-1.5">
-	<message kind="error" text="Duplicate nested type ITIT"/>
-	<message kind="error" text="can't determine modifiers"/>
-</compile>
-</ajc-test>
-
-  <ajc-test dir="bugs1612/pr292239" title="throws clause">
-  	<compile files="Code.java" options="-1.5 -showWeaveInfo">
-  	  <message kind="weave" text="Join point 'method-execution(void mypackage.Code.n())' in Type 'mypackage.Code' (Code.java:19) advised by afterThrowing advice from 'mypackage.Azpect' (Code.java:9)"/>
-  	</compile>
-  	<run class="mypackage.Code">
-  	<stdout>
-  	<line text="caught it"/>
-  	<line text="done"/>
-  	</stdout>
-  	</run>
-  </ajc-test>
-  
-  <ajc-test dir="bugs1612/pr292239" title="throws clause - 2">
-  	<compile files="Code2.java" options="-1.5 -showWeaveInfo">
-  	  <message kind="weave" text="Join point 'method-execution(void mypackage.Code2.n2())' in Type 'mypackage.Code2' (Code2.java:17) advised by afterThrowing advice from 'mypackage.Azpect' (Code2.java:7)"/>
-  	</compile>
-  	<run class="mypackage.Code2">
-  	<stdout>
-  	<line text="caught it: execution(void mypackage.Code2.n2())"/>
-  	<line text="done"/>
-  	</stdout>
-  	</run>
-  </ajc-test>
-<!--  
-
-  
-  <ajc-test dir="bugs1611/pr336136" title="itit">
-    <compile files="Country_Roo_Op4j.java">
-    <message kind="error" text="The import com.foo cannot be resolved" line="1"/>
-    <message kind="error" text="The import org.javaruntype cannot be resolved" line="3"/>
-    <message kind="error" text="The import org.op4j cannot be resolved" line="4"/>
-    <message kind="error" text="The import org.op4j cannot be resolved" line="5"/>
-    <message kind="error" text="Country cannot be resolved to a type" line="9"/>
-    <message kind="error" text="Function cannot be resolved to a type" line="11"/>
-    <message kind="error" text="can't determine modifiers of missing type Country_Roo_Op4j$Keys"/>
-    </compile>"
-  </ajc-test>
-  
-  -->
-  
-  
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc162/ajc162.xml b/tests/src/test/java/org/aspectj/systemtest/ajc162/ajc162.xml
deleted file mode 100644
index d8b86f20d..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc162/ajc162.xml
+++ /dev/null
@@ -1,336 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<!-- AspectJ v1.6.2 Tests -->
-<suite>
-	
-	
-   <ajc-test dir="bugs162/pr247683" title="null delegate for array">
-     <compile options="-1.5" files="A.java"/>
-   </ajc-test>
-	
-   <ajc-test dir="bugs162/IntoBinary" title="binary aspects model">
-     <compile options="-1.5 -emacssym" files="Clazz.java" aspectpath="binaryaspect.jar"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs162/pr246918" title="ltw perclause">
-     <compile options="-1.5" files="Code.java Dode.java" outjar="code.jar"/>
-     <compile options="-1.5 -Xlint:ignore" files="Base.java" outjar="aspects.jar"/>
-     <run class="Code" classpath="aspects.jar;code.jar" ltw="aop1.xml">
-       <stderr>
-         <line text="advice fired class Code"/>
-         <line text="advice fired class Dode"/>
-       </stderr>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs162/pr246918" title="ltw perclause - 2">
-     <compile options="-1.5" files="Code.java Dode.java" outjar="code.jar"/>
-     <compile options="-1.5 -Xlint:ignore" files="Base.java" outjar="aspects.jar"/>
-     <run class="Code" classpath="aspects.jar;code.jar" ltw="aop2.xml">
-       <stderr>
-         <line text="advice fired class Dode"/>
-       </stderr>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs162/pr246918" title="ltw perclause - 3">
-     <compile options="-1.5" files="Code.java Dode.java" outjar="code.jar"/>
-     <compile options="-1.5 -Xlint:ignore" files="Base2.java" outjar="aspects.jar"/>
-     <run class="Code" classpath="aspects.jar;code.jar" ltw="aop3.xml">
-       <stderr>
-         <line text="advice fired class Dode"/>
-       </stderr>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs162/pr246918" title="ltw perclause - 4">
-     <compile options="-1.5" files="Code.java Dode.java" outjar="code.jar"/>
-     <compile options="-1.5 -Xlint:ignore" files="Base2.java" outjar="aspects.jar"/>
-     <run class="Code" classpath="aspects.jar;code.jar" ltw="aop4.xml">
-       <stderr>
-         <line text="Unrecognized per clause specified"/>
-         <line text="Concrete-aspect 'SubAspect' could not be registered"/>
-         <line text="warning failure(s) registering aspects."/>
-       </stderr>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs162/pr246264" title="anno value binding">
-     <compile options="-1.5" files="A.java"/>
-     <run class="A"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs162/pr211607" title="around advice proceed">
-     <compile options="-1.5" files="Bug.java"/>
-     <run class="Bug"/>
-   </ajc-test>
-	
-	<ajc-test dir="bugs162/pr163005" title="advising joinpoints in interfaces">
-	  <compile files="SomeClass.java SomeInterface.java ProblemAspect.java" options="-1.4">
-	    <message kind="warning" text="Cannot advise join point 'method-call(java.lang.Class java.lang.Class.forName(java.lang.String))' in interface 'SomeInterface' with around advice from 'ProblemAspect.java' line '7' as it will lead to creation of code in an interface (compiler limitation, bug 163005)"/>
-	  </compile>
-	  <run class="SomeClass"/>
-	</ajc-test>
-
-    <ajc-test dir="bugs162/pr176905" title="chained itds">
-        <compile options="-1.5" files="ChainedItd.aj">
-        </compile>    
-        <run class="ChainedItd">
-            <stderr/> <!-- no errors-->
-        </run>
-    </ajc-test>
-
-   <ajc-test dir="bugs162/pr198341" title="dec atanno and decp">
-     <compile options="-1.5 -showWeaveInfo" files="AnnotationAspect.java">
-     	<message kind="weave" text="'Annotated' (AnnotationAspect.java:12) is annotated with @TestAnnotation2 type annotation from 'AnnotationAspect' (AnnotationAspect.java:18)"/>
-     	<message kind="weave" text="Extending interface set for type 'Annotated' (AnnotationAspect.java) to include 'Marker' (AnnotationAspect.java)"/>
-     </compile>
-   </ajc-test>
-
-
-	<ajc-test dir="bugs162/pr197720" title="missing markers on inherited annotated method">
-	  <compile files="C1.java C2.java C3.java MyAnn.java MyAnnAspect.java" options="-1.5 -showWeaveInfo">
-	    <message kind="weave" text="Join point 'method-call(void test.aspects.C1.aMethod())' in Type 'test.aspects.C1' (C1.java:12) advised by around advice from 'test.aspects.MyAnnAspect' (MyAnnAspect.java:16)"/>
-	    <message kind="weave" text="Join point 'method-call(void test.aspects.C2.aMethod())' in Type 'test.aspects.C2$InnerClass' (C2.java:17) advised by around advice from 'test.aspects.MyAnnAspect' (MyAnnAspect.java:16)"/>
-	    <message kind="weave" text="Join point 'method-call(void test.aspects.C2.aMethod())' in Type 'test.aspects.C2' (C2.java:7) advised by around advice from 'test.aspects.MyAnnAspect' (MyAnnAspect.java:16)"/>
-	    <message kind="weave" text="Join point 'method-call(void test.aspects.C2.aMethod())' in Type 'test.aspects.C2' (C2.java:28) advised by around advice from 'test.aspects.MyAnnAspect' (MyAnnAspect.java:16)"/>
-	    <message kind="weave" text="Join point 'method-call(void test.aspects.C1.aMethod())' in Type 'test.aspects.C3$InnerClass' (C3.java:22) advised by around advice from 'test.aspects.MyAnnAspect' (MyAnnAspect.java:16)"/>
-	    <message kind="weave" text="Join point 'method-call(void test.aspects.C2.aMethod())' in Type 'test.aspects.C3$InnerClass' (C3.java:25) advised by around advice from 'test.aspects.MyAnnAspect' (MyAnnAspect.java:16)"/>
-	    <message kind="weave" text="Join point 'method-call(void test.aspects.C1.aMethod())' in Type 'test.aspects.C3' (C3.java:8) advised by around advice from 'test.aspects.MyAnnAspect' (MyAnnAspect.java:16)"/>
-	    <message kind="weave" text="Join point 'method-call(void test.aspects.C2.aMethod())' in Type 'test.aspects.C3' (C3.java:11) advised by around advice from 'test.aspects.MyAnnAspect' (MyAnnAspect.java:16)"/>
-	    <message kind="weave" text="Join point 'method-call(void test.aspects.C1.aMethod())' in Type 'test.aspects.C3' (C3.java:32) advised by around advice from 'test.aspects.MyAnnAspect' (MyAnnAspect.java:16)"/>
-	  </compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs162/pr211146" title="lost generic sig on itd">
-	  <compile files="GenericsLost.java" options="-1.5"/>
-	  <run class="GenericsLost"/>
-	</ajc-test>
-	
-	<ajc-test dir="bugs162/pr211146" title="lost generic sig on itd - 2">
-	  <compile files="GenericsLost2.java" outjar="code.jar" options="-1.5"/>
-	  <compile files="GenericsLost2Dep.java" classpath="$sandbox/code.jar" options="-1.5"/>
-	</ajc-test>
-	
-	<ajc-test dir="bugs162/pr211146" title="lost generic sig on itd - 3">
-	  <compile files="GenericsLost3.java" options="-1.5"/>
-	  <run class="GenericsLost3"/>
-	</ajc-test>
-	
-	<ajc-test dir="bugs162/pr211146" title="lost generic sig on itd - 4">
-	  <compile files="GenericsLost4.java" options="-1.5"/>
-	  <run class="GenericsLost4"/>
-	</ajc-test>
-	
-	<ajc-test dir="bugs162/pr211146" title="lost generic sig on itd - 5">
-	  <compile files="GenericsLost5.java" options="-1.5"/>
-	  <run class="GenericsLost5"/>
-	</ajc-test>
-	
-	<ajc-test dir="bugs162/pr194429" title="missing context">
-	  <compile files="A.java" options="-1.5">
-	    <message kind="error" line="14" text="incompatible type, expected java.util.Set found BindingTypePattern("/>
-	  </compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs162/pr210114" title="warnings for limitations">
-	  <compile files="TestAspect.java" options="-1.5">
-	  	<message kind="warning" text="Only before advice is supported on handler join points (compiler limitation)"/>
-	  	<message kind="warning" text="around on initialization not supported (compiler limitation)"/>
-	  	<message kind="warning" text="around on pre-initialization not supported (compiler limitation)"/>	  
-	  </compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs162/pr244830" title="ptw initFailureCause">
-	  <compile files="PTW.java" options="-1.5"/>
-	  <run class="PTW"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs162/pr222648" title="generic itds - overrides">
-	  <compile files="DataAspect.aj DataInterface.java Foo.java FooBase.java Marker.java Resource.java" options="-1.5"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs162/pr222648" title="generic itds - overrides - 2">
-	  <compile files="X.java" options="-1.5"/>
-	</ajc-test>
-	
- 	<ajc-test dir="bugs162/pr145391" title="itd calling generic method">
-     <compile files="GenericType.java" options="-1.5"/>
-     <run class="GenericType"/>
-    </ajc-test>
-
-	<ajc-test dir="bugs162/pr145391" title="itd calling generic method - 2">
-     <compile files="GenericType2.java" options="-1.5">
-       <message kind="error" text="The method getValue(V) in the type GenericType2&lt;V&gt; is not applicable for the arguments"/>
-     </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs162/pr241047" title="generic decp">
-        <compile files="SomeAspect.java SomeBaseClass.java SomeSubClass.java SomeSubClass2.java SomeSubClass3.java SomeInterface.java SomeBaseClass2.java SomeBaseClass3.java" options=" -Xlint:ignore -1.5">
-        </compile>
-        <run class="SomeBaseClass">
-          <stdout>
-              <line text="correct advice :-)"/>
-              <line text="some base method"/>
-              <line text="correct advice :-)"/>
-              <line text="some sub method"/>
-              <line text="correct advice :-)"/>
-              <line text="some base method2"/>
-              <line text="correct advice :-)"/>
-              <line text="some sub method2"/>
-              <line text="correct advice :-)"/>
-              <line text="some base method3"/>
-              <line text="correct advice :-)"/>
-              <line text="some sub method3"/>
-          </stdout>
-        </run>
-    </ajc-test> 
-    
-    <ajc-test dir="bugs162/pr241047/case2" title="generic decp - 2">
-        <compile files="SomeAspect.java SomeBaseClass.java SomeSubClass.java SomeInterface.java" options=" -Xlint:ignore -1.5">
-        </compile>
-        <run class="SomeBaseClass">
-          <stdout>
-              <line text="correct advice :-)"/>
-              <line text="some base method"/>
-              <line text="correct advice :-)"/>
-              <line text="some sub method"/>
-          </stdout>
-        </run>
-    </ajc-test> 
-
-    <ajc-test dir="bugs162/pr239539" title="public pointcut">
-        <compile files="PrintAround.java PrintAroundFoo.java Foo.java" options="-1.5">
-	        <message kind="error" line="7" text="pointcut 'bar.PrintAround.method()' is not visible from type "/>
-        </compile>
-    </ajc-test> 
-
-    <ajc-test dir="bugs162/pr242797/case1" title="generic itds - 1">
-        <compile files="ClassUtils.java CMEFinder.java Finder.java H2Deployment.java Localized.java LocalizedFinder.java OnetElement.java OnetFinder.java Partitioned.java PartitionedFinder.java" options="-1.5">
-        </compile>
-    </ajc-test> 
-    
-    <ajc-test dir="bugs162/pr242797/case2" title="generic itds - 2">
-        <compile files="GenericMethodAspect.aj GenericMethodInterface.java GenericMethodImpl.java" options="-1.5">
-        </compile>
-    </ajc-test> 
-
-    <ajc-test dir="bugs162/pr242797/case3" title="generic itds - 3">
-        <compile files="GenericMethodAspect.aj GenericMethodInterface.java GenericMethodImpl.java GenericMethodImpl2.java Type1.java Type2.java" options="-1.5">
-        </compile>
-    </ajc-test> 
- 
-  	<ajc-test dir="bugs162/pr241847" title="param annos pipelining">
-    	<compile files="Asp.aj Ann.java CC.java II.java LongLong.java" options="-1.5 -showWeaveInfo">
-    		<message kind="weave" text="Join point 'method-execution(void LongLong.m1(java.lang.String))' in Type 'LongLong' (LongLong.java:2) advised by before advice from 'Asp' (Asp.aj:5)"/>
-    		<message kind="weave" line="3"/>
-    	</compile>
-    </ajc-test>    
-    
-	<ajc-test dir="bugs162/pr239441" title="annotation decp">
-    	<compile files="Test3.java SampleAspect.java" options="-1.5 -showWeaveInfo -XhasMember">
-    	</compile>
-    </ajc-test>    
-
-    <ajc-test dir="bugs162/pr241861" title="param annotation inner class">
-     <compile files="Outer.java Ann.java Asp.java" options="-1.5 -showWeaveInfo">
-       <message kind="weave" text="Join point 'constructor-execution(void Outer$Inner.&lt;init&gt;(Outer, java.lang.String))' in Type 'Outer$Inner' (Outer.java:5) advised by before advice from 'Asp' (Asp.java:2)"/>
-     </compile>
-    </ajc-test>    
-    
-    <ajc-test dir="bugs162/pr241861" title="param annotation inner class - 2">
-        <compile files="X.java" options="-1.5 -showWeaveInfo">
-          <message kind="weave" text="Join point 'constructor-execution(void Outer$Inner.&lt;init&gt;(Outer, java.lang.Integer))' in Type 'Outer$Inner' (X.java:7) advised by before advice from 'Asp' (X.java:2)"/>
-        </compile>
-    </ajc-test>    
-    
-    <ajc-test dir="bugs162/pr241861" title="param annotation inner class - 3">
-        <compile files="Y.java" options="-1.5 -showWeaveInfo">
-          <message kind="weave" text="Join point 'constructor-execution(void Outer$Inner.&lt;init&gt;(Outer, java.lang.String))' in Type 'Outer$Inner' (Y.java:7) advised by before advice from 'Asp' (Y.java:2)"/>
-        </compile>
-    </ajc-test>    
-    
-    <ajc-test dir="bugs162/pr240693" title="privileged generics">
-        <compile files="PayloadClass.java SomeInterface.java GenericClassInAdvice.java" options="-1.5">
-        </compile>
-    </ajc-test>    
-    
-	<ajc-test dir="bugs162/pr238992" title="annotation value decp">
-    	<compile files="Foo.java" options="-1.5 -showWeaveInfo">
-    	  <message kind="weave" text="Extending interface set for type 'Goo'"/>
-    	</compile>
-    	<run class="Foo"/>
-    </ajc-test>    
-    
-	<ajc-test dir="bugs162/pr238992" title="annotation value decp - 2">
-    	<compile files="Foo2.java" options="-1.5 -showWeaveInfo">
-    	  <message kind="weave" text="Extending interface set for type 'Goo'"/>
-    	  <message kind="weave" text="Extending interface set for type 'Hoo'"/>
-    	</compile>
-    	<run class="Foo2"/>
-    </ajc-test>    
-    
-	<ajc-test dir="bugs162/pr238992" title="annotation value decp - 3">
-    	<compile files="Foo3.java" options="-1.5 -showWeaveInfo">
-    	  <message kind="weave" text="Extending interface set for type 'Goo'"/>
-    	</compile>
-    	<run class="Foo3"/>
-    </ajc-test>    
-    
-	<ajc-test dir="bugs162/pr238992" title="annotation value decp - 4">
-    	<compile files="Foo4.java" options="-1.5 -showWeaveInfo">
-    	  <message kind="weave" text="Extending interface set for type 'Goo'"/>
-    	  <message kind="weave" text="Extending interface set for type 'Hoo'"/>
-    	</compile>
-    	<run class="Foo4"/>
-    </ajc-test>    
-    
-	<ajc-test dir="bugs162/pr238992" title="annotation value decp - 5">
-    	<compile files="Foo5.java" options="-1.5 -showWeaveInfo">
-    	  <message kind="weave" text="Extending interface set for type 'Goo'"/>
-    	  <message kind="weave" text="Extending interface set for type 'Hoo'"/>
-    	</compile>
-    	<run class="Foo5"/>
-    </ajc-test>    
-    
-    <ajc-test dir="bugs162/pr233718" title="parameter subsetting - matching">
-        <compile files="Matching.java" options="-1.5 -showWeaveInfo">
-          <message kind="weave" text="Join point 'method-execution(void Matching.m(java.lang.String))' in Type 'Matching' (Matching.java:3) advised by before advice from 'Matching' (Matching.java:8)"/>
-          <message kind="weave" text="'method-execution(void Matching.m(java.lang.String, java.lang.String))' in Type 'Matching' (Matching.java:4) advised by before advice from 'Matching' (Matching.java:8)"/>
-          <message kind="weave" text="'method-execution(void Matching.m(int, java.lang.String))' in Type 'Matching' (Matching.java:5) advised by before advice from 'Matching' (Matching.java:8)"/>        
-        </compile>
-    </ajc-test>    
-
-    <ajc-test dir="bugs162/pr233718" title="parameter subsetting - args matching">
-        <compile files="ArgsMatching.java" options="-1.5 -showWeaveInfo">
- <!--
-          <message kind="weave" text="Join point 'method-execution(void Matching.m(java.lang.String))' in Type 'Matching' (Matching.java:3) advised by before advice from 'Matching' (Matching.java:8)"/>
-          <message kind="weave" text="'method-execution(void Matching.m(java.lang.String, java.lang.String))' in Type 'Matching' (Matching.java:4) advised by before advice from 'Matching' (Matching.java:8)"/>
-          <message kind="weave" text="'method-execution(void Matching.m(int, java.lang.String))' in Type 'Matching' (Matching.java:5) advised by before advice from 'Matching' (Matching.java:8)"/>        
- -->
-        </compile>
-    </ajc-test>    
-    
-    <ajc-test dir="bugs162/pr233718" title="parameter subsetting - args binding">
-        <compile files="ArgsBinding.java" options="-1.5"/>
-        <run class="ArgsBinding">
-          <stdout>
-            <line text="0) a"/>
-            <line text="0) b"/>
-          </stdout>
-        </run>
-    </ajc-test>    
-    
-    <ajc-test dir="bugs162/pr198181" title="ataspectj ltw pertarget">
-      <compile files="M.java" outjar="code.jar"/>
-      <compile files="A.java" classpath="code.jar" options="-1.5 -Xlint:ignore"/>
-      <run class="m.M" classpath="$sandbox/code.jar" ltw="aop.xml">
-        <stdout>
-          <line text="tick 0"/>
-          <line text="tick 0"/>
-          <line text="tick 0"/>
-        </stdout>
-      </run>
-    </ajc-test>
-
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc163/ajc163.xml b/tests/src/test/java/org/aspectj/systemtest/ajc163/ajc163.xml
deleted file mode 100644
index c26204aa5..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc163/ajc163.xml
+++ /dev/null
@@ -1,354 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-     
-    
-    <ajc-test dir="bugs163/pr259279" title="ordering repetitive method">
-   	  <compile files="SomeServiceImpl.java SomeInterface.java Main.java GenericService.java GenericServiceImpl.java Aspect.java" options="-1.5"/>
-   	  <run class="Main"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs163/pr259279" title="ordering repetitive method - 2">
-   	  <compile files="GenericServiceImpl.java SomeServiceImpl.java SomeInterface.java Main.java GenericService.java Aspect.java" options="-1.5"/>
-   	  <run class="Main"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs163/pr258653" title="getNode">
-   	  <compile files="staticinit.java" options="-1.5 -emacssym"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs163/pr252722" title="extending AbstractSecurityInterceptor">
-   	  <compile files="A.java" options="-1.5"/>
-   	  <run class="A"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs163/pr252722" title="extending AbstractSecurityInterceptor - 2">
-   	  <compile files="ACode.java" options="-1.5"/>
-   	  <run class="ACode"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs163/pr252722" title="extending AbstractSecurityInterceptor - 3">
-   	  <compile files="B.java" options="-1.5"/>
-   	  <run class="B"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs163/pr252722" title="extending AbstractSecurityInterceptor - 4">
-   	  <compile files="BCode.java" options="-1.5"/>
-   	  <run class="BCode"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs163/pr154427" title="getMethod returning null">
-   	  <compile files="AuthorizationImpl.java Authorization.java AuthorizationAdmin.java CallAndMethodSignatureAspect.java CallTest.java" options=""/>
-   	  <run class="CallTest">
-   	    <stdout>
-   	      <line text="public abstract boolean Authorization.mayPerform(java.lang.String,java.lang.String)"/>
-   	      <line text="public abstract boolean AuthorizationAdmin.mayPerform(java.lang.String, java.lang.String)"/>
-   	      <line text="mayPerform() executing"/>
-   	      <line text="public abstract boolean AuthorizationAdmin.mayPerform2(java.lang.String,java.lang.String)"/>
-   	      <line text="public abstract boolean AuthorizationAdmin.mayPerform2(java.lang.String, java.lang.String)"/>
-   	      <line text="mayPerform2() executing"/>
-   	      <line text="public abstract boolean Authorization.mayPerform(java.lang.String,java.lang.String)"/>
-   	      <line text="public abstract boolean Authorization.mayPerform(java.lang.String, java.lang.String)"/>
-   	      <line text="mayPerform() executing"/>
-   	    </stdout>
-   	  </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs163/pr128664" title="inherited annotations">
-   	  <compile files="Bug.java" options="-1.5 -showWeaveInfo">
-   	    <message kind="weave" text=""/>
-   	  </compile>
-   	  <run class="Bug"/>
-    </ajc-test>
-        
-    <ajc-test dir="bugs163/pr128664" title="inherited annotations - 2">
-   	  <compile files="Bug2.java" options="-1.5 -showWeaveInfo">
-   	    <message kind="weave" text=""/>
-   	  </compile>
-   	  <run class="Bug2"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs163/pr257754" title="decp anno style">
-   	  <compile files="Main.java" options="-1.5"/>
-   	  <run class="example.Main">
-   	  <stdout>
-   	  <line text="In doFoo class example.DefaultFoo"/>
-   	  <line text="Bar"/>
-   	  </stdout>
-   	  </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs163/pr257754" title="decp anno style - 2">
-   	  <compile files="Main2.java Foo.java DefaultFoo.java" options="-1.5">
-   	  <message kind="error" text="but it is of incorrect visibility"/>
-   	  </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs163/pr219419" title="incorrect arg ordering anno style">
-   	  <compile files="Code.java" options="-1.5"/>
-   	  <run class="Code">
-   	    <stdout>
-   	    <line text="Catching mess. Argument was ewwww"/>
-   	    </stdout>
-   	  </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs163/pr219419" title="incorrect arg ordering anno style - 2">
-   	  <compile files="Code2.java" options="-1.5"/>
-   	  <run class="Code2">
-   	    <stdout>
-   	    <line text="Catching mess. Argument was ewwww"/>
-   	    </stdout>
-   	  </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs163/pr219419" title="incorrect arg ordering anno style - 3">
-   	  <compile files="Code3.java" options="-1.5"/>
-   	  <run class="Code3">
-   	    <stdout>
-   	    <line text="afterReturningCreateBean advice input='s' ret=37"/>
-   	    <line text="Code3.main returned from call to createBean 37"/>
-   	    </stdout>
-   	  </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs163/pr219419" title="incorrect arg ordering anno style - 4">
-   	  <compile files="Code4.java" options="-1.5"/>
-   	  <run class="Code4">
-   	    <stdout>
-   	    <line text="afterReturningCreateBean advice input='s' ret=37"/>
-   	    <line text="Code4.main returned from call to createBean 37"/>
-   	    </stdout>
-   	  </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs163/pr219419" title="incorrect arg ordering anno style - 5">
-   	  <compile files="Code5.java" options="-1.5"/>
-   	  <run class="Code5">
-   	    <stdout>
-   	    <line text="afterReturningCreateBean advice input='s' ret=37"/>
-   	    <line text="Code5.main returned from call to createBean 37"/>
-   	    </stdout>
-   	  </run>
-    </ajc-test>
-    
-    
-    
-    <ajc-test dir="bugs163/pr256458" title="poor ataj if message - 1">
-   	  <compile files="Code.java" options="-1.5">
-   	    <message kind="error" text="in annotation style, if(...) pointcuts cannot contain code"/>
-   	  </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs163/pr256458" title="poor ataj if message - 2">
-   	  <compile files="Code2.java" options="-1.5">
-   	    <message kind="error" text="in annotation style, if(...) pointcuts cannot contain code"/>
-   	  </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs163/pr256937" title="fully qualified return type">
-   	  <compile files="Ship.java ShipAccessor.java" options="-emacssym -1.5"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs163/pr213751" title="mixed styles">
-   	  <compile files="Foo.java" options="-emacssym -1.5"/>
-    </ajc-test> 
-    
-    <ajc-test dir="bugs163/pr249216" title="handles - escaped square brackets">
-   	  <compile files="Handles.java" options="-emacssym -1.5"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs163/pr171042" title="itd on anonymous inner">
-   	  <compile files="TestClass.java Executable.java RunnableAspect.java" options=""/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs163/pr254207" title="ordering issue">
-      <compile files="Abstract.java Concrete.java" options="-1.5 -proceedOnError -Xset:pipelineCompilation=false">
-        <message kind="error" line="1" text="Bound mismatch"/>
-      </compile>      
-      <compile files="Concrete.java Abstract.java" options="-1.5 -proceedOnError -Xset:pipelineCompilation=false">
-        <message kind="error" line="1" text="Bound mismatch"/>
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs163/pr254207/case2" title="ordering issue - 2">
-      <compile files="Interface.java Clazz.java Abstract.java Concrete.java" options="-1.5 -proceedOnError -Xset:pipelineCompilation=false">
-        <message kind="error" line="1" text="Bound mismatch"/>
-      </compile>      
-    </ajc-test>
-    
-    <ajc-test dir="bugs163/pr256669" title="parameter annotations on ITDs">
-      <compile files="Destination.java SimpleTest.java Introduction.java SomeAnnotation.java" options="-1.5"/>
-      <run class="SimpleTest">
-        <stdout>
-           <line text="Parameter 0 has 1 parameter annotations"/>
-        </stdout>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs163/pr256669" title="parameter annotations on ITDs - 2">
-      <compile files="Two.java" options="-1.5"/>
-      <run class="Two">
-        <stdout>
-           <line text="Parameter 0 has 1 parameter annotations"/>
-        </stdout>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs163/pr256669" title="parameter annotations on ITDs - 3">
-      <compile files="Three.java" options="-1.5"/>
-      <run class="Three">
-        <stdout>
-           <line text="Parameter 0 has 0 parameter annotations"/>
-           <line text="Parameter 1 has 1 parameter annotations"/>
-           <line text="Parameter 2 has 0 parameter annotations"/>
-           <line text="Parameter 3 has 1 parameter annotations"/>
-        </stdout>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs163/pr256669" title="parameter annotations on ITDs - 4">
-      <compile files="Four.java" options="-1.5"/>
-      <run class="Four">
-        <stdout>
-           <line text="Class D parameter 0 has 1 parameter annotations"/>
-           <line text="Interface I parameter 0 has 1 parameter annotations"/>
-        </stdout>
-      </run>
-    </ajc-test>
-
-    <ajc-test dir="bugs163/pr253109" title="generic pointcuts - 1">
-      <compile files="CodeOne.java" options="-1.5">
-        <message kind="warning" line="4" text="has not been applied"/>
-      </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs163/pr257833" title="param annos and at args">
-      <compile files="NotNull.java NotNullAspect.java NotNullTest.java" options="-1.5 -showWeaveInfo">
-        <message kind="weave" text="Join point 'constructor-execution(void patterntesting.check.runtime.NotNullTest.&lt;init&gt;(java.lang.String))' in Type"/>
-      </compile>
-      <run class="patterntesting.check.runtime.NotNullTest"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs163/pr253109" title="generic pointcuts - 2">
-      <compile files="CodeTwo.java" options="-1.5"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs163/pr253109" title="generic pointcuts - 3">
-      <compile files="CodeThree.java" options="-1.5 -showWeaveInfo">
-        <message kind="weave" text="advised by before advice from 'CodeThree' (CodeThree.java:4)"/>
-        <message kind="weave" text="advised by before advice from 'CodeThree' (CodeThree.java:5) [with runtime test]"/>
-        <message kind="warning" line="6" text="has not been applied"/>
-        <message kind="warning" line="7" text="has not been applied"/>
-        <message kind="weave" text="advised by before advice from 'CodeThree' (CodeThree.java:8)"/>
-        <message kind="weave" text="advised by before advice from 'CodeThree' (CodeThree.java:9) [with runtime test]"/> 
-        <message kind="warning" line="5" text="unchecked"/>        
-        <message kind="warning" line="9" text="unchecked"/>        
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs163/pr253109" title="generic pointcuts - 4">
-      <compile files="CodeFour.java" options="-1.5">
-        <message kind="warning" text="has not been applied"/>
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs163/pr255856" title="attarget with plus">
-      <compile files="Bug.java" options="-1.5">
-      <message kind="error" text="unexpected pointcut element"/>
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs163/pr253109" title="generic pointcuts - 5">
-      <compile files="CodeFive.java" options="-1.5 -showWeaveInfo">
-        <message kind="weave" line="55" text="advised by around advice"/>
-      </compile>
-    </ajc-test>
-    
-
-    <ajc-test dir="bugs163/pr163005" title="do not add method bodies to an interface">
-      <compile files="Code.java" options="-1.4">
-        <message kind="warning" text="The joinpoint 'method-call(java.lang.Class java.lang.Class.forName(java.lang.String))' cannot be advised"/>
-      </compile>      
-      <run class="Code"/>
-    </ajc-test>
-    
-     <ajc-test dir="bugs163/pr163005" title="do not add method bodies to an interface - 2">
-      <compile files="Code.java" options="-1.4 -XnoInline">
-        <message kind="warning" text="The joinpoint 'method-call(java.lang.Class java.lang.Class.forName(java.lang.String))' cannot be advised"/>
-      </compile>      
-      <run class="Code"/>
-    </ajc-test>
-    
-     <ajc-test dir="bugs163/pr163005" title="do not add method bodies to an interface - 3">
-      <compile files="Code2.java" options="-1.4">
-        <message kind="warning" text="The joinpoint 'constructor-call(void java.lang.Object.&lt;init&gt;())' cannot be advised"/>
-      </compile>      
-      <run class="Code2"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs163/pr250091" title="itd cce">
-      <compile files="Demo.java" options="-1.5"/>
-      <run class="Demo">
-        <stdout>
-          <line text="class A (false)"/>
-          <line text="class A (false)"/>
-          <line text="class Base (false)"/>
-        </stdout>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs163/pr226163" title="breaking recovery">
-      <compile files="Code.java" options="-1.5">
-        <message kind="error" line="4" text="Syntax error"/>
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs163/pr173978" title="missing local variable table on around advice">
-      <compile files="Test.java TestAroundAspect.java" options="-1.5"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs163/pr249710" title="terminateAfterCompilation">
-      <compile files="Foo.java" options="-1.5">
-      </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs163/pr250632" title="type conversion in generic itd">
-      <compile files="MyAspect.java" options="-1.5"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs163/pr250493" title="bridge methods for generic itds">
-      <compile files="Bridged.java" options="-1.5"/>
-      <run class="Bridged">
-        <stdout>
-          <line text="getterA()java.lang.Object  isBridged?true"/>
-          <line text="getterA()java.lang.String  isBridged?false"/>
-          <line text="getterB()java.lang.Object  isBridged?true"/>
-          <line text="getterB()java.lang.String  isBridged?false"/>
-        </stdout>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs163/pr252285" title="bridge methods for generic itd fields">
-      <compile files="Bridged.java" options="-1.5"/>
-      <run class="Bridged">
-        <stdout>
-          <line text="ajc$interFieldGet$X$Super$getterA()java.lang.Integer isBridged?false"/>
-          <line text="ajc$interFieldGet$X$Super$getterA()java.lang.Number isBridged?true"/>
-          <line text="ajc$interFieldSet$X$Super$getterA()void isBridged?false"/>
-          <line text="ajc$interFieldSet$X$Super$getterA()void isBridged?true"/>
-        </stdout>
-      </run>
-    </ajc-test>
-
-    <ajc-test dir="bugs163/pr251326" title="itd anonymous inner class in wrong package">
-      <compile files="pkgA/Listener.java pkgA/Target.java pkgB/InferListener.aj" options="-1.5"/>
-      <run class="pkgA.Target">
-        <stdout>
-          <line text="Simple A"/>
-          <line text="Inferred B"/>
-        </stdout>
-      </run>
-    </ajc-test>
-
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc164/ajc164.xml b/tests/src/test/java/org/aspectj/systemtest/ajc164/ajc164.xml
deleted file mode 100644
index e1c8e87b4..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc164/ajc164.xml
+++ /dev/null
@@ -1,278 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-
-   <ajc-test dir="bugs164/pr268710" title="generics aspects incorrect error">
-     <compile files="GenericAspect.aj ConcreteAspect.aj" options="-1.5"/>
-     <run class="none.ConcreteAspect">
-       <stdout>
-         <line text="Building an object class none.C"/>
-         <line text="C.init"/>
-       </stdout>
-     </run>
-   </ajc-test>
-
-   <ajc-test dir="bugs164/pr268689" title="generics aspects npe">
-     <compile files="GenericAspect.aj ConcreteAspect.aj" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs164/pr267559" title="generics and itd npe">
-     <compile files="IMarker.java ClassB.java Aspect.java ClassA.java" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs164/pr266564" title="annotation style long">
-     <compile files="AA.java" options="-1.5"/>
-     <run class="business.AA"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs164/pr266564" title="annotation style long - 2">
-     <compile files="CC.java" options="-1.5"/>
-     <run class="business.CC"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs164/pr266420" title="unused private warning">
-     <compile files="A.java" options="-1.5 -warn:unusedPrivate"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs164/pr266420" title="unused private warning - 2">
-     <compile files="B.java" options="-1.5 -warn:unusedPrivate">
-       <message kind="warning" text="The value of the field B.i is not used"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs164/pr266420" title="unused private warning - 3">
-     <compile files="C.java" options="-1.5 -warn:unusedPrivate">
-       <message kind="warning" text="The value of the field C.j is not used"/>
-     </compile>
-   </ajc-test>
-   
-    <ajc-test dir="bugs164/pr265729" title="aspectpath model">
-    <compile files="Aspect.java Orange.java Strawberry.java Fruit.java" outjar="library.jar" options="-emacssym"/>
-    <compile files="Orange.java Strawberry.java Fruit.java" aspectpath="library.jar" options="-emacssym"/>
-    <!--
-    -->
-   </ajc-test>
-   
-    <ajc-test dir="bugs164/pr266220" title="generics and aop.xml">
-        <compile files="Code.java"/>
-        <compile files="Isolator.java" outjar="aspects.jar" options="-1.5"/>
-        <run class="Code" classpath="aspects.jar" ltw="aop.xml">
-          <stdout>
-            <line text="execution(void Code.main(String[]))"/>
-            <line text="execution(void Code.run())"/>
-            <line text="running..."/>
-          </stdout>
-        </run>
-    </ajc-test>
-    
-   <ajc-test dir="bugs164/pr266165" title="optimizing if for constant reference - 1">
-     <compile files="NeverWeave.java" options="-1.5 -Xlint:ignore -showWeaveInfo"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs164/pr266165" title="optimizing if for constant reference - 2">
-     <compile files="AlwaysWeave.java" options="-1.5 -showWeaveInfo">
-       <message kind="weave" text="Join point"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs164/pr266165" title="optimizing if for constant reference - 3">
-     <compile files="NeverWeave2.java" options="-1.5 -Xlint:ignore -showWeaveInfo"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs164/pr266165" title="optimizing if for constant reference - 4">
-     <compile files="AlwaysWeave2.java" options="-1.5 -showWeaveInfo">
-       <message kind="weave" text="Join point"/>
-     </compile>
-   </ajc-test>
-
-   <ajc-test dir="bugs164/pr265695" title="anno inherited">
-     <compile files="Asp.aj" options="-showWeaveInfo -1.5">
-       <message kind="warning" line="22" text="advice defined"/>
-       <message kind="warning" line="24" text="advice defined"/>
-       <message kind="warning" line="26" text="advice defined"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs164/pr265695" title="new syntax for inherited anno - 1">
-     <compile files="AspNew.aj" options="-1.5 -showWeaveInfo">
-       <message kind="weave" text="Join point"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs164/pr265695" title="new syntax for inherited anno - 3">
-     <compile files="AspNew2.aj" options="-1.5 -showWeaveInfo">
-       <message kind="weave" text="Join point"/>
-     </compile>
-   </ajc-test>
-    
-    <ajc-test dir="bugs164/pr265418" title="varargs">
-      <compile files="A.java" options="-1.5"/>
-      <run class="A">
-        <stdout>
-          <line text="varargs call(void A.a(Object[]))"/>
-          <line text="varargs call(void A.b(String[]))"/>
-          <line text="varargs call(void A.c(Integer[]))"/>
-          <line text="arrays  call(void A.d(Object[]))"/>
-          <line text="arrays  call(void A.e(String[]))"/>
-          <line text="arrays  call(void A.f(Integer[]))"/>
-        </stdout>
-      </run>
-    </ajc-test>
-    
-   <ajc-test dir="bugs164" title="parser problem for array subtypes">
-     <compile files="PR148508.java"/>
-     <run class="PR148508">
-     </run>
-   </ajc-test>
-    
-    <ajc-test dir="bugs164/pr265360" title="incorrect resolution of Date">
-      <compile files="Foo.java Main.java" options="-1.5">
-        <message kind="warning" text="no match for this type name: Date "/>
-        <message kind="warning" test="advice defined in"/>
-      </compile>
-    </ajc-test>
-   
-    <ajc-test dir="bugs164/pr233032" title="dual preClinit">
-      <compile files="A.java" options="-1.5"/>
-      <run class="A"/>
-    </ajc-test>
-    
-    <ajc-test dir="features164/aopconfig/one" title="aop config - 1">
-      <compile files="A.java A2.java B.java foo.xml" options="-1.5 -showWeaveInfo -xmlConfigured">
-        <message kind="weave" text="Join point 'staticinitialization(void A.&lt;clinit&gt;())' in Type 'A' (A.java:1) advised by before advice from 'A' (A.java:2)"/>
-        <message kind="weave" text="Join point 'staticinitialization(void A2.&lt;clinit&gt;())' in Type 'A2' (A2.java:1) advised by before advice from 'A' (A.java:2)"/>
-        <message kind="weave" text="Join point 'staticinitialization(void B.&lt;clinit&gt;())' in Type 'B' (B.java:1) advised by before advice from 'A' (A.java:2)"/>
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="features164/aopconfig/one" title="aop config - 2">
-      <compile files="A.java A2.java B.java B2.java foo2.xml" options="-1.5 -showWeaveInfo -xmlConfigured">
-        <message kind="weave" text="Join point 'staticinitialization(void B.&lt;clinit&gt;())' in Type 'B' (B.java:1) advised by before advice from 'A' (A.java:2)"/>
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="features164/aopconfig/two" title="aop config - 3">
-      <!-- type pattern in the scope in foo.xml is complete nonsense -->
-      <compile files="A.java B.java foo.xml" options="-1.5 -Xlint:ignore -xmlConfigured">
-      	<message kind="error" text="Unable to parse scope as type pattern"/>
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="features164/aopconfig/one" title="aop config - 4">
-      <!-- excluding a type -->
-      <compile files="A.java A2.java B.java B2.java case4.xml" options="-1.5 -Xlint:ignore -xmlConfigured -showWeaveInfo">
-      	<message kind="weave" text="Join point 'staticinitialization(void A.&lt;clinit&gt;())' in Type 'A' (A.java:1) advised by before advice from 'A2' (A2.java:2)"/>
-      	<message kind="weave" text="Join point 'staticinitialization(void A.&lt;clinit&gt;())' in Type 'A' (A.java:1) advised by before advice from 'A' (A.java:2)"/>
-      	<message kind="weave" text="Join point 'staticinitialization(void A2.&lt;clinit&gt;())' in Type 'A2' (A2.java:1) advised by before advice from 'A2' (A2.java:2)"/>
-      	<message kind="weave" text="Join point 'staticinitialization(void A2.&lt;clinit&gt;())' in Type 'A2' (A2.java:1) advised by before advice from 'A' (A.java:2)"/>
-      	<message kind="weave" text="Join point 'staticinitialization(void B.&lt;clinit&gt;())' in Type 'B' (B.java:1) advised by before advice from 'A2' (A2.java:2)"/>
-      	<message kind="weave" text="Join point 'staticinitialization(void B.&lt;clinit&gt;())' in Type 'B' (B.java:1) advised by before advice from 'A' (A.java:2)"/>
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="features164/aopconfig/one" title="aop config - 5">
-      <!-- excluding a type -->
-      <compile files="A.java A2.java B.java B2.java case5.xml" options="-1.5 -Xlint:ignore -xmlConfigured -showWeaveInfo">
-      	<message kind="weave" text="Join point 'staticinitialization(void A.&lt;clinit&gt;())' in Type 'A' (A.java:1) advised by before advice from 'A2' (A2.java:2)"/>
-      	<message kind="weave" text="Join point 'staticinitialization(void A.&lt;clinit&gt;())' in Type 'A' (A.java:1) advised by before advice from 'A' (A.java:2)"/>
-      	<message kind="weave" text="Join point 'staticinitialization(void A2.&lt;clinit&gt;())' in Type 'A2' (A2.java:1) advised by before advice from 'A2' (A2.java:2)"/>
-      	<message kind="weave" text="Join point 'staticinitialization(void A2.&lt;clinit&gt;())' in Type 'A2' (A2.java:1) advised by before advice from 'A' (A.java:2)"/>
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs164/pr263310" title="inner handles">
-      <compile files="HandleTestingAspect.java" options="-1.5 -emacssym -Xlint:ignore"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs164/pr263666" title="around advice handles">
-      <compile files="x/A.java x/B.java x/OverrideOptions.aj" options="-1.5 -emacssym"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs164" title="ajcthis not read">
-      <compile files="pr195090.java" options="-1.5 -warn:+unusedArgument">
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs164/pr256779" title="anno decprecedence">
-      <compile files="ThisAspect.java OtherAspect.java" options="-1.5"/>
-      <run class="com.ThisAspect" ltw="aop.xml"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs164/pr262905" title="recursive cflow">
-      <compile files="A.java" options="-1.5">
-        <message kind="warning" line="5" text="advice defined"/>
-        <message kind="error" line="3" text="circular"/>
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs164/pr194314" title="broken lvt - 1">
-      <compile files="Service.java IService.java Main.java ServiceInterceptor.java" options="-1.5"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs164/pr194314" title="broken lvt - 2">
-      <compile files="Service.java IService.java Main.java ServiceInterceptorCodeStyle.java" options="-1.5"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs164/pr194314" title="broken lvt - 3">
-      <compile files="ITDOne.java" options="-1.5"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs164/pr262509" title="debugging before advice">
-      <compile files="Foo.java" options="-1.5"/>
-    </ajc-test> 
-    
-    <ajc-test dir="bugs164/pr262509" title="debugging before advice - 2">
-      <compile files="Foo2.java" options="-1.5 -preserveAllLocals"/>
-    </ajc-test> 
-    
-    <ajc-test dir="bugs164/pr262509" title="debugging before advice - 3">
-      <compile files="Foo3.java" options="-1.5 -preserveAllLocals"/>
-    </ajc-test> 
-       
-    <ajc-test dir="bugs164/pr246393" title="rogue errors - 1">
-      <compile files="D.java" options="-1.5">
-        <message kind="error" line="2" text="error on token"/>
-      </compile>
-    </ajc-test> 
-
-    <ajc-test dir="bugs164/pr262257" title="name clash">
-      <compile files="C.java" options="-1.5">
-      </compile>
-    </ajc-test> 
-       
-    <ajc-test dir="bugs164/pr260384" title="compiling spring">
-      <compile files="Broken.java" options="-1.5">
-      </compile>
-    </ajc-test>    
-
-    <ajc-test dir="bugs164/pr260384" title="compiling spring - 2">
-      <compile files="Broken2.java" options="-1.5">
-      </compile>
-    </ajc-test>    
-    
-    <ajc-test dir="bugs164/pr260384" title="compiling spring - 3">
-      <compile files="C.java" options="-1.5 -emacssym"/>
-    </ajc-test>    
-    
-    <ajc-test dir="bugs164/pr260384" title="compiling spring - 4">
-      <compile files="D.java" options="-1.5">
-      </compile>
-    </ajc-test>    
-    
-    <ajc-test dir="bugs164/pr164016" title="ataspectj decp 164016">
-      <compile files="Code.aj" options="-1.5"/>
-      <run class="test.Code"/>
-    </ajc-test>    
-    
-    
-    <ajc-test dir="bugs164/pr164016" title="ataspectj decp 164016 - 2">
-      <compile files="Code.java TargetBad.java TargetGood.java" aspectpath="code.jar" options="-1.5"/>
-      <run class="test.Code"/>
-    </ajc-test>    
-    
-    <ajc-test dir="bugs164/pr258788" title="ataspectj decp 258788">
-      <compile files="NameAware.java NameManager.java NameManagerImpl.java StartClass.java TargetClass.java TestAspect.java" options="-1.5"/>
-      <run class="com.StartClass"/>
-    </ajc-test>    
-        
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc164/declareMixin.xml b/tests/src/test/java/org/aspectj/systemtest/ajc164/declareMixin.xml
deleted file mode 100644
index 02853f93a..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc164/declareMixin.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-   
-   <ajc-test dir="features164/declareMixin" title="casea">
-     <compile files="CaseA.java" options="-1.5"/>
-     <run class="CaseA">
-       <stdout>
-         <line text="Delegate factory invoked"/>
-         <line text="methodOne running"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="features164/declareMixin" title="caseb">
-     <compile files="CaseB.java" options="-1.5"/>
-     <run class="CaseB">
-       <stdout>
-         <line text="Delegate factory invoked"/>
-         <line text="methodOne running"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="features164/declareMixin" title="casec">
-     <compile files="CaseC.java" options="-1.5"/>
-     <run class="CaseC">
-       <stdout>
-         <line text="Delegate factory invoked for CaseC instance"/>
-         <line text="methodOne running"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="features164/declareMixin" title="cased">
-     <compile files="CaseD.java" options="-1.5"/>
-     <run class="CaseD">
-       <stdout>
-         <line text="Delegate factory invoked for CaseD instance"/>
-         <line text="methodOne running"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="features164/declareMixin" title="casee">
-     <compile files="CaseE.java" options="-1.5"/>
-     <run class="CaseE">
-       <stdout>
-         <line text="Delegate factory invoked for CaseE instance: a"/>
-         <line text="methodOne running on CaseE instance: a"/>
-         <line text="Delegate factory invoked for CaseE instance: b"/>
-         <line text="methodTwo running on CaseE instance: b"/>
-         <line text="methodOne running on CaseE instance: a"/>
-         <line text="methodTwo running on CaseE instance: b"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="features164/declareMixin" title="casef">
-     <compile files="CaseF.java" options="-1.5"/>
-     <run class="CaseF">
-       <stdout>
-         <line text="Delegate factory invoked for CaseF instance"/>
-         <line text="methodOne running"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="features164/declareMixin" title="caseg">
-     <compile files="CaseG.java" options="-1.5"/>
-     <run class="CaseG">
-       <stdout>
-         <line text="Delegate factory invoked for instance of A"/>
-         <line text="run() executing on behalf of A"/>
-         <line text="Delegate factory invoked for instance of B"/>
-         <line text="run() executing on behalf of B"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="features164/declareMixin" title="caseh">
-     <compile files="CaseH.java" options="-1.5">
-         <message kind="error" text="The value for annotation attribute DeclareMixin"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="features164/declareMixin" title="casei">
-     <compile files="CaseI.java" options="-1.5">
-         <message kind="error" text="Types listed in the 'interfaces'"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="features164/declareMixin" title="casej">
-     <compile files="CaseJ.java" options="-1.5">
-         <message kind="error" text="createImplementation1"/>
-         <message kind="error" text="Method 'int X.createImplementation2(java.lang.Object)':  factory methods "/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="features164/declareMixin" title="casek">
-     <compile files="CaseK.java" options="-1.5">
-         <message kind="error" text="factory methods for a mixin can take a maximum of one parameter"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="features164/declareMixin" title="casel">
-     <compile files="CaseL.java" options="-1.5">
-       <message kind="error" text="Cannot cast from CaseL to C"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="features164/declareMixin" title="casem">
-     <compile files="CaseM.java" options="-1.5">
-       <message kind="error" text=": factory methods for a mixin must either return an interface type or specify interfaces in the annotation and return a class"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="features164/declareMixin" title="casen">
-     <compile files="CaseN.java" options="-1.5"/>
-     <run class="CaseN">
-       <stdout>
-         <line text="foo() running"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="features164/declareMixin" title="caseo">
-     <compile files="CaseO.java" options="-1.5">
-       <message kind="error" text="factory method does not return something that implements 'I'"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="features164/declareMixin" title="casep">
-     <compile files="CaseP.java" options="-1.5"/>
-     <run class="CaseP">
-       <stdout>
-         <line text="foo() running"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="features164/declareMixin" title="caseq">
-     <compile files="CaseQ.java" options="-1.5"/>
-     <run class="CaseQ">
-       <stdout>
-         <line text="foo() running"/>
-         <line text="goo() running"/>
-       </stdout>
-     </run>
-   </ajc-test>   
-     
-   <ajc-test dir="features164/declareMixin" title="caser">
-     <compile files="CaseR.java" options="-1.5"/>
-     <run class="CaseR">
-       <stdout>
-         <line text="true"/>
-         <line text="false"/>
-       </stdout>
-     </run>
-   </ajc-test>    
-    
-   <ajc-test dir="features164/declareMixin" title="cases">
-     <compile files="CaseS.java" options="-1.5">
-       <message kind="error" text="not compatible"/>
-     </compile>
-   </ajc-test>     
-   
-   <ajc-test dir="features164/declareMixin" title="caset">
-     <compile files="CaseT.java" options="-1.5 -showWeaveInfo">
-       <message kind="weave" text="Mixing interface 'I' (CaseT.java) into type 'CaseT' (CaseT.java)"/>
-     </compile>
-   </ajc-test>    
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc164/joinpointid.xml b/tests/src/test/java/org/aspectj/systemtest/ajc164/joinpointid.xml
deleted file mode 100644
index 6f2bdc79b..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc164/joinpointid.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-   
-   <ajc-test dir="features164/joinpointid" title="casea">
-     <compile files="Driver.java" options="-1.5"/>
-     <run class="Driver">
-       <stdout>
-         <line text="At void A.mone() id=0 state=0"/>
-         <line text="At void A.mtwo() id=1 state=0"/>
-         <line text="At void A.mone() id=0 state=1"/>
-         <line text="At void A.mtwo() id=1 state=1"/>
-         <line text="At void A.mone() id=0 state=2"/>
-         <line text="At void A.mtwo() id=1 state=2"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc165/ajc165.xml b/tests/src/test/java/org/aspectj/systemtest/ajc165/ajc165.xml
deleted file mode 100644
index 6c3b74d71..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc165/ajc165.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-   
-   <ajc-test dir="bugs165/pr277959" title="verifyerror">
-     <compile files="AOPTest.java  CodeAspect.java" options="-1.5"/>
-     <run class="example.AOPTest"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs165/pr277508" title="if method names">
-     <compile files="Basic.java" options="-1.5"/>
-     <run class="Basic">
-       <stdout>
-         <line text="if method: public static final boolean X.ajc$if$1ba()"/>
-         <line text="if method: public static final boolean X.ajc$if$177()"/>
-         <line text="if method: public static final boolean X.ajc$if$165()"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs165/pr277508" title="if method names - 2">
-     <compile files="Basic2.java" options="-1.5"/>
-     <run class="Basic2">
-       <stdout>
-         <line text="if method: public static final boolean X.ajc$if$16d()"/>
-         <line text="if method: public static final boolean X.ajc$if$17f()"/>
-         <line text="if method: public static final boolean X.ajc$if$1c0()"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs165/pr275625" title="dec anno method">
-     <compile files="A.java" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs165/pr275625" title="dec anno field">
-     <compile files="F.java" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs165/pr275032" title="itd default ctor">
-     <compile files="A.java X.java" options="-1.5 -Xlint:ignore"/>
-     <run class="A">
-       <stdout>
-         <line text="itd ctor"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs165/pr275032/c2" title="itd default ctor - 2">
-     <compile files="A.java X.java" options="-1.5 -Xlint:ignore">
-	     <message kind="error" text="inter-type declaration from X conflicts with existing"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs165/pr275032/c2" title="itd default ctor - 3">
-     <compile files="A.java" options="-outjar foo.jar"/>
-     <compile files="X.java" options="-1.5 -Xlint:ignore"  inpath="foo.jar">
-	     <message kind="error" text="inter-type declaration from X conflicts with existing"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs165/pr275032" title="itd default ctor - 4">
-     <compile files="A.java" options="-outjar foo.jar"/>
-     <compile files="X.java" options="-1.5" inpath="foo.jar">
-     </compile>
-     <run class="A">
-       <stdout>
-         <line text="itd ctor"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs165/pr272233" title="funky pointcut">
-     <compile files="Iffy.java" options="-1.5">
-       <message kind="warning" text="void is not a generic type"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs165/pr272233" title="funky pointcut 2">
-     <compile files="Iffy2.java" options="-1.5 -showWeaveInfo">
-       <message kind="weave" text="advised by before advice from 'Iffy2' (Iffy2.java:11)"/>
-       <message kind="weave" text="advised by before advice from 'Iffy2' (Iffy2.java:8)"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs165/pr265356" title="annotation style message positions">
-     <compile files="Main.java" options="-1.5">
-       <message kind="warning" line="11"/>
-       <message kind="warning" line="13"/>
-       <message kind="warning" line="14"/>
-     </compile>
-   </ajc-test>
-
-   <ajc-test dir="bugs165/pr271169" title="around call npe">
-     <compile files="HypChecksums.java" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs165/pr273628" title="verifyerror on anno bind">
-     <compile files="AnnotationAspect.java ApiDescriptor.java AspectTargetClass.java MonitorableMethod.java TestPointcutAnnotationAspect.java" options="-1.5"/>
-     <run class="p.TestPointcutAnnotationAspect"/>
-   </ajc-test>
-
-   <ajc-test dir="bugs165/pr272825" title="generic ITD">
-     <compile files="Concrete.java GenericSuper.java ITDOfMethod.aj Main.java" options="-1.5"/>
-     <run class="Main">
-       <stdout>
-         <line text="In normal method"/>
-         <line text="else"/>
-         <line text="1"/>
-         <line text="In ITD method"/>
-         <line text="with"/>
-         <line text="2"/>
-       </stdout>
-     </run>
-   </ajc-test>
-
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc165/world.xml b/tests/src/test/java/org/aspectj/systemtest/ajc165/world.xml
deleted file mode 100644
index e9c113cc5..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc165/world.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc166/ajc166.xml b/tests/src/test/java/org/aspectj/systemtest/ajc166/ajc166.xml
deleted file mode 100644
index d19a3b485..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc166/ajc166.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-
-  <ajc-test dir="bugs166/pr286473" title="parents ltw - binary">
-    <compile files="Anno.java Top.java Middle.java Bottom.java" outjar="code.jar" options="-1.5 -Xlint:ignore"/>
-    <compile files="Mark.java LTWTest.java" inpath="code.jar" options="-1.5 -showWeaveInfo">
-    	<message kind="weave" text="Type 'Mark$IMarker' (Mark.java) has intertyped method from 'Mark' (Mark.java:'java.lang.String Mark$IMarker.markMethod()')"/>
-		<message kind="weave" text="Extending interface set for type 'Top' (Top.java) to include 'Mark$IMarker' (Mark.java)"/>
-		<message kind="weave" text="Type 'Top' (Top.java) has intertyped method from 'Mark' (Mark.java:'java.lang.String Mark$IMarker.markMethod()')"/>
-    </compile>
-    <run class="LTWTest">
-      <stdout>
-        <line text="Bottom.getMethods()"/>
-        <line text="bottom : Bottom"/>
-        <line text="markMethod : Top"/>
-        <line text="middle : Middle"/>
-      </stdout>
-    </run>
-  </ajc-test>
-  
-  <ajc-test dir="bugs166/pr286473" title="parents ltw - ltw">
-    <compile files="Anno.java Top.java Middle.java Bottom.java" outjar="code.jar" options="-1.5 -Xlint:ignore"/>
-    <compile files="Mark.java LTWTest.java" classpath="code.jar" options="-1.5">
-    </compile>
-    <run class="LTWTest" ltw="aop.xml">
-      <stderr>
-        <line text="Extending interface set for type 'Top' (Top.java) to include 'Mark$IMarker' (Mark.java)"/>
-        <line text="Type 'Top' (Top.java) has intertyped method from 'Mark' (Mark.java:'java.lang.String Mark$IMarker.markMethod()')"/>
-        <line text="Type 'Mark$IMarker' (Mark.java) has intertyped method from 'Mark' (Mark.java:'java.lang.String Mark$IMarker.markMethod()')"/>
-<!--
-        <line text="Extending interface set for type 'Bottom' (Bottom.java) to include 'Mark$IMarker' (Mark.java)"/>
-        <line text="Type 'Bottom' (Bottom.java) has intertyped method from 'Mark' (Mark.java:'java.lang.String Mark$IMarker.markMethod()')"/>
-        <line text="Type 'Mark$IMarker' (Mark.java) has intertyped method from 'Mark' (Mark.java:'java.lang.String Mark$IMarker.markMethod()')"/>
-        <line text="Extending interface set for type 'Middle' (Middle.java) to include 'Mark$IMarker' (Mark.java)"/>
-        <line text="Type 'Middle' (Middle.java) has intertyped method from 'Mark' (Mark.java:'java.lang.String Mark$IMarker.markMethod()')"/>
-        <line text="Extending interface set for type 'Top' (Top.java) to include 'Mark$IMarker' (Mark.java)"/>
-        <line text="Type 'Top' (Top.java) has intertyped method from 'Mark' (Mark.java:'java.lang.String Mark$IMarker.markMethod()')"/>
-        -->
-      </stderr>
-      <stdout>
-        <line text="Bottom.getMethods()"/>
-        <line text="bottom : Bottom"/>
-        <line text="markMethod : Top"/>
-        <line text="middle : Middle"/>
-      </stdout>
-    </run>
-  </ajc-test>
-
-  <ajc-test dir="bugs166/pr290227" title="npe for javac built">
-    <compile files="" inpath="javacCode.jar" options="-1.5 -Xlint:ignore"/>
-  </ajc-test>
-  
-  <ajc-test dir="bugs166/pr288049" title="itd decanno">
-     <compile files="org/othtests/MyClass.java org/othtests/MySubClass.java org/othtests/AddSomeAnnotation.java" options="-1.5 -showWeaveInfo">
-     <message kind="weave" text="'public java.lang.String org.othtests.MySubClass.doOne()' (MySubClass.java:5) is annotated with"/>
-     <message kind="weave" text="'public java.lang.String org.othtests.MySubClass.doTwo()' (MySubClass.java:9) is annotated with"/>
-     </compile>
-  </ajc-test>
-  
-  <ajc-test dir="bugs166/pr288712" title="verifyerror anno style">
-    <compile files="answers/Answer2h.java figures/FigureElement.java figures/Line.java figures/Point.java figures/ShapeFigureElement.java Main.java" options="-1.5"/>
-    <run class="Main"/>
-  </ajc-test>
-  
-  <ajc-test dir="bugs166/pr288635" title="munger cce - 2">
-     <compile files="AddAnnotation.java MakeItd.java InterceptTraceds.java TestClass.java Anno.java" options="-1.5 -XterminateAfterCompilation"/>
-     <run class="TestClass" ltw="aop1.xml">
-       <stdout>
-         <line text="Executing execution(int TestClass.doAnother()) on level debug"/>
-       </stdout>
-     </run>
-  </ajc-test>
-  
-  <ajc-test dir="bugs166/pr288635" title="munger cce">
-     <compile files="org/tests/atann/AddAnnotations.aj org/tests/atann/AddITDDoMethod.aj org/tests/atann/InterceptTraceds.aj org/tests/atann/TestClass.java org/tests/atann/Traced.java" options="-1.5"/>
-     <run class="org.tests.atann.TestClass">
-       <stdout>
-         <line text="Executing execution(String org.tests.atann.TestClass.doAnnotated()) on level debug"/>
-         <line text="Executing execution(int org.tests.atann.TestClass.doITDAnnotation()) on level debug"/>
-         <line text="Executing execution(int org.tests.atann.TestClass.doAnother()) on level debug"/>
-       </stdout>
-     </run>
-  </ajc-test>
-   
-  <ajc-test dir="bugs166/pr286375" title="npe on bad aspect decl">
-     <compile files="DatabaseOperationMonitor.java" options="-1.5" outjar="wibble.jar"/>
-     <compile files="" inpath="wibble.jar" options="-1.5"/>
-  </ajc-test>
-  
-  
-  <ajc-test dir="bugs166/pr290087" title="binary decp super rewrite">
-     <compile files="Bean.java BeanChild.java GenericParent.java" options="-1.5" outjar="base.jar"/>
-     <compile files="Interface.java InterfaceParent.java BeanHasInterface.java" inpath="base.jar" options="-1.5"/>
-     <run class="BeanChild"/>
-  </ajc-test>
-  
-  <ajc-test dir="bugs166/pr287597" title="anno modifier ordering - 1">
-     <compile files="A.java" options="-1.5 -showWeaveInfo">
-       <message kind="weave" text="foo"/>
-     </compile>
-  </ajc-test>
-  
-  <ajc-test dir="bugs166/pr287613" title="dec anno compound expressions">
-     <compile files="DeclareAnnot.java" options="-1.5"/>
-  </ajc-test>
-  
-  <ajc-test dir="bugs166/pr284862" title="npe hasmember">
-     <compile files="InterfaceToAdd.java AnnotatedMethodImpl.aj AspectToMatch.aj AnnotatedMethodInterface.java Entity.java EntityClass.java PresentAnnotation.java SearchAnnotation.java" options="-1.5 -XhasMember"/>
-  </ajc-test>
-  
-  <ajc-test dir="bugs166/pr284862" title="npe hasmember - 2">
-     <compile files="AnnotatedMethodInterface.java InterfaceToAdd.java AnnotatedMethodImpl.aj AspectToMatch.aj Entity.java EntityClass.java PresentAnnotation.java SearchAnnotation.java" options="-1.5 -XhasMember"/>
-  </ajc-test>
-  
-  <ajc-test dir="bugs166/pr284862" title="npe hasmember - 3">
-     <compile files="AnnotatedMethodInterface.java InterfaceToAdd.java AnnotatedMethodImpl.aj AspectToMatch.aj Entity.java EntityClass.java PresentAnnotation.java SearchAnnotation.java" options="-Xset:pipelineCompilation=false -1.5 -XhasMember"/>
-  </ajc-test>
-  
-  <ajc-test dir="bugs165/pr279983" title="generics bridge">
-     <compile files="X.java" options="-1.5"/>
-     <run class="X"/>
-  </ajc-test>
-
-  <ajc-test dir="bugs166/pr282299" title="generics and decp">
-     <compile files="Code.java" options="-1.5"/>
-  </ajc-test>
-   
-  <ajc-test dir="bugs166/pr284297" title="generic signature problem">
-     <compile files="DomainLogic.java DomainObject.java FancyDomainLogic.java" options="-1.5" outjar="code.jar"/>
-     <compile files="FancyDomainLogicImpl.java" options="-1.5" classpath="code.jar"/>
-  </ajc-test>
-
-   <ajc-test dir="bugs166/pr283229" title="interfaces and serializable">
-     <compile files="Foo.java" options="-1.5 -XaddSerialVersionUID"/>
-     <run class="Foo">
-     <!--
-       <stdout>
-         <line text="if method: public static final boolean X.ajc$if$1ba()"/>
-         <line text="if method: public static final boolean X.ajc$if$177()"/>
-         <line text="if method: public static final boolean X.ajc$if$165()"/>
-       </stdout>
-       -->
-     </run> 
-   </ajc-test>
-
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc167/ajc167.xml b/tests/src/test/java/org/aspectj/systemtest/ajc167/ajc167.xml
deleted file mode 100644
index c1acde861..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc167/ajc167.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-
-
-  <ajc-test dir="bugs167/pr296533" title="generic aspect signatures">
-     <compile files="testing/AbstractCache.aj testing/Resource.java testing/ResourceCache.aj testing/ResourceManager.java testing/TestRunner.java" options="-1.5"/>
-     <run class="testing.TestRunner">
-       <stdout>
-         <line text="Cache hits: 5"/>
-         <line text="Cache hits: 2"/>
-       </stdout>
-     </run>
-  </ajc-test>
-
-  <ajc-test dir="bugs167/pr296501" title="optimizing string anno value binding">
-     <compile files="StringBinding.java" options="-1.5"/>
-     <run class="StringBinding">
-       <stdout>
-         <line text="hello world"/>
-       </stdout>
-     </run>
-  </ajc-test>
-  
-  <ajc-test dir="bugs167/pr296484" title="optimizing annotation binding">
-     <compile files="AnnoBinding.java" options="-1.5"/>
-     <run class="AnnoBinding"/>
-  </ajc-test>
-  
-  <ajc-test dir="bugs167/pr296484" title="optimizing annotation binding - 2">
-     <compile files="Perf.java" options="-1.5"/>
-     <run class="Perf"/>
-  </ajc-test>
-  
-  <ajc-test dir="bugs167/pr295092" title="perthis ltw">
-     <compile files="AbstractAspect.aj" options="-1.5" outjar="aspects.jar"/>
-     <compile files="Wibble.java"/>
-     <run class="Wibble" ltw="aop.xml" classpath="aspects.jar"/>
-  </ajc-test>
-
-  <ajc-test dir="bugs167/pr296054" title="npe on broken code">
-     <compile files="Demo.java AnnotAspect.aj" options="-1.5 -emacssym">
-       <message kind="error" text="The value for"/>
-       <message kind="error" text="cannot convert"/>
-     </compile>
-  </ajc-test>
-  
-  <ajc-test dir="bugs167/pr296040" title="broken generated code">
-     <compile files="ErrorClass.java" options="-1.5" classpath="gc10rc4.jar"/>
-     <run class="ErrorClass"/>
-  </ajc-test>
-  
-  <ajc-test dir="bugs167/pr293457" title="hierarchy builder npe">
-     <compile files="com/citi/gdos/smart/applib/service/cache/CachingIntroduction.aj org/springmodules/cache/annotations/Cacheable.java" options="-1.5 -emacssym">
-     <message kind="warning" text="no match for this type name: Setter"/>
-     <message kind="error" text="Setter cannot be resolved to a type"/>
-     <message kind="error" text="The attribute modelId is undefined for the"/>
-     </compile>
-  </ajc-test>
-  
-  <ajc-test dir="features167/timers/one" title="timers - 1">
-    <compile files="Code.java Code2.java" outjar="code.jar" options="-1.5 -Xlint:ignore"/>
-    <compile files="Asp.java" options="-1.5 -Xlint:ignore" outjar="asp.jar"/>
-    <run class="Code2" ltw="aop.xml" classpath="code.jar;asp.jar">
-      <stderr>
-        <line text="info AspectJ"/>
-        <line text="info register"/>
-        <line text="info using"/>
-        <line text="info register"/>
-        <line text="info Pointcut match"/>
-        <line text="info Time"/>
-        <line text="info ---"/>
-        <line text="info processing"/>
-        <line text="info Pointcut fast"/>
-        <line text="info Time"/>
-        <line text="info ---"/>
-      </stderr>
-    </run>
-  </ajc-test>
-  
-  <ajc-test dir="features167/timers/one" title="timers - 2">
-    <compile files="Code.java Code2.java Asp.java" options="-1.5 -timers -Xset:timersPerJoinpoint=8,timersPerFastMatchCall=3">
-<!--        <line text="info AspectJ"/>
-        <line text="info register"/>
-        <line text="info using"/>
-        <line text="info register"/>
-        <line text="info processing"/>
-        <line text="info Pointcut fast"/>
-        <line text="info Time"/>
-        <line text="info -"/>
-        <line text="info Pointcut match"/>
-        <line text="info Time"/>
-        <line text="info -"/>
-        -->
-        </compile>
-  </ajc-test>
-
-
-  <ajc-test dir="bugs167/pr293510" title="execution fastmatch - 1">
-     <compile files="CaseOne.java" options="-1.5 -showWeaveInfo">
-       <message kind="weave" text="Join point 'method-execution(void pkg.C.m())' in Type 'pkg.C' (CaseOne.java:10) advised by before advice from 'pkg.X' (CaseOne.java:14)"/>
-     </compile>
-  </ajc-test>
-  
-  <ajc-test dir="bugs167/pr293510" title="execution fastmatch - 2">
-     <compile files="CaseTwo.java" options="-1.5 -showWeaveInfo">
-       <message kind="weave" text="Join point 'method-execution(void pkg.C.m())' in Type 'pkg.C' (CaseTwo.java:9) advised by before advice from 'pkg.X' (CaseTwo.java:13)"/>
-     </compile>
-  </ajc-test>
-  
-  <ajc-test dir="bugs167/pr293203" title="anno matching">
-     <compile files="Foo.java" options="-1.5"/>
-     <run class="Foo">
-       <stdout>
-         <line text="advice"/>
-         <line text="advice"/>
-         <line text="advice"/>
-       </stdout>
-     </run>
-  </ajc-test>
-  
-  <ajc-test dir="bugs167/pr288064" title="outer class names - scala">
-     <compile files="Main.java Outer.java Aspect.java" options="-1.5"/>
-     <run class="test.Main">
-       <stdout>
-         <line text="advice"/>
-         <line text="method"/>
-       </stdout>
-     </run>
-  </ajc-test>
-  
-  <ajc-test dir="bugs167/pr288064" title="outer class names - scala - ltw">
-     <compile files="Main.java Outer.java" outjar="app.jar" options="-1.5"/>
-     <compile files="Aspect.java" outjar="asp.jar" options="-Xlint:ignore -1.5"/>
-     <run class="test.Main" classpath="app.jar;asp.jar" ltw="aop.xml">
-       <stdout>
-         <line text="advice"/>
-         <line text="method"/>
-       </stdout>
-     </run>
-  </ajc-test>
-   
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc167/intertype.xml b/tests/src/test/java/org/aspectj/systemtest/ajc167/intertype.xml
deleted file mode 100644
index a432ee188..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc167/intertype.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-   
-   <ajc-test dir="features167/intertype" title="simple">
-     <compile files="Simple.java" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="features167/intertype" title="simple with field">
-     <compile files="Two.java" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="features167/intertype" title="simple with field2">
-     <compile files="Three.java" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="features167/intertype" title="new instance">
-     <compile files="Four.java" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="features167/intertype" title="new instance and access">
-     <compile files="Five.java" options="-1.5"/>
-     <run class="Five">
-       <stdout>
-         <line text="5"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="features167/intertype" title="new instance and access to two fields">
-     <compile files="Six.java" options="-1.5"/>
-     <run class="Six">
-       <stdout>
-         <line text="5"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   
-
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc167/overweaving.xml b/tests/src/test/java/org/aspectj/systemtest/ajc167/overweaving.xml
deleted file mode 100644
index 044223d88..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc167/overweaving.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-   
-    <ajc-test dir="features167/overweaving/getset" title="getset - 1">
-     <compile files="A.aj B.aj Class1.java Class2.java" options="-1.5"/>
-     <run class="Class1">
-       <stdout>
-         <line text="B:set(String Class1.message)"/>
-         <line text="A:get(PrintStream java.lang.System.out)"/>
-         <line text="A:get(String Class1.message)"/>
-         <line text="Class1.main"/>
-       </stdout>
-     </run>
-     
-     <run class="Class2">
-       <stdout>
-         <line text="B:set(String Class2.message)"/>
-         <line text="A:get(PrintStream java.lang.System.out)"/>
-         <line text="A:get(String Class2.message)"/>
-         <line text="Class2.main"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-    <ajc-test dir="features167/overweaving/getset" title="getset - 2">
-     <compile files="A.aj Class1.java" options="-1.5"/>
-     <compile files="B.aj" options="-1.5 -Xlint:ignore"/>
-     <compile files="Class2.java" options="-1.5 -Xlint:ignore"/>
-     <run class="Class1" ltw="aop.xml">
-       <stdout>
-       <!-- should be advised by both, but was *already* advised by A during first weave -->
-         <line text="B:set(String Class1.message)"/>
-         <line text="A:get(PrintStream java.lang.System.out)"/>
-         <line text="A:get(String Class1.message)"/>
-         <line text="Class1.main"/>
-       </stdout>
-     </run>
-     
-     <run class="Class2" ltw="aop.xml">
-       <stdout>
-         <line text="B:set(String Class2.message)"/>
-         <line text="A:get(PrintStream java.lang.System.out)"/>
-         <line text="A:get(String Class2.message)"/>
-         <line text="Class2.main"/>
-       </stdout>
-     </run>
-   </ajc-test>
-     
-    <ajc-test dir="features167/overweaving/getsetTJP" title="getset - tjp - 1">
-     <compile files="A.aj Class1.java" options="-1.5"/>
-     <compile files="B.aj" options="-1.5 -Xlint:ignore"/>
-     <compile files="Class2.java" options="-1.5 -Xlint:ignore"/>
-     <run class="Class1" ltw="aop.xml">
-       <stdout>
-       <!-- should be advised by both, but was *already* advised by A during first weave -->
-         <line text="B:set(String Class1.message)"/>
-         <line text="A:get(PrintStream java.lang.System.out)"/>
-         <line text="A:get(String Class1.message)"/>
-         <line text="Class1.main"/>
-       </stdout>
-     </run>
-     
-     <run class="Class2" ltw="aop.xml">
-       <stdout>
-         <line text="B:set(String Class2.message)"/>
-         <line text="A:get(PrintStream java.lang.System.out)"/>
-         <line text="A:get(String Class2.message)"/>
-         <line text="Class2.main"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-    <ajc-test dir="features167/overweaving/calls" title="calls - 1">
-     <compile files="A.aj B.aj Class1.java Class2.java" options="-1.5"/>
-     <run class="Class1">
-       <stdout>
-         <line text="B:call(void java.io.PrintStream.println(String))"/>
-         <line text="A:call(void java.io.PrintStream.println(String))"/>
-         <line text="Class1.main"/>
-       </stdout>
-     </run>
-     
-     <run class="Class2">
-       <stdout>
-         <line text="B:call(void java.io.PrintStream.println(String))"/>
-         <line text="A:call(void java.io.PrintStream.println(String))"/>
-         <line text="Class2.main"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-    <ajc-test dir="features167/overweaving/calls" title="calls - 2">
-     <compile files="A.aj Class1.java" options="-1.5"/>
-     <compile files="B.aj" options="-1.5 -Xlint:ignore"/>
-     <compile files="Class2.java" options="-1.5 -Xlint:ignore"/>
-     <run class="Class1" ltw="aop.xml">
-       <stdout>
-       <!-- should be advised by both, but was *already* advised by A during first weave -->
-         <line text="A:call(void java.io.PrintStream.println(String))"/>
-         <line text="B:call(void java.io.PrintStream.println(String))"/>
-         <line text="Class1.main"/>
-       </stdout>
-     </run>
-     
-     <run class="Class2" ltw="aop.xml">
-       <stdout>
-         <line text="B:call(void java.io.PrintStream.println(String))"/>
-         <line text="A:call(void java.io.PrintStream.println(String))"/>
-         <line text="Class2.main"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-    <ajc-test dir="features167/overweaving/callsTJP" title="calls - tjp - 1">
-     <compile files="A.aj Class1.java" options="-1.5"/>
-     <compile files="B.aj" options="-1.5 -Xlint:ignore"/>
-     <compile files="Class2.java" options="-1.5 -Xlint:ignore"/>
-     <run class="Class1" ltw="aop.xml">
-       <stdout>
-       <!-- should be advised by both, but was *already* advised by A during first weave -->
-         <line text="A:call(void java.io.PrintStream.println(String))"/>
-         <line text="B:call(void java.io.PrintStream.println(String))"/>
-         <line text="Class1.main"/>
-       </stdout>
-     </run>
-     
-     <run class="Class2" ltw="aop.xml">
-       <stdout>
-         <line text="B:call(void java.io.PrintStream.println(String))"/>
-         <line text="A:call(void java.io.PrintStream.println(String))"/>
-         <line text="Class2.main"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="features167/overweaving/messy2" title="really messy">
-     <compile files="A.aj Class1.java" options="-1.5"/>
-     <compile files="B.aj" options="-1.5 -Xlint:ignore"/>
-     <compile files="Class2.java" options="-1.5 -Xlint:ignore"/>
-     <run class="Class1" ltw="aop.xml">
-       <stdout>
-       <!-- should be advised by both, but was *already* advised by A during first weave -->
-         <line text="B:execution(void Class1.main(String[]))"/>
-         <line text="A:execution(void Class1.main(String[]))"/>
-         <line text="Class1.main"/>
-       </stdout>
-     </run>
-     
-     <run class="Class2" ltw="aop.xml">
-       <stdout>
-         <line text="B:execution(void Class2.main(String[]))"/>
-         <line text="A:execution(void Class2.main(String[]))"/>
-         <line text="Class2.main"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="features167/overweaving" title="simple">
-     <compile files="A.aj C.java" options="-1.5"/>
-     <compile files="X.aj" options="-1.5 -Xlint:ignore"/>
-     <run class="com.andy.C" ltw="aop.xml">
-       <stdout>
-         <line text="AspectX&gt;&gt;execution(void com.andy.C.main(String[]))"/>
-         <line text="AspectA&gt;&gt;execution(void com.andy.C.main(String[]))"/>
-         <line text="AspectX&gt;&gt;execution(void com.andy.C.run())"/>
-         <line text="hello andy"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="features167/overweaving/messy" title="messy">
-     <compile files="A.aj C.java" options="-1.5"/>
-     <compile files="X.aj" options="-1.5 -Xlint:ignore"/>
-     <run class="com.andy.C" ltw="aop.xml">
-       <stdout>
-         <line text="X:execution(void com.andy.C.main(String[]))"/>
-         <line text="A:execution(void com.andy.C.main(String[]))"/>
-         <line text="X:execution(void com.andy.C.run())"/>
-         <line text="hello andy"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="features167/overweaving/cflow" title="cflow">
-     <compile files="A.aj C.java" options="-1.5"/>
-     <compile files="X.aj" options="-1.5 -Xlint:ignore"/>
-     <run class="com.andy.C" ltw="aop.xml">
-       <stdout>
-         <line text="X:execution(void com.andy.C.main(String[]))"/>
-         <line text="A:execution(void com.andy.C.main(String[]))"/>
-         <line text="X:execution(void com.andy.C.run())"/>
-         <line text="hello andy"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc169/ajc169.xml b/tests/src/test/java/org/aspectj/systemtest/ajc169/ajc169.xml
deleted file mode 100644
index 66de48191..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc169/ajc169.xml
+++ /dev/null
@@ -1,413 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-
-  <ajc-test dir="bugs169/pr318241" title="messy decp">
-    <compile files="PkItd.aj Two.aj SomeClass.java Pk.java SomeAnnotation.java" options="-1.5">
-    </compile>
-  </ajc-test>
-
-  <ajc-test dir="bugs169/pr287613" title="compound declare patterns - method - 2">
-  	 <compile files="DAMethod2.java" options="-1.5 -showWeaveInfo">
-  	 	<message kind="weave" text="'public void Person.foo()' (DAMethod2.java:11) is annotated with @Annot method annotation from 'DAMethod2' (DAMethod2.java:26)"/>
-  	 	<message kind="weave" text="public boolean Person.bar()' (DAMethod2.java:13) is annotated with @Annot method annotation from 'DAMethod2' (DAMethod2.java:26)"/>
-  	 	<message kind="weave" text="public boolean Person.isSet()' (DAMethod2.java:17) is annotated with @Annot method annotation from 'DAMethod2' (DAMethod2.java:26)"/>
-  	 	<message kind="weave" text="public void Person.isNotReturningBoolean()' (DAMethod2.java:19) is annotated with @Annot method annotation from 'DAMethod2' (DAMethod2.java:26)"/>
-  	 	<message kind="weave" text="'public void Person.getin()' (DAMethod2.java:21) is annotated with @Annot method annotation from 'DAMethod2' (DAMethod2.java:28)"/>
-  	 </compile>
-  </ajc-test>
-  
-  <ajc-test dir="bugs169/pr287613" title="compound declare patterns - method - 1">
-  	 <compile files="DAMethod1.java" options="-1.5 -showWeaveInfo">
-  	 	<message kind="weave" text="'public java.lang.String Person.getString()' (DAMethod1.java:9) is annotated with @Annot method annotation from 'DAMethod1' (DAMethod1.java:15)"/>
-  	 	<message kind="weave" text="'public boolean Person.isSet()' (DAMethod1.java:10) is annotated with @Annot method annotation from 'DAMethod1' (DAMethod1.java:15)"/>
-  	 </compile>
-  </ajc-test>
-  
-  <ajc-test dir="bugs169/pr315820" title="multiple annos running - 1">
-  	 <compile files="MultiAnno2.java" options="-1.5"/>
-  	 <run class="MultiAnno2">
-  	 <stdout>
-  	 <line text="XXX"/>
-  	 </stdout>
-  	 </run>
-  </ajc-test>
-  
-  <ajc-test dir="bugs169/pr315820" title="multiple annos parsing">
-  	 <compile files="MultiAnno.java" options="-1.5"/>
-  </ajc-test>
-  
-  <ajc-test dir="bugs169/pr287613" title="compound declare patterns - fields - 2">
-  	 <compile files="Target.java" options="-1.5"/>
-  	 <run class="Target">
-  	 <stdout>
-  	 <line text="Field one"/>
-  	 <line text="@Annot1()"/>
-  	 <line text="@Annot1()"/>
-  	 <line text="Field two"/>
-  	 <line text="@Annot2()"/>
-  	 <line text="no annotations"/>
-  	 <line text="Field three"/>
-  	 <line text="@Annot3()"/>
-  	 <line text="@Annot3()"/>
-  	 </stdout></run>
-  </ajc-test>
-  
-  <ajc-test dir="bugs169/pr287613" title="compound declare patterns - fields - 1">
-  	 <compile files="DeclareAnnot.java" options="-1.5"/>
-  </ajc-test>
-  
-  <ajc-test dir="bugs169/pr287613" title="compound declare patterns - methodctor - 1">
-  	 <compile files="DeclareAnnotMethodCtor.java" options="-1.5"/>
-  </ajc-test>
-  
-  <ajc-test dir="bugs169/pr310506" title="optional aspects">
-     <compile files="Anno.java" outjar="anno.jar" options="-1.5"/>
-     <compile files="AspectA.java" classpath="anno.jar" outjar="aspect.jar" options="-Xlint:ignore -1.5"/>
-     <compile files="AspectB.java" outjar="aspect2.jar" options="-Xlint:ignore -1.5"/>
-     <compile files="Code.java" classpath="aspect.jar;aspect2.jar" options="-1.5"/>
-     <file deletefile="anno.jar"/>
-     <run class="Code" ltw="META-INF/aop.xml" classpath=".;aspect.jar;aspect2.jar">
-     <stderr>
-     <line text="AspectJ Weaver Version"/>
-     <line text="register classloader"/>
-     <line text="using configuration"/>
-     <line text="register aspect"/>
-     <line text="deactivating aspect"/>
-     <line text="register aspect"/>     
-     <line text="processing reweavable"/>
-     </stderr>
-     <stdout>
-     <line text="staticinitialization"/>
-     <line text="abcde"/>
-     </stdout>
-     </run>
-  </ajc-test>
-  
-  <ajc-test dir="bugs169/pr310506" title="optional aspects 2">
-     <compile files="Anno.java" outjar="anno.jar" options="-1.5"/>
-     <compile files="AspectA.java" classpath="anno.jar" outjar="aspect.jar" options="-Xlint:ignore -1.5"/>
-     <compile files="AspectB.java" outjar="aspect2.jar" options="-Xlint:ignore -1.5"/>
-     <compile files="Code.java Code2.java" classpath="anno.jar;aspect.jar;aspect2.jar" options="-1.5"/>
-     <run class="Code2" ltw="META-INF/aop.xml" classpath=".;aspect.jar;aspect2.jar">
-     <stderr>
-     <line text="AspectJ Weaver Version"/>
-     <line text="register classloader"/>
-     <line text="using configuration"/>
-     <line text="register aspect"/>
-     <line text="register aspect"/>     
-     <line text="processing reweavable"/>
-     <line text="processing reweavable"/>
-     </stderr>
-     <stdout>
-     <line text="staticinitialization"/>
-     <line text="A"/>
-     <line text="abcde"/>
-     </stdout>
-     </run>
-  </ajc-test>
-
-  <ajc-test dir="bugs169/pr315651" title="infinite loop">
-     <compile files="test/Profiling.aj test/Main.java" options="-1.5"/>
-     <run class="test.Main"/>
-  </ajc-test>
-
-  <ajc-test dir="bugs169/pr314965" title="anno typo">
-     <compile files="MinimalExample.java" options="-1.5">
-       <message kind="warning" text="no match for this type name: AnnotationWithParamAndTypo [Xlint:invalidAbsoluteTypeName]"/>
-     </compile>
-  </ajc-test>
-  
-  <ajc-test dir="bugs169/pr314840" title="validate branch recursion">
-     <compile files="Arguments.aj Test1.java Test2.java Test.java" options="-1.5"/>
-  </ajc-test>
-  
-  <ajc-test dir="bugs169/pr313026/one" title="clashing declare annos">
-     <compile files="Target.java Asp.java Bsp.java Wibble.java Precedence1.java" options="-1.5 -Xlint:ignore"/>
-     <run class="Target">
-       <stdout>
-         <line text="@Wibble(value=abc)"/>
-       </stdout>
-     </run>
-  </ajc-test>
-  
-  <ajc-test dir="bugs169/pr312839/one" title="class file size - 1">
-     <compile files="Class.java X.aj" options="-1.5"/>
-     <run class="com.wibble.foo.Class">
-       <stdout>
-         <line text="Hello Andy"/>
-       </stdout>
-     </run>
-  </ajc-test>
-  
-  <ajc-test dir="bugs169/pr122460/one" title="scoping ltw - 3">
-     <compile files="A.java" options="-1.5 -Xlint:ignore" outjar="aspects.jar"/>
-     <compile files="Code.java Runner.java"/>
-     <run class="code.Code" ltw="aop_none.xml" classpath="aspects.jar">
-     <stdout>
-     <line text="running"/>
-     </stdout>
-     </run>
-  </ajc-test>
-  
-  <ajc-test dir="bugs169/pr122460/one" title="scoping ltw - 1">
-     <compile files="A.java" options="-1.5 -Xlint:ignore" outjar="aspects.jar"/>
-     <compile files="Code.java Runner.java"/>
-     <run class="code.Code" ltw="aop.xml" classpath="aspects.jar">
-     <stdout>
-     <line text="intercepted class code.Code"/>
-     <line text="intercepted class runner.Runner"/>
-     <line text="running"/>
-     </stdout>
-     </run>
-  </ajc-test>
-  
-  <ajc-test dir="bugs169/pr122460/one" title="scoping ltw - 2">
-     <compile files="A.java" options="-1.5 -Xlint:ignore" outjar="aspects.jar"/>
-     <compile files="Code.java Runner.java"/>
-     <run class="code.Code" ltw="aop_codeonly.xml" classpath="aspects.jar">
-     <stdout>
-     <line text="intercepted class code.Code"/>
-     <line text="running"/>
-     </stdout>
-     </run>
-  </ajc-test>
-  
-   <ajc-test dir="bugs169/pr307009" title="declare soft and call - 1">
-   	<compile files="Test.java Test2.java Ann.java Bug.aj" options="-1.5 -showWeaveInfo">
-   		<message kind="weave" text="Softening exceptions in type 'Test' (Test.java:4) as defined by aspect 'Bug' (Bug.aj:3)"/>
-   	</compile>
-   </ajc-test>
-
-   <ajc-test dir="bugs169/pr307009" title="declare soft and call - 2">
-   	<compile files="Test2.java Test.java Ann.java Bug.aj" options="-1.5 -showWeaveInfo">
-   		<message kind="weave" text="Softening exceptions in type 'Test' (Test.java:4) as defined by aspect 'Bug' (Bug.aj:3)"/>
-   	</compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs169/pr310043" title="rogue error">
-   	<compile files="B.java" classpath="code.jar" aspectpath="code.jar"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs169/pr309743" title="itd marker annotations - 1">
-     <compile files="A.java" options="-1.5"/>
-     <run class="A">
-       <stdout>
-         <line text="foo"/>
-       </stdout>
-     </run>
-  </ajc-test>
-  
-   <ajc-test dir="bugs169/pr309743" title="itd marker annotations - 2">
-     <compile files="B.java" options="-1.5"/>
-     <run class="B">
-       <stdout>
-         <line text="boo"/>
-       </stdout>
-     </run>
-  </ajc-test>
-  
-   <ajc-test dir="bugs169/pr309336" title="pipelining and generics">
-     <compile files="NoSystemStreams.aj UseOperators.java Operators.java" options="-1.5">
-       <message kind="warning" text="No system.out"/>
-     </compile>
-  </ajc-test>
-  
-   <ajc-test dir="bugs169/pr308773" title="subtle generics problem">
-     <compile files="Aspy.aj Zzz.java Top.java Middle.java" options="-1.5"/>
-  </ajc-test>
-  
-   <ajc-test dir="bugs169/pr307147" title="advising privileged access method">
-     <compile files="B.java Test2.java" options="-showWeaveInfo">
-       <message kind="weave" text="Type 'B' (B.java) has intertyped method from 'Test'"/>
-       <message kind="weave" text="Join point 'field-get(int A.goo)' in Type 'Test'"/>
-     </compile>
-  </ajc-test>
-  
-   <ajc-test dir="bugs169/pr307120" title="advising privileged access member">
-     <compile files="A.java Test.java" options="-showWeaveInfo">
-       <message kind="weave" text="Type 'A' (A.java) has intertyped method from 'Test'"/> <!-- getFoo and getGoo -->
-       <message kind="weave" text="Join point 'field-get(int A.goo)' in Type 'Test'"/>
-       <message kind="weave" text="Join point 'field-get(int A.foo)' in Type 'Test'"/>
-     </compile>
-  </ajc-test>
-  
-   <ajc-test dir="bugs169/pr309440" title="crash param annos">
-     <compile files="foobar/ExportMode.java" classpath="jsr305.jar" options="-1.6"/>
-     <compile files="foobar/CrashAspectJCompiler.java" classpath="jsr305.jar" options="-1.6"/>
-  </ajc-test>
-  
-   <ajc-test dir="bugs169/pr307120" title="advising privileged access member - 2">
-     <compile files="Test.java A.java" options="-showWeaveInfo">
-       <message kind="weave" text="Type 'A' (A.java) has intertyped method from 'Test'"/> <!-- getFoo and getGoo -->
-       <message kind="weave" text="Join point 'field-get(int A.goo)' in Type 'Test'"/>
-       <message kind="weave" text="Join point 'field-get(int A.foo)' in Type 'Test'"/>
-     </compile>
-  </ajc-test>
-  
-   <ajc-test dir="bugs169/pr292262" title="if with statically recognizable code">
-     <compile files="A.java">
-       <message kind="weave" text="Join point 'staticinitialization(void SimpleClass.&lt;clinit&gt;())' in Type 'SimpleClass'"/>
-     </compile>
-  </ajc-test>
-  
-   <ajc-test dir="bugs169/pr44365" title="type category type patterns - class">
-     <compile files="SimpleClass.java" options="-1.5 -showWeaveInfo">
-       <message kind="weave" text="Join point 'staticinitialization(void SimpleClass.&lt;clinit&gt;())' in Type 'SimpleClass'"/>
-       <message kind="weave" text="Join point 'staticinitialization(void Bar.&lt;clinit&gt;())' in Type 'Bar'"/>
-     </compile>
-  </ajc-test>
-  
-   <ajc-test dir="bugs169/pr44365" title="type category type patterns - interface">
-     <compile files="SimpleInterface.java" options="-1.5 -showWeaveInfo">
-       <message kind="weave" text="Join point 'staticinitialization(void Foo.&lt;clinit&gt;())' in Type 'Foo'"/>
-     </compile>
-  </ajc-test>
-  
-   <ajc-test dir="bugs169/pr44365" title="type category type patterns - enum">
-     <compile files="SimpleEnum.java" options="-1.5 -showWeaveInfo">
-       <message kind="weave" text="Join point 'staticinitialization(void Foo.&lt;clinit&gt;())' in Type 'Foo'"/>
-     </compile>
-  </ajc-test>
-   
-   <ajc-test dir="bugs169/pr44365" title="type category type patterns - annotation">
-     <compile files="SimpleAnnotation.java" options="-1.5 -showWeaveInfo">
-       <message kind="weave" text="Join point 'staticinitialization(void WibbleAnno.&lt;clinit&gt;())' in Type 'WibbleAnno'"/>
-     </compile>
-  </ajc-test>
-  
-  <ajc-test dir="bugs169/pr44365" title="type category type patterns - anonymous">
-     <compile files="SimpleAnonymous.java" options="-1.5 -showWeaveInfo">
-       <message kind="weave" text="Join point 'staticinitialization(void Bar$1.&lt;clinit&gt;())' in Type 'Bar$1'"/>
-     </compile>
-  </ajc-test>
-  
-   <ajc-test dir="bugs169/pr44365" title="type category type patterns - inner">
-     <compile files="SimpleInner.java" options="-1.5 -showWeaveInfo">
-       <message kind="weave" text="Join point 'staticinitialization(void Bar$Inner.&lt;clinit&gt;())' in Type 'Bar$Inner'"/>
-       <message kind="weave" text="Join point 'staticinitialization(void Bar$1.&lt;clinit&gt;())' in Type 'Bar$1'"/>
-     </compile>
-  </ajc-test>
-  
-   <ajc-test dir="bugs169/pr44365" title="type category type patterns - inner - 2">
-     <compile files="SimpleInner2.java" options="-1.5 -showWeaveInfo">
-       <message kind="weave" text="Join point 'staticinitialization(void Bar$Inner.&lt;clinit&gt;())' in Type 'Bar$Inner'"/>
-     </compile>
-  </ajc-test>
-  
-   <ajc-test dir="bugs169/pr44365" title="type category type patterns - inner - 3">
-     <compile files="SimpleInner3.java" options="-1.5 -showWeaveInfo">
-       <message kind="weave" text="Join point 'method-execution(void Bar$Inner.foo())' in Type 'Bar$Inner' (SimpleInner3.java:12) advised"/>
-     </compile>
-  </ajc-test>
-   
-   <ajc-test dir="bugs169/pr44365" title="type category type patterns - aspect">
-     <compile files="SimpleAspect.java" options="-1.5 -showWeaveInfo">
-       <message kind="weave" text="Join point 'staticinitialization(void X.&lt;clinit&gt;())' in Type 'X'"/>
-     </compile>
-  </ajc-test>
-  
-   <ajc-test dir="bugs169/pr44365" title="type category type patterns - e1">
-     <compile files="Errors1.java" options="-1.5 -showWeaveInfo">
-       <message kind="error" text="Syntax error on token &quot;(&quot;, &quot;)"/>
-     </compile>
-  </ajc-test>
-  
-   <ajc-test dir="bugs169/pr44365" title="type category type patterns - e2">
-     <compile files="Errors5.java" options="-1.5 -showWeaveInfo">
-       <message kind="error" text="Syntax error on token &quot;)&quot;, &quot;(&quot; expected"/>
-     </compile>
-  </ajc-test>
-  
-   <ajc-test dir="bugs169/pr44365" title="type category type patterns - e3">
-     <compile files="Errors2.java" options="-1.5 -showWeaveInfo">
-       <message kind="weave" text="Join point 'method-execution(void Errors2.is(java.lang.String))' in Type"/>
-     </compile>
-  </ajc-test>
-
-   <ajc-test dir="bugs169/pr48080" title="inserts in messages">
-     <compile files="Warnings.java" options="-1.5">
-       <message kind="warning" text="UNKNOWN_KEY{}foobar"/>
-       <message kind="warning" text="{}wibble"/>
-       <message kind="warning" text="signature name for method is m"/>
-       <message kind="warning" text="joinpoint declaring type is p.A"/>
-       <message kind="warning" text="joinpoint signature is void p.A.m()"/>
-       <message kind="warning" text="joinpoint line is '23'"/>
-       <message kind="warning" text="joinpoint kind is method-execution"/>
-       <message kind="warning" text="joinpoint kind is 'method-execution'"/>
-       <message kind="warning" text="joinpoint is method-execution(void p.A.m())"/>
-       <message kind="warning" text="joinpoint location is"/>
-       <message kind="warning" text="signature name for field is i"/>
-       <message kind="warning" text="joinpoint signature is int p.A.i"/>
-       <message kind="warning" text="aspect is p.Checker"/>
-       <message kind="warning" text="advice sourcelocation is"/>
-       <message kind="warning" text="test 18{}23"/>
-     </compile>
-  </ajc-test>
-  
-   <ajc-test dir="bugs169/pr299062" title="verifyerror on atAj">
-     <compile files="Test.java Work.java SmartAspect.java Idempotent.java" options="-1.5"/>
-     <run class="Test">
-     </run>
-  </ajc-test>
-  
-   <ajc-test dir="bugs169/pr298665" title="ambiguous method">
-     <compile files="Main.java" options="-1.5"/>
-     <run class="Main">
-     </run>
-  </ajc-test>
-  
-   <ajc-test dir="bugs169/pr298388" title="declare mixin and generics">
-     <compile files="PR298388.java" options="-1.5"/>
-     <run class="PR298388">
-       <stdout>
-         <line text="done"/>
-       </stdout>
-     </run>
-  </ajc-test>
-  
-   <ajc-test dir="bugs169/pr295491" title="model annotation npe">
-     <compile files="SpringConfigurableMixin.java" options="-1.5 -emacssym"/>
-  </ajc-test>
-  
-   <ajc-test dir="bugs169/pr292584" title="annotation around advice verifyerror">
-     <compile files="AbstractAspect.java,ClassWithJoinPoint.java,ConcreteAspect.java" options="-1.5"/>
-     <run class="ClassWithJoinPoint">
-       <stdout>
-         <line text="Testing annotation style (should print &quot;true&quot;):"/>
-         <line text="true"/>
-       </stdout>
-     </run>
-  </ajc-test>
-  
-  <!-- declare type warning -->
-  
-  <ajc-test dir="bugs169/pr291206" title="declare type warning - 1">
-     <compile files="One.java" options="-1.5">
-       <message kind="warning" line="8" text="Nothing should be"/>
-     </compile>
-  </ajc-test>
-  
-  <ajc-test dir="bugs169/pr291206" title="declare type warning - 2">
-     <compile files="Two.java" options="-1.5">
-       <message kind="warning" line="7" text="Missing foo()"/>
-       <message kind="warning" line="13" text="Missing foo()"/>
-     </compile>
-  </ajc-test>
-  
-  <!-- testing build of model with one of these in -->
-  <ajc-test dir="bugs169/pr291206" title="declare type warning - 3">
-     <compile files="Two.java" options="-1.5 -emacssym">
-       <message kind="warning" line="7" text="Missing foo()"/>
-       <message kind="warning" line="13" text="Missing foo()"/>
-     </compile>
-  </ajc-test>
-  
-  <ajc-test dir="bugs169/pr291206" title="declare type error - 1">
-     <compile files="Three.java" options="-1.5">
-       <message kind="error" line="7" text="Missing foo()"/>
-       <message kind="error" line="13" text="Missing foo()"/>
-     </compile>
-  </ajc-test>
-  
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc169/intertype.xml b/tests/src/test/java/org/aspectj/systemtest/ajc169/intertype.xml
deleted file mode 100644
index 75846b05c..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc169/intertype.xml
+++ /dev/null
@@ -1,249 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-   
-    <ajc-test dir="features169/itdInnerTypes/separate" title="separate compilation">
-     <compile files="Basic.java" options="-1.5"/>
-     <compile files="Basic2.java"/>
-     <run class="Basic2">
-       <stdout>
-       <line text="done"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-    <ajc-test dir="features169/itdInnerTypes/separate2" title="separate compilation - 2">
-     <compile files="Basic.java" options="-1.5"/>
-     <compile files="Basic2.java"/>
-     <run class="Basic2">
-       <stdout>
-       <line text="done"/>
-       </stdout>
-     </run>
-   </ajc-test>
-
-   <ajc-test dir="features169/itdInnerTypes/eleven" title="already has it">
-     <compile files="Target.java Aspect1.java" options="-1.5">
-     <message kind="error" text="Duplicate nested type Inner"/>
-     <message kind="error" text="target type already declares a "/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="features169/itdInnerTypes" title="construction4">
-     <compile files="Construction4.java" options="-1.5"/>
-     <run class="Construction4">
-       <stdout>
-       <line text="abc"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="features169/itdInnerTypes" title="construction3">
-     <compile files="Construction3.java" options="-1.5"/>
-     <run class="Construction3">
-       <stdout>
-       <line text="abc"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="features169/itdInnerTypes/ten" title="construction2">
-     <compile files="Construction.java Aspect1.java Aspect2.java" options="-1.5"/>
-     <run class="Construction">
-       <stdout>
-       <line text="abcde"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="features169/itdInnerTypes" title="construction">
-     <compile files="Construction.java" options="-1.5"/>
-     <run class="Construction">
-       <stdout>
-       <line text="done"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="features169/itdInnerTypes/nine" title="vote - itd mixture 2">
-     <compile files="Underscorer.aj Vote.java Runner.java RelatedType.java" options="-1.5"/>
-     <run class="a.b.c.Runner">
-       <stdout>
-       <line text="wibble"/>
-       <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_$choice)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9+"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="features169/itdInnerTypes/eight" title="vote - itd mixture">
-     <compile files="Underscorer.aj Vote.java Runner.java RelatedType.java" options="-1.5"/>
-     <run class="a.b.c.Runner">
-       <stdout>
-       <line text="wibble"/>
-       <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_$choice)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9+"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="features169/itdInnerTypes/seven" title="vote - method reference">
-     <compile files="Underscorer.aj Vote.java Runner.java RelatedType.java" options="-1.5"/>
-     <run class="a.b.c.Runner">
-       <stdout>
-       <line text="wibble"/>
-       <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_$choice)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9+"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="features169/itdInnerTypes/six" title="vote - field reference">
-     <compile files="Vote.java Vote_Amender.aj Runner.java RelatedType.java" options="-1.5"/>
-     <run class="a.b.c.Runner">
-       <stdout>
-       <line text="wibble"/>
-       <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_$choice)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9+"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="features169/itdInnerTypes/five" title="vote - inner inner">
-     <compile files="Vote.java Vote_Amender.aj Runner.java RelatedType.java" options="-1.5"/>
-     <run class="a.b.c.Runner">
-       <stdout>
-       <line text="wibble"/>
-       <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_$choice)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9+"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="features169/itdInnerTypes/four" title="vote - reference via annotation - two">
-     <compile files="Vote.java Vote_Amender.aj Runner.java RelatedType.java" options="-1.5"/>
-     <run class="a.b.c.Runner">
-       <stdout>
-       <line text="wibble"/>
-       <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_$choice)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9+"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="features169/itdInnerTypes/three" title="vote - reference via annotation">
-     <compile files="Vote.java Vote_Amender.aj Runner.java RelatedType.java" options="-1.5"/>
-     <run class="a.b.c.Runner">
-       <stdout>
-       <line text="wibble"/>
-       <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_.class)" vm="9+"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="features169/itdInnerTypes/two" title="vote - construction">
-     <compile files="Vote.java Vote_Amender.aj Runner.java" options="-1.5"/>
-     <run class="a.b.c.Runner">
-       <stdout>
-       <line text="wibble"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="features169/itdInnerTypes/one" title="vote - basic">
-     <compile files="Vote.java Vote_Amender.aj Runner.java" options="-1.5"/>
-     <run class="a.b.c.Runner"/>
-   </ajc-test>
-   
-   <ajc-test dir="features169/itdInnerTypes" title="choice - generics 1">
-     <compile files="ChoiceGenerics1.java" options="-1.5"/>
-   </ajc-test>
-
-   <ajc-test dir="features169/itdInnerTypes" title="choice - generics 2">
-     <compile files="ChoiceGenerics2.java" options="-1.5">
-       <message kind="error" text="Type mismatch: cannot convert from String to Integer"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="features169/itdInnerTypes" title="choice">
-     <compile files="Choice.java" options="-1.5"/>
-     <run class="Choice">
-       <stdout>
-       <line text="null"/>
-       </stdout></run>
-   </ajc-test>
-   
-   <ajc-test dir="features169/itdInnerTypes" title="choice - weaveinfo">
-     <compile files="Choice.java" options="-1.5 -showWeaveInfo">
-       <message kind="weave" text="Type 'Choice' (Choice.java) has intertyped member class from 'X' (Choice.java)"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="features169/itdInnerTypes" title="choice - model">
-     <compile files="Choice.java" options="-1.5 -emacssym"/>
-   </ajc-test>
-   
-   <ajc-test dir="features169/itdInnerTypes" title="choice2">
-     <compile files="Choice2.java" options="-1.5"/>
-     <run class="Choice2">
-       <stdout>
-       <line text="null"/>
-       </stdout></run>
-   </ajc-test>
-   
-   <ajc-test dir="features169/itdInnerTypes" title="field access">
-     <compile files="FieldAccess.java" options="-1.5"/>
-     <run class="FieldAccess">
-       <stdout>
-       <line text="42"/>
-       </stdout></run>
-   </ajc-test>
-   
-   <ajc-test dir="features169/itdInnerTypes" title="method access">
-     <compile files="MethodCall.java" options="-1.5"/>
-     <run class="MethodCall">
-       <stdout>
-       <line text="42"/>
-       </stdout></run>
-   </ajc-test>
-   
-   <ajc-test dir="features169/itdInnerTypes" title="only static">
-     <compile files="OnlyStatic.java" options="-1.5">
-     	<message kind="error" line="5" text="Intertype declared member types can only be static (compiler limitation)"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="features169/itdInnerTypes" title="on interface">
-     <compile files="OnInterface.java" options="-1.5">
-     	<message kind="error" line="5" text="Cannot declare new member type on 'OnInterface'. New member types can only be specified on classes (compiler limitation)"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="features169/itdInnerTypes" title="on enum">
-     <compile files="OnEnum.java" options="-1.5">
-     	<message kind="error" line="6" text="Cannot declare new member type on 'EEE'. New member types can only be specified on classes (compiler limitation)"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="features169/itdInnerTypes" title="on annotation">
-     <compile files="OnAnnotation.java" options="-1.5">
-     	<message kind="error" line="8" text="Cannot declare new member type on 'Anno'. New member types can only be specified on classes (compiler limitation)"/>
-     </compile>
-   </ajc-test>
-   
-   <!-- 
-   <ajc-test dir="features169/itdInnerTypes" title="simplest 3">
-     <compile files="Simplest3.java" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="features169/itdInnerTypes" title="simplest 2">
-     <compile files="Simplest2.java" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="features169/itdInnerTypes" title="simplest">
-     <compile files="Simplest.java" options="-1.5"/>
-   </ajc-test>
-   -->
-   
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc169/transparentweaving.xml b/tests/src/test/java/org/aspectj/systemtest/ajc169/transparentweaving.xml
deleted file mode 100644
index 4eb5f6d37..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc169/transparentweaving.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-   
-   <ajc-test dir="features169/transparent" title="one - private">
-     <compile files="OnePrivate.java" options="-1.5"/>
-   </ajc-test>
-
-   <ajc-test dir="features169/transparent" title="one - default">
-     <compile files="OneDefault.java" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="features169/transparent" title="one - private - annotated">
-     <compile files="OnePrivateAnnotated.java" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="features169/transparent" title="one - default - annotated">
-     <compile files="OneDefaultAnnotated.java" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="features169/transparent" title="one - private - accessors">
-     <compile files="OnePrivateAccessors.java" options="-1.5"/>
-     <run class="OnePrivateAccessors"/>
-   </ajc-test>
-   
-   <ajc-test dir="features169/transparent" title="interacting old and new">
-     <compile files="InteractingOldAndNew.java" options="-1.5"/>
-     <run class="InteractingOldAndNew"/>
-   </ajc-test>
-   
-   <ajc-test dir="features169/transparent" title="one - private - initializer">
-     <compile files="OnePrivateInitializer.java" options="-1.5"/>
-     <run class="OnePrivateInitializer"/>
-   </ajc-test>
-   
-   <ajc-test dir="features169/transparent" title="two">
-     <compile files="Two.java" options="-1.5">
-       <message kind="error" text="inter-type declaration from X conflicts with existing member: int Two.x"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="features169/transparent" title="two itds on target">
-     <compile files="TwoItdsOnTarget.java" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="features169/transparent" title="two itds on target that already has it">
-     <compile files="TwoItdsOnTargetHasAlready.java" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="features169/transparent" title="declare at on private itd">
-     <compile files="OneDeclareAt.java" options="-1.5 -makeAjReflectable"/>
-   </ajc-test>
-   
-   <ajc-test dir="features169/transparent" title="declare at two">
-     <compile files="DeclareAtTwo.java" options="-1.5 -makeAjReflectable"/>
-   </ajc-test>
-   
-   <ajc-test dir="features169/transparent" title="three">
-     <compile files="Three.java" options="-1.5"/>
-   </ajc-test>
-   
-   <ajc-test dir="features169/transparent" title="generics - private">
-     <compile files="Generics.java" options="-1.5"/>
-     <run class="Generics"/>
-   </ajc-test>
-   
-
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc170/Ajc170Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc170/Ajc170Tests.java
index 1f1017328..e0f9acab4 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc170/Ajc170Tests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc170/Ajc170Tests.java
@@ -303,7 +303,7 @@ public class Ajc170Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 
 	@Override
 	protected File getSpecFile() {
-		return new File("../tests/src/org/aspectj/systemtest/ajc170/ajc170.xml");
+        return getClassResource("ajc170.xml");
 	}
 
 }
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc170/ajc170.xml b/tests/src/test/java/org/aspectj/systemtest/ajc170/ajc170.xml
deleted file mode 100644
index e379d6cab..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc170/ajc170.xml
+++ /dev/null
@@ -1,398 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-
-	<ajc-test dir="bugs170/pr382723" title="generic aspect">
-		<compile files="FooAspect.java" options="-1.5"/>
-	</ajc-test>
-	
-	<ajc-test dir="bugs170/pr382723" title="generic aspect 2">
-		<compile files="FooAspect2.java" options="-1.5"/>
-	</ajc-test>
-	
-	<ajc-test dir="bugs170/pr382723" title="generic aspect 3">
-		<compile files="FooAspect3.java" options="-1.5"/>
-	</ajc-test>
-	
-	<ajc-test dir="bugs170/pr382723" title="generic aspect 4">
-		<compile files="Foo.java" options="-1.5 -showWeaveInfo">
-			<message kind="weave" text="Join point 'constructor-call(void java.util.LinkedList.&lt;init&gt;())' in Type 'Foo' (Foo.java:41) advised by around advice from 'Bar' (Foo.java:14)"/>
-		</compile>
-		<run class="Foo">
-			<stdout>
-				<line text="superaspect getNumber returns -2"/>
-				<line text="Bar.method() running"/>
-				<line text="abstract method returns []"/>
-			</stdout>
-		</run>
-	</ajc-test>
-	
-	
-	<!-- no declare parents, only ITD -->
-	<ajc-test dir="bugs170/pr382189/one" title="covariant generics 1">
-		<compile files="A.java A_ITD.aj B.java SuperA.java SuperB.java" options="-1.5"/>
-	</ajc-test>
-	
-	<!-- now declare parents and ITD -->
-	<ajc-test dir="bugs170/pr382189/two" title="covariant generics 2">
-		<compile files="A.java A_ITD.aj B.java SuperA.java SuperB.java" options="-1.5"/>
-	</ajc-test>
-	
-	<!-- now run it -->
-	<ajc-test dir="bugs170/pr382189/three" title="covariant generics 3">
-		<compile files="A.java A_ITD.aj B.java SuperA.java SuperB.java" options="-1.5"/>
-		<run class="A"/>
-	</ajc-test>
-	
-	<ajc-test dir="bugs170/pr382435/one" title="covariant generic itds 1">
-		<compile files="bug/A.java" options="-1.5"/>
-	</ajc-test>
-	
-	<ajc-test dir="bugs170/pr382435/two" title="covariant generic itds 2">
-		<compile files="bug/A.java" options="-1.5"/>
-		<run class="bug.A"/>
-	</ajc-test>
-	
-	<ajc-test dir="bugs170/pr382189" title="covariant generics">
-	<compile files="covbug/A.java covbug/A_ITD.aj covbug/B.java covbug/SuperA.java covbug/SuperB.java" options="-1.5"/>
-	<!-- <run class="Foo">
-	<stdout>
-	<line text="@Anno()"/></stdout>
-	</run> -->
-	</ajc-test>
-	
-	<ajc-test dir="bugs170/pr377130" title="missing annos on priv aspects">
-	<compile files="Foo.java" options="-1.5"/>
-	<run class="Foo">
-	<stdout>
-	<line text="@Anno()"/></stdout>
-	</run>
-	</ajc-test>
-	
-	<ajc-test dir="bugs170/pr377130" title="missing annos on priv aspects - 2">
-	<compile files="Foo2.java" options="-1.5"/>
-	<run class="Foo2">
-	<stdout>
-	<line text="@Anno()"/></stdout>
-	</run>
-	</ajc-test>
-
- 	<ajc-test dir="bugs170/pr376351" title="attribute issue with J7">
-     <compile files="R.java R1.java" outjar="code.jar" options="-1.5"/>
-     <compile files="RAj.java" options="-1.7 -Xlint:ignore" outjar="aspects.jar" classpath="code.jar"/>
-     <compile inpath="code.jar" aspectpath="aspects.jar" options="-showWeaveInfo">
-     <message kind="weave" text="Join point 'constructor-call(void R.&lt;init&gt;())'"/>
-     </compile>
-     <!-- 
-     if we had a 1.7 vm we could use this:
-     <compile files="RAj.java" options="-1.7 -Xlint:ignore"/>
-     <run class="R" ltw="aop.xml">
-     <stderr>
-     <line text="org.aspectj.weaver.tools.Jdk14Trace error"/>
-     <line text="Unsupported major.minor version 51.0"/>
-     <line text="java.lang.UnsupportedClassVersionError: RAj :"/>
-     </stderr>
-     </run>
-     -->
-   </ajc-test>
-
- 	<ajc-test dir="bugs170/pr376139" title="switch on enum">
-     <compile files="Code.java" options="-1.5"/>
-     <run class="Code"/>
-   </ajc-test>
-
- 	<ajc-test dir="bugs170/ltw" title="dec at field ordering 1">
-     <compile files="Anno.java TriggerAll.java MyObject.java Main.java" options="-1.5"/>
-     <run class="ch.tests.Main">
-       <stdout>
-           <line text="Triggered"/>
-           <line text="Triggered"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
- 	<ajc-test dir="bugs170/ltw" title="dec at field ordering 2">
-     <compile files="Anno.java Main.java TriggerAll.java  MyObject.java" options="-1.5"/>
-     <run class="ch.tests.Main">
-       <stdout>
-           <line text="Triggered"/>
-           <line text="Triggered"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs170/ltw" title="dec at field ordering ltw 1">
-     <compile files="Anno.java Main.java MyObject.java" options="-1.5"/>
-     <compile files="TriggerAll.java" options="-Xlint:ignore -1.5 "/>
-     <run class="ch.tests.Main" ltw="aop.xml">
-       <stdout>
-           <line text="Triggered"/>
-           <line text="Triggered"/>
-       </stdout>
-     </run>
-   </ajc-test>
-
- 	<ajc-test dir="bugs170/xmldefs" title="xml defined dec at method">
-     <compile files="Hello.java Anno.java" options="-1.5"/>
-     <run class="Hello" ltw="aop.xml">
-       <stdout>
-           <line text="Hello"/>
-           <line text="World"/>
-           <line text="Annotations on sayHello? true"/>
-           <line text="Annotation count is 1"/>
-           <line text="@Anno"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
- 	<ajc-test dir="bugs170/xmldefs" title="xml defined dec at method 2">
-     <compile files="Hello.java Anno2.java" options="-1.5"/>
-     <run class="Hello" ltw="aop2.xml">
-       <stdout>
-           <line text="Hello"/>
-           <line text="World"/>
-           <line text="Annotations on sayHello? false"/>
-       </stdout>
-       <stderr>
-       	<line text="info AspectJ Weaver"/>
-       	<line text="info register"/>
-       	<line text="info using configuration"/>
-       	<line text="info define aspect ConjuredUp"/>
-       	<line text="error declare is using an annotation type that does not have runtime retention: @Anno2"/>
-       	<line text="info weaver"/>
-       </stderr>
-     </run>
-   </ajc-test>
-   
- 	<ajc-test dir="bugs170/xmldefs" title="xml defined dec at field">
-     <compile files="Hello2.java Anno.java" options="-1.5"/>
-     <run class="Hello2" ltw="aop3.xml">
-       <stdout>
-           <line text="Annotations on i? true"/>
-           <line text="Annotation count is 1"/>
-           <line text="@Anno"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs170/xmldefs" title="xml defined dec anno - variants 1">
-     <compile files="Hello4.java Anno4.java" options="-1.5"/>
-     <run class="Hello4" ltw="aop4.xml">
-       <stdout>
-           <line text="Annotations on field1? true"/>
-           <line text="Annotation count is 4"/>
-           <line text="@AnnoBoolean(value=true, zzz=false)"/>
-           <line text="@AnnoClass(value=class java.lang.Integer, ccc=class java.lang.String)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-           <line text="@AnnoClass(value=java.lang.Integer.class, ccc=java.lang.String.class)" vm="9+"/>
-           <line text="@AnnoLong(value=999, jjj=111)"/>
-           <line text="@AnnoString(value=set from xml, sss=xyz)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-           <line text="@AnnoString(value=&quot;set from xml&quot;, sss=&quot;xyz&quot;)" vm="9+"/>
-           <line text="Annotations on field2? true"/>
-           <line text="Annotation count is 1"/>
-           <line text="@AnnoClass(value=class java.lang.String, ccc=class java.lang.String)"  vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-           <line text="@AnnoClass(value=java.lang.String.class, ccc=java.lang.String.class)" vm="9+"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs170/xmldefs" title="xml defined dec anno - variants 2">
-     <compile files="Hello5.java Anno5.java" options="-1.5"/>
-     <run class="Hello5" ltw="aop5.xml">
-       <stdout>
-           <line text="Annotations on field1? true"/>
-           <line text="Annotation count is 4"/>
-           <line text="@AnnoChar(value=z, ccc=a)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-           <line text="@AnnoChar(value='z', ccc='a')" vm="9+"/>
-           <line text="@AnnoDouble(value=99.0, ddd=3.0)"/>
-           <line text="@AnnoFloat(value=6.0, fff=4.0)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-           <line text="@AnnoFloat(value=6.0f, fff=4.0f)" vm="9+"/>
-           <line text="@AnnoShort(value=8, sss=3)"/>
-           <line text="Annotations on field2? true"/>
-           <line text="Annotation count is 2"/>
-           <line text="@AnnoByte(value=88, bbb=66)"/>
-           <line text="@AnnoInt(iii=111, value=99)"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs170/xmldefs" title="xml defined dec anno - multiple values">
-     <compile files="Hello6.java Anno6.java" options="-1.5"/>
-     <run class="Hello6" ltw="aop6.xml">
-       <stdout>
-           <line text="Annotations on field1? true"/>
-           <line text="Annotation count is 1"/>
-           <line text="@Annot(a=a, fred=false, value=abc)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-           <line text="@Annot(a='a', fred=false, value=&quot;abc&quot;)" vm="9+"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs170/xmldefs" title="xml defined dec anno - multiple values and spaces">
-     <compile files="Hello6.java Anno6.java" options="-1.5"/>
-     <run class="Hello6" ltw="aop6a.xml">
-       <stdout>
-           <line text="Annotations on field1? true"/>
-           <line text="Annotation count is 1"/>
-           <line text="@Annot(a=a, fred=false, value=abc)" vm="1.4,1.5,1.6,1.7,1.8"/>
-           <line text="@Annot(a='a', fred=false, value=&quot;abc&quot;)" vm="9+"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs170/xmldefs" title="xml defined dec anno - type">
-     <compile files="Hello7.java Anno7.java" options="-1.5"/>
-     <run class="Hello7" ltw="aop7.xml">
-       <stdout>
-           <line text="Annotations on Hello7? true"/>
-           <line text="Annotation count is 1"/>
-           <line text="@Anno"/>
-       </stdout>
-     </run>
-   </ajc-test>
-
-   <ajc-test dir="bugs170/pr371998" title="BCException anno decp">
-     <compile files="AspectTest.java" options="-1.5 -showWeaveInfo">
-   	   <message kind="weave" text="Extending interface set for type 'Foo' (AspectTest.java) to include 'X' (AspectTest.java)"/>
-   	   <message kind="weave" text="Type 'Foo' (AspectTest.java) has intertyped method from 'AspectTest' (AspectTest.java:'void X.xxx()')"/>
-   	   <message kind="weave" text="Extending interface set for type 'Bar' (AspectTest.java) to include 'X' (AspectTest.java)"/>
-   	   <message kind="weave" text="Type 'Bar' (AspectTest.java) has intertyped method from 'AspectTest' (AspectTest.java:'void X.xxx()')"/>
-   	 </compile>
-   	 <run class="AspectTest"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs170/transientTjpFields" title="transient tjp fields">
-      <compile files="Code.java" options="-Xset:makeTjpFieldsTransient=true">
-      </compile>
-   </ajc-test>
-
-   <ajc-test dir="bugs170/language" title="perthis">
-   	<compile files="PerThis.java" options="-1.7">
-   	</compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs170/language" title="pertarget">
-   	<compile files="PerTarget.java" options="-1.7">
-   	</compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs170/language" title="percflow">
-   	<compile files="PerCflow.java" options="-1.7">
-   	</compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs170/language" title="pertypewithin">
-   	<compile files="PerTypeWithin.java" options="-1.7">
-   	</compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs170/language" title="diamond 1">
-   	<compile files="Diamond.java" options="-1.5">
-   		<message kind="error" line="11" text="'&lt;&gt;' operator is not allowed for source level below 1.7"/>
-   	</compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs170/language" title="diamond 2">
-   	<compile files="Diamond.java" options="-1.7">
-   	</compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs170/language" title="diamond itd 1">
-   	<compile files="DiamondITD.java" options="-1.7">
-   	</compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs170/language" title="literals 1">
-   	<compile files="Literals.java" options="-1.5">
-   		<message kind="error" line="8" text="Underscores can only be used with source level 1.7 or greater"/>
-   	</compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs170/language" title="literals 2">
-   	<compile files="Literals.java" options="-1.7">
-   	</compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs170/language" title="literals itd 1">
-   	<compile files="LiteralsITD.java" options="-1.7">
-   	</compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs170/language" title="string switch 1">
-   	<compile files="StringSwitch.java" options="-1.5">
-   	<message kind="error" line="9" text="Cannot switch on a value of type String for source level below 1.7. Only convertible int values or enum variables are permitted"/>
-   	</compile>
-   </ajc-test>
-
-   <ajc-test dir="bugs170/language" title="string switch 2">
-   	<compile files="StringSwitch.java" options="-1.7">
-   	</compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs170/language" title="multi catch 1">
-   	<compile files="MultiCatch.java" options="-1.5">
-   		<message kind="error" line="6" text="Multi-catch parameters are not allowed for source level below 1.7"/>
-   	</compile>
-   </ajc-test>
-
-   <ajc-test dir="bugs170/language" title="multi catch 2">
-   	<compile files="MultiCatch.java" options="-1.7">
-   	</compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs170/language" title="multi catch with handler 1">
-   	<compile files="MultiCatchWithHandler.java" options="-1.7">
-   	</compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs170/language" title="multi catch aspect 1">
-   	<compile files="MultiCatchAspect.java" options="-1.7">
-   	</compile>
-   </ajc-test>
-
-   <ajc-test dir="bugs170/language" title="try resources 1">
-   	<compile files="TryResources.java" options="-1.7">
-   	</compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs170/language" title="try resources 2">
-   	<compile files="TryResourcesAspect.java" options="-1.7">
-   	</compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs170/language" title="multi catch with handler 2">
-   	<compile files="MultiCatchWithHandler2.java" options="-1.7">
-   	</compile>
-   	<run class="MultiCatchWithHandler2"></run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs170/sanity" title="sanity 1">
-   	<compile files="DeclareAtType.java" options="-1.5">
-   	</compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs170/pr363979" title="missing impl">
-     <compile files="Example.java" options="-1.5"/>
-     <run class="Example">
-	     <stdout>
-	    	 <line text="yes"/>
-	     </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs170/pr363979" title="missing impl 2">
-     <compile files="Example2.java" options="-1.5"/>
-     <run class="Example2">
-	     <stdout>
-	    	 <line text="yes"/>
-	     </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs170/pr364380" title="stackoverflow">
-     <compile files="X.aj" options="-1.5" outjar="foo.jar"/>
-     <compile files="C.java" options="-1.5" inpath="foo.jar">
-     <message kind="warning" text="An advice already exists for setting an owner"/>
-     </compile>
-   </ajc-test>
-   
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc170/indy.xml b/tests/src/test/java/org/aspectj/systemtest/ajc170/indy.xml
deleted file mode 100644
index 0c4bbe580..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc170/indy.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
- 
-    <ajc-test dir="indy/one" title="indy - 1">
-      <compile files="Code1.java,Asp.java" inpath="indy.jar" options="-1.7"/>
-      <run class="Invoker">
-      <stdout>
-      <line text="staticinitialization(Invoker.&lt;clinit&gt;)"/>
-      <line text="staticinitialization(Code1.&lt;clinit&gt;)"/>
-      <line text="foo() is running"/>
-      </stdout>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="indy/two" title="indy - 2">
-      <compile files="Code1.java,Asp.java" inpath="indy.jar" options="-1.7"/>
-      <run class="Invoker">
-      <stdout>
-      <line text="execution(void Invoker.main(String[]))"/>
-      <line text="execution(CallSite Code1.bootstrap(MethodHandles.Lookup, String, MethodType))"/>
-      <line text="execution(void Code1.foo())"/>
-      <line text="foo() is running"/>
-      </stdout>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="indy/three" title="indy - 3">
-      <compile files="Code1.java,Asp.java" inpath="indy.jar" options="-1.7"/>
-      <run class="Invoker">
-      <stdout>
-      <line text="call(MethodHandles.Lookup java.lang.invoke.MethodHandles.lookup())"/>
-      <line text="call(Class java.lang.invoke.MethodHandles.Lookup.lookupClass())"/>
-      <line text="call(MethodHandle java.lang.invoke.MethodHandles.Lookup.findStatic(Class, String, MethodType))"/>
-      <line text="call(void java.io.PrintStream.println(String))"/>
-      <line text="foo() is running"/>
-      </stdout>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="indy/four" title="indy - 4">
-      <compile files="Code1.java,Asp.java" inpath="indy.jar" options="-1.7"/>
-      <run class="Invoker">
-      <stdout>
-      <line text="staticinitialization(Code1.&lt;clinit&gt;)"/>
-      <line text="execution(CallSite Code1.bootstrap(MethodHandles.Lookup, String, MethodType))"/>
-      <line text="call(MethodHandles.Lookup java.lang.invoke.MethodHandles.lookup())"/>
-      <line text="call(Class java.lang.invoke.MethodHandles.Lookup.lookupClass())"/>
-      <line text="call(MethodHandle java.lang.invoke.MethodHandles.Lookup.findStatic(Class, String, MethodType))"/>
-      <line text="call(java.lang.invoke.ConstantCallSite(MethodHandle))"/>
-      <line text="execution(void Code1.foo())"/>
-      <line text="get(PrintStream java.lang.System.out)"/>
-      <line text="call(void java.io.PrintStream.println(String))"/>
-      <line text="foo() is running"/>
-      </stdout>
-      </run>
-    </ajc-test>
-   
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc171/ajc171.xml b/tests/src/test/java/org/aspectj/systemtest/ajc171/ajc171.xml
deleted file mode 100644
index d9a7651f3..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc171/ajc171.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-
-	<ajc-test dir="bugs171/pr384401" title="npe">
-      <compile files="X.java" options="-1.5">
-      	<message kind="error" line="9" text="the advice annotation must specify a pointcut value"/>
-      </compile>
-    </ajc-test>
-
-	<ajc-test dir="bugs171/pr387444" title="soft 17">
-      <compile files="Code.java" options="-1.7"/>
-    </ajc-test>
-
-	<ajc-test dir="bugs171/pr387444" title="soft 17 2">
-      <compile files="Code2.java" options="-1.7"/>
-      <run class="Code2">
-        <stdout>
-          <line text="foo"/>
-        </stdout>
-      </run>
-    </ajc-test>
-
-	<ajc-test dir="bugs171/pr387568" title="unresolvable enum">
-      <compile files="Color.java Code.java" options="-1.5"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs171/pr386049" title="itd abstract">
-      <compile files="de/scrum_master/galileo/filter/BasicFilter.java de/scrum_master/galileo/filter/JsoupFilter.java de/scrum_master/galileo/LoggingAspect.aj" options="-1.5"/>
-      <run class="de.scrum_master.galileo.filter.JsoupFilter">
-        <stdout>
-          <line text="JsoupFilter.getLogMessage()"/>
-          <line text="run()"/>
-        </stdout>
-      </run>
-    </ajc-test>
-
-    <ajc-test dir="bugs171/pr73507" title="public ITDfs - 1">
-      <compile files="Case1.java" options="-1.5"/>
-      <run class="Case1">
-        <stdout>
-          <line text="Found a field called i"/>
-        </stdout>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs171/pr73507" title="public ITDfs - 2">
-      <compile files="Case2.java" options="-1.5"/>
-      <run class="Case2">
-        <stdout>
-          <line text="Value of C.i is 1"/>
-        </stdout>
-      </run>
-    </ajc-test>
-    
-     <ajc-test dir="bugs171/pr73507" title="public ITDfs - 3">
-      <compile files="Case3.java" options="-1.5"/>
-      <run class="Case3">
-        <stdout>
-          <line text="Value of C.i is 1"/>
-          <line text="Value of C.j is 1"/>
-          <line text="Value of C.k is 5"/>
-          <line text="Value of I.i is 1"/>
-          <line text="Value of I.j is 1"/>
-        </stdout>
-      </run>
-    </ajc-test>
-    
-     <ajc-test dir="bugs171/pr73507" title="public ITDfs - 4">
-      <compile files="Case4.java" options="-1.5">
-        <message kind="error" line="13" text="can't override java.lang.String I.i with int C.i return types don't match"/>
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs171/pr73507" title="public ITDfs - 5">
-      <compile files="Case5.java" options="-1.5"/>
-      <run class="Case5">
-        <stdout>
-          <line text="public java.lang.String C.str"/>
-        </stdout>
-      </run>
-    </ajc-test>
-	
-	<ajc-test dir="bugs171/pr384398" title="generics itds">
-		<compile files="A.java B.java BAspect.aj" options="-1.5">
-		<!-- 
-			<message kind="weave" text="Join point 'constructor-call(void java.util.LinkedList.&lt;init&gt;())' in Type 'Foo' (Foo.java:41) advised by around advice from 'Bar' (Foo.java:14)"/>
-		-->
-		</compile>
-		<!-- 
-		<run class="Foo">
-			<stdout>
-				<line text="superaspect getNumber returns -2"/>
-				<line text="Bar.method() running"/>
-				<line text="abstract method returns []"/>
-			</stdout>
-		</run> -->
-	</ajc-test>
-	
-	<ajc-test dir="bugs171/pr384398_2" title="generics itds 2">
-		<compile files="A.java B.java BAspect.aj" options="-1.5">
-		<!-- 
-			<message kind="weave" text="Join point 'constructor-call(void java.util.LinkedList.&lt;init&gt;())' in Type 'Foo' (Foo.java:41) advised by around advice from 'Bar' (Foo.java:14)"/>
-		-->
-		</compile>
-		<!-- 
-		<run class="Foo">
-			<stdout>
-				<line text="superaspect getNumber returns -2"/>
-				<line text="Bar.method() running"/>
-				<line text="abstract method returns []"/>
-			</stdout>
-		</run> -->
-	</ajc-test>
-   
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc171/newfeatures-tests.xml b/tests/src/test/java/org/aspectj/systemtest/ajc171/newfeatures-tests.xml
deleted file mode 100644
index 32f0f1845..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc171/newfeatures-tests.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<!-- AspectJ v1.7.1 Features Tests -->
-<suite>
-  <ajc-test dir="features171/pr386341" title="Test Shared Cache">
-    <compile files="A.java" options="-1.5"/>
-    <compile files="X.aj" options="-1.5 -Xlint:ignore" />
-    <run class="A" ltw="aop.xml" usefullltw="true" vmargs="-Daj.weaving.cache.enabled=true -Daj.weaving.cache.dir=./ -Daj.weaving.cache.impl=shared" > 
-    <stdout>
-	    <line text="It Worked-before"/>
-	   	<line text="It Worked-after"/>
-    </stdout>
-    </run>
-  </ajc-test>  
-  
-   <ajc-test dir="features171/pr386341" title="Test Per ClassLoader Cache">
-    <compile files="A.java" options="-1.5"/>
-    <compile files="X.aj" options="-1.5 -Xlint:ignore" />
-    <run class="A" ltw="aop.xml" usefullltw="true" vmargs="-Daj.weaving.cache.enabled=true -Daj.weaving.cache.dir=./ -Daj.weaving.cache.impl=perloader" > 
-    <stdout>
-	    <line text="It Worked-before"/>
-	   	<line text="It Worked-after"/>
-    </stdout>
-    </run>
-  </ajc-test>  
-  
-  <ajc-test dir="features171/pr386341" title="Test Default Cache Per ClassLoader">
-    <compile files="A.java" options="-1.5"/>
-    <compile files="X.aj" options="-1.5 -Xlint:ignore" />
-    <run class="A" ltw="aop.xml" usefullltw="true" vmargs="-Daj.weaving.cache.enabled=true -Daj.weaving.cache.dir=./" > 
-    <stdout>
-	    <line text="It Worked-before"/>
-	   	<line text="It Worked-after"/>
-    </stdout>
-    </run>
-  </ajc-test> 
-  
-  
-  
- 
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc172/ajc172.xml b/tests/src/test/java/org/aspectj/systemtest/ajc172/ajc172.xml
deleted file mode 100644
index 3eb4f2cb3..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc172/ajc172.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-
-	<ajc-test dir="bugs172/pr391384" title="unsupported should be normal error">
-      <compile files="Code.java" options="-1.5">
-      	<message kind="error" text="Compiler limitation: annotation value support not implemented for type java.lang.String[]"/>
-      </compile>
-    </ajc-test>
-    
-	<ajc-test dir="bugs172/pr394535" title="signatures">
-      <compile files="Bug.java" options="-1.5"/>
-      <compile files="Bug2.java" options="-1.5"/>
-      <run class="Bug2"/>
-      <run class="Bug"/>
-    </ajc-test>
-    
-	<ajc-test dir="bugs172/pr399590" title="p signatures 1">
-      <compile files="Cage.java" options="-1.5"/>
-      <compile files="Cage2.java" options="-1.5"/>
-    </ajc-test>
-    
-	<ajc-test dir="bugs172/pr399590/two" title="p signatures 2">
-      <compile files="Cage.java" options="-1.5"/>
-      <compile files="Cage2.java" options="-1.5"/>
-    </ajc-test>
-    
-	<ajc-test dir="bugs172/pr399590/three" title="p signatures 3">
-      <compile files="Cage.java" options="-1.5"/>
-      <compile files="Cage2.java" options="-1.5"/>
-    </ajc-test>
-    
-	<ajc-test dir="bugs172/pr399590/four" title="p signatures 4">
-      <compile files="Cage.java" options="-1.5"/>
-      <compile files="Cage2.java" options="-1.5"/>
-    </ajc-test>
-    
-	<ajc-test dir="bugs172/pr399590/five" title="p signatures 5">
-      <compile files="Cage.java" options="-1.5"/>
-      <compile files="Cage2.java" options="-1.5"/>
-    </ajc-test>
-    
-	<ajc-test dir="bugs172/pr398588" title="optional aspects">
-	     <compile files="Anno.java Anno2.java" outjar="anno.jar" options="-1.5"/>
-	     <compile files="AspectA.java" classpath="anno.jar" outjar="aspect.jar" options="-Xlint:ignore -1.5"/>
-	     <compile files="AspectB.java" outjar="aspect2.jar" options="-Xlint:ignore -1.5"/>
-	     <compile files="Code.java Blah.java" classpath="aspect.jar;aspect2.jar" options="-1.5"/>
-		 <compile files="AspectC.java" classpath="$sandbox" outjar="aspect3.jar" options="-Xlint:ignore -1.5"/>	     
-	     <compile files="AspectD.java" classpath="anno.jar" outjar="aspect4.jar" options="-Xlint:ignore -1.5"/>
-	     
-	     <file deletefile="anno.jar"/>
-	     <run class="Code" ltw="META-INF/aop.xml" classpath=".;aspect.jar;aspect2.jar;aspectj3.jar;aspect4.jar">
-	     <stderr>
-	     <line text="AspectJ Weaver Version"/>
-	     <line text="register classloader"/>
-	     <line text="using configuration"/>
-	     <line text="register aspect AspectA"/>
-	     <line text="deactivating aspect"/>
-	     <line text="register aspect AspectB"/>     
-	     <line text="register aspect AspectC"/>   
-	     <line text="register aspect AspectD"/>
-	     <line text="deactivating aspect 'AspectD' as it requires type 'a.b.c.Anno2' which cannot be found on the classpath"/>
-	     <line text="Join point 'method-execution(void Code.main(java.lang.String[]))' in Type 'Code' (Code.java:7) advised by before advice from 'AspectC'"/>
-	     <line text="Join point 'staticinitialization(void Code.&lt;clinit&gt;())' in Type 'Code' (Code.java) advised by before advice from 'AspectB'"/>  
-	     <line text="processing reweavable"/>
-	     <line text="processing reweavable"/>
-	     </stderr>
-	     <stdout>
-	     <line text="staticinitialization"/>
-	     <line text="C"/>
-	     <line text="abcde"/>
-	     </stdout>
-	     </run>
-	</ajc-test>
-	
-	<ajc-test dir="bugs172/pr398246" title="if pointcut names">
-      <compile files="Code.java" options="-1.5">
-      </compile>
-      <run class="Code" options="-1.5">
-      	<stdout>
-      	<line text="advice"/>
-      	<line text="advice"/>
-      	</stdout>
-      </run>
-    </ajc-test>
-    
-	<ajc-test dir="bugs172/pr398246" title="if pointcut names 2">
-      <compile files="Code2.java" options="-1.5">
-      </compile>
-      <run class="Code2" options="-1.5">
-      	<stdout>
-      	<line text="advice"/>
-      	<line text="advice"/>
-      	</stdout>
-      </run>
-    </ajc-test>
-    
-	<ajc-test dir="bugs172/pr398246" title="if pointcut names 3">
-      <compile files="Code3.java" options="-1.5">
-      </compile> 
-      <run class="Code3" options="-1.5">
-      	<stdout>
-      	<line text="advice"/>
-      	<line text="advice"/>
-      	</stdout>
-      </run>
-    </ajc-test>
-    
-	<ajc-test dir="bugs172/pr398246" title="if pointcut names 4">
-      <compile files="Code4.java" options="-1.5"></compile> 
-      <compile files="Code4.java" options="-1.5" outjar="aspects.jar"/>
-      <run class="Code4" options="-1.5"> 
-      	<stdout>
-      	<line text="advice"/>
-      	<line text="advice"/>
-      	</stdout>
-      </run>
-      <compile files="CodeExtra4.java" aspectpath="aspects.jar" options="-1.5"></compile>
-      <run class="CodeExtra4" options="-1.5">
-      	<stdout>
-      	<line text="advice"/>
-      	<line text="advice"/>
-      	</stdout>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs172/pr398246" title="if pointcut names 5">
-      <compile files="Code5.java Code5a.java" options="-1.5">
-      </compile>
-      <run class="Code5" options="-1.5">
-      	<stdout>
-      	<line text="advice"/>
-      	<line text="advice"/>
-      	<line text="advice"/>
-      	<line text="advice"/>
-      	</stdout>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs172/pr398246" title="if pointcut names 6">
-      <compile files="Code6.java" options="-1.5">
-      </compile>
-      <run class="Code6" options="-1.5">
-      	<stdout>      	
-      	<line text="advice"/>
-      	<line text="advice"/>
-      	</stdout>
-      </run>
-    </ajc-test>
-    
-     <ajc-test dir="bugs172/pr398246" title="if pointcut names 7">
-      <compile files="Code7.java" options="-1.5">
-      </compile>
-      <run class="Code7" options="-1.5">
-      	<stdout>
-      	<line text="advice"/>
-      	<line text="advice"/>
-      	</stdout>
-      </run>
-    </ajc-test>
-  
-	<ajc-test dir="bugs172/pr389750" title="inconsistent class file">
-      <compile files="Code.aj" options="-1.5">
-      </compile>
-      <compile files="Clazz.java" options="-1.5"/>
-    </ajc-test>
-    
-	<ajc-test dir="bugs172/pr389750" title="inconsistent class file 2">
-      <compile files="Code2.aj" outjar="azpect.jar" options="-1.5">
-      </compile>
-      <compile files="Clazz2.java" aspectpath="azpect.jar" options="-1.5"/>
-    </ajc-test>
-    
-	<ajc-test dir="bugs172/pr389750" title="inconsistent class file 3">
-      <compile files="Code3.aj" outjar="azpect.jar" options="-1.5">
-      </compile>
-      <compile files="Clazz3.java" aspectpath="azpect.jar" options="-1.5"/>
-    </ajc-test>
-    
-	<ajc-test dir="bugs172/pr389750" title="inconsistent class file 4">
-      <compile files="Code4.aj" outjar="azpect.jar" options="-1.5">
-      </compile>
-      <compile files="Clazz4.java" aspectpath="azpect.jar" options="-1.5"/>
-    </ajc-test>
-    
-	<ajc-test dir="bugs172/pr389752" title="annotation value error 1">
-      <compile files="Code.java" options="-1.5">
-      	<message kind="error" text="Invalid annotation value 'AA', expected enum value"/>
-      </compile>
-    </ajc-test>
-    
-	<ajc-test dir="bugs172/pr389752" title="annotation value error 2">
-      <compile files="Code2.java" options="-1.5">
-      	<message kind="error" text="Invalid annotation value 'AA', expected enum value"/>
-      </compile>
-    </ajc-test>
-    
-	<ajc-test dir="bugs172/pr389752" title="annotation value error 3">
-      <compile files="Code3.java" options="-1.5">
-      	<message kind="error" text="Invalid annotation value 'AA', expected enum value"/>
-      </compile>
-    </ajc-test>
-
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc173/ajc173.xml b/tests/src/test/java/org/aspectj/systemtest/ajc173/ajc173.xml
deleted file mode 100644
index 398fae62f..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc173/ajc173.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-
-	<ajc-test dir="bugs173/pr407739" title="add remove annos">
-		<compile files="MyAnnotation.java Hello.java Aspect.java" options="-1.5 -showWeaveInfo">
-			<message kind="weave" text="'private String dummy [RuntimeVisibleAnnotations]' of type 'Hello' (Hello.java) has had @MyAnnotation field annotation removed by 'Aspect' (Aspect.java:3)"/>
-			<message kind="weave" text="'private String dummy [RuntimeVisibleAnnotations]' of type 'Hello' (Hello.java) is annotated with @MyAnnotation(dummy2 = &quot;korte&quot;) field annotation from 'Aspect' (Aspect.java:4)"/>		
-		</compile>
-		<run class="Hello">
-		<stdout>
-		<line text="@MyAnnotation(dummy1=, dummy2=korte)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-		<line text="@MyAnnotation(dummy1=&quot;&quot;, dummy2=&quot;korte&quot;)" vm="9+"/>
-		</stdout>
-		</run>
-	</ajc-test>
-	
-	<ajc-test dir="bugs173/pr408014" title="inner interface mixin">
-		<compile files="IdentifiableMixin.java" options="-1.5 -showWeaveInfo">		
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs173/pr407966" title="ordering">
-		<compile files="Aspect.aj Use.java Def.java" options="-1.5 -showWeaveInfo">
-		</compile>
-	</ajc-test>
-
-	<ajc-test dir="bugs173/pr407494" title="inner names">
-		<compile files="A.java" options="-1.5 -showWeaveInfo">		
-			<message kind="weave" text="Join point 'staticinitialization(void a.b.c.A$B.&lt;clinit&gt;())' in Type 'a.b.c.A$B' (A.java:4) advised by before advice from 'a.b.c.X' (A.java:13)"/>
-			<message kind="weave" text="Join point 'staticinitialization(void a.b.c.A.&lt;clinit&gt;())' in Type 'a.b.c.A' (A.java:3) advised by before advice from 'a.b.c.X' (A.java:13)"/>
-			<message kind="weave" text="Join point 'staticinitialization(void a.b.c.A$$C.&lt;clinit&gt;())' in Type 'a.b.c.A$$C' (A.java:6) advised by before advice from 'a.b.c.X' (A.java:13)"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs173/pr407494" title="inner names 2">
-		<compile files="A2.java" options="-1.5 -showWeaveInfo">		
-			<message kind="weave" text="Join point 'staticinitialization(void a.b.c.A$$B$$C.&lt;clinit&gt;())' in Type 'a.b.c.A$$B$$C' (A2.java:10) advised by before advice from 'a.b.c.X' (A2.java:14)"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs173/pr405016/one" title="class anno value 1">
-		<compile files="Gimme.java Thingy.java" options="-1.5 -showWeaveInfo">
-			<message kind="weave" text="Extending interface set for type 'Thingy' (Thingy.java) to include 'java.io.Serializable' (Thingy.java)"/>
-		</compile>
-		<run class="Thingy">
-			<stdout>
-				<line text="I am serializable? true"/>
-			</stdout>
-		</run>
-	</ajc-test>
-	
-	<ajc-test dir="bugs173/pr405016" title="class anno value">
-		<compile files="Gimme.java Thingy.java" options="-1.5 -showWeaveInfo">
-			<message kind="weave" text="Extending interface set for type 'Thingy' (Thingy.java) to include 'java.io.Serializable' (Thingy.java)"/>
-		</compile>
-		<run class="Thingy">
-			<stdout>
-				<line text="I am serializable? true"/>
-			</stdout>
-		</run>
-	</ajc-test>
-	
-	<ajc-test dir="bugs173/pr404601" title="abstract method error">
-		<compile files="user/IUser.java user/Test.java user/UserTrait.java user/Youser.java" options="-1.5">
-			<message kind="error" text="private intertype declaration 'void UserTrait$I.testSetUsername(java.lang.String)' clashes with public member 'void Youser.testSetUsername(java.lang.String)'"/>
-		</compile>
-	</ajc-test>
-
-	<ajc-test dir="bugs173/lyor" title="declare anno on itd">
-      <compile files="Code.java" options="-1.5 -showWeaveInfo">
-      	<message kind="weave" text="'public void Intface.getName()' (Code.java) is annotated with @Foo method annotation from 'A' (Code.java:7)"/>
-		<message kind="weave" text="Type 'C' (Code.java) has intertyped method from 'A' (Code.java:'void Intface.getName()')"/>
-		<message kind="weave" text="Type 'Intface' (Code.java) has intertyped method from 'A' (Code.java:'void Intface.getName()')"/>
-      </compile>
-    </ajc-test>
-    
-	<ajc-test dir="bugs173/lyor/2" title="declare anno on itd 2">
-		<compile files="A1.java" outjar="aspects1.jar" options="-1.5 -Xlint:ignore"/>
-		<compile files="Intface.java A2.java" aspectpath="aspects1.jar" outjar="aspects2.jar" options="-1.5"/>
-		<compile files="Code.java" aspectpath="aspects1.jar;aspects2.jar" options="-1.5"/>
-		
-      <!-- 
-      	<message kind="weave" text="'public void Intface.getName()' (A2.java) is annotated with @Foo method annotation from 'A1' (A1.java:7)"/>
-		<message kind="weave" text="Type 'C' (Code.java) has intertyped method from 'A2' (A2.java:'void Intface.getName()')"/>
-		<message kind="weave" text="Type 'Intface' (Code.java) has intertyped method from 'A2' (A2.java:'void Intface.getName()')"/>
-		-->
-    </ajc-test>
-
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc174/ajc174.xml b/tests/src/test/java/org/aspectj/systemtest/ajc174/ajc174.xml
deleted file mode 100644
index 456fb412f..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc174/ajc174.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-
-	<ajc-test dir="bugs174/ajdt_markers" title="ajdt markers">
-		<compile files="Code.java" options="-1.5 -showWeaveInfo">
-		</compile>
-	</ajc-test>
-
-
-	<ajc-test dir="bugs174/extra_inserts" title="extra inserts">
-		<compile files="Code.java" options="-1.5">
-			<message kind="warning" line="8"  text="Call to foo made inside class Bar"/>
-			<message kind="warning" line="15" text="Call to foo made inside class Boo"/>
-			<message kind="warning" line="8"  text="Call to foo made inside member booble"/>
-			<message kind="warning" line="15" text="Call to foo made inside member m"/>
-			<message kind="warning" line="8"  text="Call to foo made inside member void Bar.booble()"/>
-			<message kind="warning" line="15" text="Call to foo made inside member void Boo.m()"/>
-		</compile>
-	</ajc-test>
-
-	<ajc-test dir="bugs174/pr419279" title="more configurable lint">
-		<compile files="Code.java" options="-1.5">
-			<message kind="warning" text="advice defined in Code has not been applied [Xlint:adviceDidNotMatch]"/>
-		</compile>
-		<compile files="Code.java" options="-1.5 -Xlint:adviceDidNotMatch=ignore">
-		</compile>
-		<compile files="Code.java" options="-1.5 -Xlint:adviceDidNotMatch=error">
-			<message kind="error" text="advice defined in Code has not been applied [Xlint:adviceDidNotMatch]"/>
-		</compile>
-		<compile files="Code.java" options="-1.5 -Xlint:foo=bar">
-			<message kind="error" text="invalid Xlint key: foo"/>
-		</compile>
-		<compile files="Code.java" options="-1.5 -Xlint:adviceDidNotMatch=wibble">
-			<message kind="error" text="invalid Xlint message kind (must be one of ignore, warning, error): wibble"/>
-		</compile>
-		<compile files="Code.java" options="-1.5 -Xlint:adviceDidNotMatch=ignore{adviceDidNotMatch=error">
-			<message kind="error" text="advice defined in Code has not been applied [Xlint:adviceDidNotMatch]"/>
-		</compile>
-		<compile files="Code.java" options="-1.5 -Xlint:adviceDidNotMatch=error{noGuardForLazyTjp=error">
-			<message kind="error" text="advice defined in Code has not been applied [Xlint:adviceDidNotMatch]"/>
-			<message kind="error" text="can not build thisJoinPoint lazily for this advice since it has no suitable guard [Xlint:noGuardForLazyTjp]"/>
-		</compile>
-	</ajc-test>
-
-	<ajc-test dir="bugs174/pr418129" title="annotated itd">
-		<compile files="Target.java" options="-1.5 -showWeaveInfo">
-			<message kind="weave" text="Type 'Behavior' (Target.java) has intertyped method from 'Trait' (Target.java:'java.lang.String Behavior.hello()')"/>
-			<message kind="weave" text="Type 'Target' (Target.java) has intertyped method from 'Trait' (Target.java:'java.lang.String Behavior.hello()')"/>
-			<message kind="weave" text="'public java.lang.String Target.hello()' (Target.java) is annotated with @Tagged method annotation from 'Target$A' (Target.java:18)"/>
-		</compile>
-		<run class="Target">
-		<stdout>
-		<line text="@Tagged()"/>
-		</stdout>
-		</run>
-	</ajc-test>
-	
-	<!-- declared with throws exception -->
-	<ajc-test dir="bugs174/pr418129" title="annotated itd 2">
-		<compile files="Target2.java" options="-1.5 -showWeaveInfo">
-			<message kind="weave" text="Type 'Behavior' (Target2.java) has intertyped method from 'Trait' (Target2.java:'java.lang.String Behavior.hello()')"/>
-			<message kind="weave" text="Type 'Target2' (Target2.java) has intertyped method from 'Trait' (Target2.java:'java.lang.String Behavior.hello()')"/>
-			<message kind="weave" text="'public java.lang.String Target2.hello()' (Target2.java) is annotated with @Tagged method annotation from 'Target2$A' (Target2.java:18)"/>
-		</compile>
-		<run class="Target2">
-		<stdout>
-		<line text="@Tagged()"/>
-		</stdout>
-		</run>
-	</ajc-test>
-	
-	<!-- already annotated with another annotation -->
-	<ajc-test dir="bugs174/pr418129" title="annotated itd 3">
-		<compile files="Target3.java" options="-1.5 -showWeaveInfo">
-			<message kind="weave" text="Type 'Behavior' (Target3.java) has intertyped method from 'Trait' (Target3.java:'java.lang.String Behavior.hello()')"/>
-			<message kind="weave" text="Type 'Target3' (Target3.java) has intertyped method from 'Trait' (Target3.java:'java.lang.String Behavior.hello()')"/>
-			<message kind="weave" text="'public java.lang.String Target3.hello()' (Target3.java) is annotated with @Tagged method annotation from 'Target3$A' (Target3.java:16)"/>
-		</compile>
-		<run class="Target3">
-		<stdout>
-		<line text="2"/>
-		<line text="@Wibble()"/>
-		<line text="@Tagged()"/>
-		</stdout>
-		</run>
-	</ajc-test>
-	
-	<!-- already annotated with the same annotation -->
-	<ajc-test dir="bugs174/pr418129" title="annotated itd 4">
-		<compile files="Target4.java" options="-1.5 -showWeaveInfo">
-			<message kind="weave" text="Type 'Behavior' (Target4.java) has intertyped method from 'Trait' (Target4.java:'java.lang.String Behavior.hello()')"/>
-			<message kind="weave" text="Type 'Target4' (Target4.java) has intertyped method from 'Trait' (Target4.java:'java.lang.String Behavior.hello()')"/>
-			<!--  warning turned off as it gets confusing - when the itd on the interface is hit by a deca -->
-			<!-- 
-			<message kind="warning" text="java.lang.String Target4.hello() - already has an annotation of type Tagged, cannot add a second instance [Xlint:elementAlreadyAnnotated]"/>
-			-->
-		</compile>
-		<run class="Target4">
-		<stdout>
-		<line text="1"/>
-		<line text="@Tagged(value=31)"/>
-		</stdout>
-		</run>
-	</ajc-test>
-	
-	<ajc-test dir="bugs174/pr413378" title="super itd ctor">
-		<compile files="Code.java" options="-1.5 -showWeaveInfo">
-			<message kind="weave" text="Type 'Child' (Code.java) has intertyped constructor from 'MyTest' (Code.java:'void Child.&lt;init&gt;(java.lang.String, int)')"/>
-		</compile>
-		<run class="Code">
-		<stdout>
-		<line text="Get Age:50"/>
-		<line text="Child Name:Andy"/>
-		</stdout>
-		</run>
-	</ajc-test>
-	
-	<ajc-test dir="bugs174/pr368046" title="classloader exclusion - 1">
-	  <compile files="Azpect.java" outjar="foo.jar" options="-1.4"/>
-      <compile files="Code.java" classpath="$sandbox/foo.jar"/>
-      <run class="Code" classpath="$sandbox/foo.jar" ltw="aop1.xml">
-        <stdout>
-          <line text="advice"/>
-          <line text="running"/>
- 	    </stdout>
- 	    <stderr>
- 	    <line text="AspectJ Weaver"/>
- 	    <line text="register classloader"/>
- 	    <line text="using configuration"/>
- 	    <line text="register aspect"/>
- 	    <line text="processing reweavable"/>
- 	    </stderr>
-      </run>
-	</ajc-test>
-	
-	<ajc-test dir="bugs174/pr368046" title="classloader exclusion - 2">
-	  <compile files="Azpect.java" outjar="foo.jar" options="-1.4"/>
-      <compile files="Code.java" classpath="$sandbox/foo.jar"/>
-      <run class="Code" classpath="$sandbox/foo.jar" ltw="aop1.xml">
-        <stdout>
-          <line text="advice"/>
-          <line text="running"/>
- 	    </stdout>
- 	    <stderr>
- 	    <line text="AspectJ Weaver"/>
- 	    <line text="register classloader"/>
- 	    <line text="using configuration"/>
- 	    <line text="no longer creating weavers for these classloaders: [foo]"/>
- 	    <line text="register aspect"/>
- 	    <line text="processing reweavable"/>
- 	    </stderr>
-      </run>
-	</ajc-test>
-	
-	<ajc-test dir="bugs174/pr368046" title="classloader exclusion - 3">
-	  <compile files="Azpect.java" outjar="foo.jar" options="-1.4"/>
-      <compile files="Code.java" classpath="$sandbox/foo.jar"/>
-      <run class="Code" classpath="$sandbox/foo.jar" ltw="aop1.xml">
-        <stdout>
-          <line text="advice"/>
-          <line text="running"/>
- 	    </stdout>
- 	    <stderr>
- 	    <line text="AspectJ Weaver"/>
- 	    <line text="register classloader"/>
- 	    <line text="using configuration"/>
- 	    <line text="register aspect"/>
- 	    <line text="processing reweavable"/>
- 	    </stderr>
-      </run>
-	</ajc-test>
-	
-	<ajc-test dir="bugs174/pr368046" title="classloader exclusion - 4">
-	  <compile files="Azpect.java" outjar="foo.jar" options="-1.4"/>
-      <compile files="Code.java" classpath="$sandbox/foo.jar"/>
-      <run class="Code" classpath="$sandbox/foo.jar" ltw="aop2.xml">
-        <stdout>
-          <line text="advice"/>
-          <line text="running"/>
- 	    </stdout>
- 	    <stderr>
- 	    <line text="AspectJ Weaver"/>
- 	    <line text="register classloader"/>
- 	    <line text="using configuration"/>
- 	    <line text="no longer creating weavers for these classloaders: [com.foo.Bar]"/>
- 	    <line text="register aspect"/>
- 	    <line text="processing reweavable"/>
- 	    </stderr>
-      </run>
-	</ajc-test>
-	
-	<ajc-test dir="bugs174/pr368046" title="classloader exclusion - 5">
-	  <compile files="Azpect.java" outjar="foo.jar" options="-1.4"/>
-      <compile files="Code.java" classpath="$sandbox/foo.jar"/>
-      <run class="Code" classpath="$sandbox/foo.jar" ltw="aop3.xml">
-        <stdout>
-          <line text="advice"/>
-          <line text="running"/>
- 	    </stdout>
- 	    <stderr>
- 	    <line text="AspectJ Weaver"/>
- 	    <line text="register classloader"/>
- 	    <line text="using configuration"/>
- 	    <line text="no longer creating weavers for these classloaders: [org.aspectj.weaver.loadtime.WeavingURLClassLoader]"/>
- 	    <line text="register aspect"/>
- 	    <line text="processing reweavable"/>
- 	    </stderr>
-      </run>
-	</ajc-test>
-
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc175/ajc175.xml b/tests/src/test/java/org/aspectj/systemtest/ajc175/ajc175.xml
deleted file mode 100644
index 2db4a984a..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc175/ajc175.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-
-	<ajc-test dir="bugs175/pr430243" title="illegalaccesserror">
-		<compile files="PackageManagerAspect.java PolicyManager.java PolicyProviderConstants.java PolicyProviderInterface.java" options="-1.6">
-		</compile>
-		<run class="com.test2.PolicyManager">
-		</run>
-	</ajc-test>
-	
-	<ajc-test dir="bugs175/pr423257" title="vertx verify error">
-		<compile files="Test.java AspectX.java" options="-1.7">
-		</compile>
-		<run class="com.foo.bar.Test">
-		</run>
-	</ajc-test>
-
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc180/ajc180.xml b/tests/src/test/java/org/aspectj/systemtest/ajc180/ajc180.xml
deleted file mode 100644
index 257f5972c..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc180/ajc180.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-
-	<ajc-test dir="bugs180/432178" title="percflow ltw">
-		<compile options="-1.8" files="A.java B.java"/>
-		<compile options="-1.8" files="PerCFlowBug.java"/>
-		<run class="A" ltw="aop.xml">
-		<stdout>
-		  <line text="foo"/>
-		  <line text="bar"/>
-		</stdout>
-		</run>
-	</ajc-test>
-	
-	<ajc-test dir="bugs180/pr432714" title="stackmapframe">
-		<compile options="-1.8" files="Code.java"/>
-		<run class="Code"/>
-	</ajc-test>
-	
-	<ajc-test dir="bugs180/pr431976" title="thisJoinPoint not initialized">
-		<compile options="-1.8" files="Code.java"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs180/pr431541" title="NullAnnotationMatching exception">
-		<compile options="-1.8" files="Test.aj"/>
-	</ajc-test>
-	
-	<ajc-test dir="bugs180/415957" title="annotations with 1.8 flags">
-		<compile files="MyAspect.aj MyClass.java Resource.java" options="-1.8 -showWeaveInfo">
-			<message kind="weave" text="Join point 'method-execution(void MyClass.method())' in Type 'MyClass' (MyClass.java:3) advised by before advice from 'MyAspect' (MyAspect.aj:5)"/>
-		</compile>
-	</ajc-test>
-
-	<ajc-test dir="bugs180/firstprogram" title="first advised java 8 code">
-		<compile files="C.java" options="-1.8">
-		</compile>
-		<run class="C">
-		<stdout>
-		<line text="Clazz staticinitialization(I.&lt;clinit&gt;)"/>
-		<line text="Clazz staticinitialization(C.&lt;clinit&gt;)"/>
-		<line text="I.foo running"/>
-		<line text="ABC"/>
-		<line text="hello world!"/>
-		<line text="Clazz staticinitialization(MyClass.&lt;clinit&gt;)"/>
-		<line text="Clazz staticinitialization(Utils.&lt;clinit&gt;)"/>
-		<line text="1"/>
-		<line text="22"/>
-		<line text="333"/>
-		<line text="4444"/>
-		</stdout>
-		</run>
-	</ajc-test>
-
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc181/ajc181.xml b/tests/src/test/java/org/aspectj/systemtest/ajc181/ajc181.xml
deleted file mode 100644
index 1a8b1acfc..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc181/ajc181.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-
-	<ajc-test dir="bugs181/436531" title="parameter names attribute">
-		<compile options="-1.8" files="Azpect.java" inpath="code.jar"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs181/431976" title="variable not initialized">
-		<compile options="-1.8" files="AbstractDependencyInjectionAspect.aj"/>
-	</ajc-test>
-	
-	<ajc-test dir="bugs181/431976" title="thisEnclosingJoinPointStaticPart not initialized">
-		<compile options="-1.8" files="Code.java"/>
-	</ajc-test>
-	
-	<ajc-test dir="bugs181/435446" title="lvartable">
-		<compile options="-1.8" files="Application.java MyAspect.java">
-		</compile>
-		<run class="de.scrum_master.app.Application">
-		</run>
-	</ajc-test>
-	
-	<ajc-test dir="bugs181/377096" title="broken annotations">
-		<compile options="-1.5 -proceedOnError" files="A.java">
-		<message kind="error" text="The attribute wibble is undefined for the annotation type A"/>
-		</compile>
-	</ajc-test>
-
-	<ajc-test dir="bugs181/433744" title="default methods">
-		<compile options="-1.8" files="AnIterator.java"/>
-	</ajc-test>
-
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1810/ajc1810.xml b/tests/src/test/java/org/aspectj/systemtest/ajc1810/ajc1810.xml
deleted file mode 100644
index 0171f5b55..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc1810/ajc1810.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-
-	<ajc-test dir="bugs1810/508661" title="various ltw">
-		<compile options="-1.8" files="CacheMethodResult.java A_yes.java B_no.java Run.java" outjar="classes.jar"/>
-		<compile options="-1.8 -Xlint:ignore" files="CacheMethodResultAspect.java" outjar="aspects.jar"/>
-		<run class="Run" ltw="aop.xml">
-			<stdout>
-				<line text="around: void A_yes.m()"/>
-				<line text="A_yes.m()"/>
-				<line text="A_yes has interface? CacheMethodResultAspect$ajcMightHaveAspect"/>
-				<line text="B_no.m()"/>
-				<line text="B_no has interface? no"/>
-			</stdout>
-		</run>
-	</ajc-test>
-
-	<ajc-test dir="bugs1810/500035" title="ataspectj binding">
-		<compile options="-1.8" files="Code.java"/>
-		<run class="Code">
-		<stdout>
-		<line text="targetObject = hello"/>
-		<line text="regex = l"/>
-		<line text="replacement = 7"/>
-		<line text="he7lo"/>
-		</stdout>
-		</run>
-	</ajc-test>
-	
-	<ajc-test dir="bugs1810/500035" title="ataspectj binding 2">
-		<compile options="-1.8" files="Code2.java"/>
-		<run class="Code2">
-		<stdout>
-		<line text="targetObject = hello"/>
-		<line text="regex = l"/>
-		<line text="replacement = 8"/>
-		<line text="he8lo"/>
-		</stdout>
-		</run>
-	</ajc-test>
-	
-	<ajc-test dir="bugs1810/500035" title="ataspectj binding 3 -XnoInline">
-		<compile options="-1.8 -XnoInline" files="Code3.java"/>
-		<run class="Code3">
-		<stdout>
-		<line text="first: binding target, just passing everything through: target=Foo(1)"/>
-		<line text="Executing run(abc) on Foo(i=1)"/>
-		<line text="second: binding this and target, just passing everything through: this=Foo(0) target=Foo(1)"/>
-		<line text="Executing run(abc) on Foo(i=1)"/>
-		<line text="third: binding this, just passing everything through: this=Foo(0)"/>
-		<line text="Executing run(abc) on Foo(i=1)"/>
-		<line text="fourth: binding this, switching from Foo(0) to Foo(3)"/>
-		<line text="Executing run(abc) on Foo(i=1)"/>
-		<line text="fifth: binding target, switching from Foo(1) to Foo(4)"/>
-		<line text="Executing run(abc) on Foo(i=4)"/>
-		<line text="sixth: binding this and target, switching them around (before this=Foo(0) target=Foo(1))"/>
-		<line text="Executing run(abc) on Foo(i=0)"/>
-		</stdout>
-		</run>
-	</ajc-test>
-	
-	<ajc-test dir="bugs1810/500035" title="ataspectj binding 4">
-		<compile options="-1.8" files="Code3.java"/>
-		<run class="Code3">
-		<stdout>
-		<line text="first: binding target, just passing everything through: target=Foo(1)"/>
-		<line text="Executing run(abc) on Foo(i=1)"/>
-		<line text="second: binding this and target, just passing everything through: this=Foo(0) target=Foo(1)"/>
-		<line text="Executing run(abc) on Foo(i=1)"/>
-		<line text="third: binding this, just passing everything through: this=Foo(0)"/>
-		<line text="Executing run(abc) on Foo(i=1)"/>
-		<line text="fourth: binding this, switching from Foo(0) to Foo(3)"/>
-		<line text="Executing run(abc) on Foo(i=1)"/>
-		<line text="fifth: binding target, switching from Foo(1) to Foo(4)"/>
-		<line text="Executing run(abc) on Foo(i=4)"/>
-		<line text="sixth: binding this and target, switching them around (before this=Foo(0) target=Foo(1))"/>
-		<line text="Executing run(abc) on Foo(i=0)"/>
-		</stdout>
-		</run>
-	</ajc-test>
-	
-	<ajc-test dir="bugs1810/501656" title="generics exception">
-		<compile options="-1.8 -parameters" files="ApplicationException.java ApplicationExceptionHandler.java"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs1810/490315" title="indy">
-		<compile options="-1.8" files="FailingAspect.java SomeAnno.java SomeContext.java SomeCriteria.java SomeDTO.java SomeEnum.java SomePiece.java SomePropertyDTO.java SomeService.java SomeServiceImpl.java"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs1810/493554" title="pertarget">
-		<compile options="-1.8" files="Dep.java FooAspect.aj Cmd.java"/>
-		<run class="example.kusedep.Cmd"></run>
-	</ajc-test>
-
-	<ajc-test dir="bugs1810/ambig" title="ambiguous message - 18">
-		<compile options="-1.8" files="X.java"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs1810/ambig" title="ambiguous message - 17">
-		<compile options="-1.7" files="X.java"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs1810/502807" title="unexpected aioobe">
-		<compile options="-1.8" files="TestCollectors.java">
-		  <message kind="error" text="The method toList() in the type Collectors is not applicable for the arguments (Inner::getId)"/>
-		</compile>
-	</ajc-test>
-	
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1811/ajc1811.xml b/tests/src/test/java/org/aspectj/systemtest/ajc1811/ajc1811.xml
deleted file mode 100644
index fe59c3595..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc1811/ajc1811.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-
-	<ajc-test dir="bugs1811/parameterizedWithInner" title="parameterized with inner">
-		<compile options="-1.8" files="Code.java"/>
-	</ajc-test>
-	
-	<ajc-test dir="bugs1813/generics" title="generics">
-		<!-- this order works reliably -->
-		<compile options="-1.8 -showWeaveInfo" files="A.java AlreadyImplementsA.java BaseI.java BaseT.java BindInterfaceA.aj ConcreteIImpl.java ConcreteTImpl.java Runner.java">
-		<message kind="weave" text="Extending interface set for type 'AlreadyImplementsA' (AlreadyImplementsA.java) to include 'A&lt;ConcreteTImpl,ConcreteIImpl&gt;' (BindInterfaceA.aj)"/>
-		</compile>
-	
-		<!-- this order was failing -->
-		<compile options="-1.8 -showWeaveInfo" files="AlreadyImplementsA.java BaseI.java BaseT.java BindInterfaceA.aj ConcreteIImpl.java ConcreteTImpl.java A.java Runner.java ">
-		<message kind="weave" text="Extending interface set for type 'AlreadyImplementsA' (AlreadyImplementsA.java) to include 'A&lt;ConcreteTImpl,ConcreteIImpl&gt;' (BindInterfaceA.aj)"/>
-		</compile>
-		<run class="Runner">
-		<stdout>
-		<line text="ok"/>
-		</stdout>
-		</run>
-	</ajc-test>	
-
-	<ajc-test dir="bugs1811/509235" title="multiargs">
-		<compile options="-1.8" files="Code.java"/>
-		<run class="Code">
-			<stdout>
-				<line text="username = fooname"/>
-				<line text="username = barname"/>
-			</stdout>
-		</run>
-	</ajc-test>
-
-	<ajc-test dir="bugs1811/509235" title="multiargs - no ellipsis">
-		<compile options="-1.8" files="Code2.java"/>
-		<run class="Code2">
-			<stdout>
-				<line text="username = fooname"/>
-				<line text="username = barname"/>
-			</stdout>
-		</run>
-	</ajc-test>
-	
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc182/tests.xml b/tests/src/test/java/org/aspectj/systemtest/ajc182/tests.xml
deleted file mode 100644
index 9b7383810..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc182/tests.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-
-	<ajc-test dir="bugs182/440983" title="invis type annos">
-		<compile options="-1.8" files="Code.java"/>
-	</ajc-test>
-	
-	<ajc-test dir="bugs182/440983" title="invis type annos 2">
-		<compile options="-1.8" files="X.java" inpath="code.jar"/>
-		<run class="Code">
-		<stdout>
-			<line text="works"/>
-		</stdout>
-		</run>
-	</ajc-test>
-
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc183/ajc183.xml b/tests/src/test/java/org/aspectj/systemtest/ajc183/ajc183.xml
deleted file mode 100644
index e1c40ae72..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc183/ajc183.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-
-	<ajc-test dir="bugs183/443355" title="super calls">
-		<compile options="-1.8" files="Demo.java"/>
-		<run class="Demo">
-	        <stdout>
-	        <line text="HW"/>
-	        </stdout>
-	    </run>
-    </ajc-test>
-
-	<ajc-test dir="bugs183/436653/abstract" title="suppress type not found - abstract 2">
-		<compile options="-1.8 -Xlint:ignore" files="A.java" outjar="codeA.jar"/>
-		<compile options="-1.8" files="X.java AA.java" classpath="codeA.jar" outjar="aspects.jar"/>
-		<compile options="-1.8" files="Code.java" aspectpath="aspects.jar"/>
-		<run class="Code">
-		<stdout>
-		<!--
-		 These don't come out because AA is missing required type A in the last compile step
-		<line text="X.before"/>
-		<line text="X.before"/>
-		-->
-		<line text="Code.m()"/>
-		</stdout>
-		</run>
-    </ajc-test>
-    
-	<ajc-test dir="bugs183/436653/abstract" title="suppress type not found - abstract 1">
-		<compile options="-1.8 -Xlint:ignore" files="A.java" outjar="codeA.jar"/>
-		<compile options="-1.8" files="AA.java X.java" classpath="codeA.jar" outjar="aspects.jar"/>
-		<compile options="-1.8" files="Code.java" aspectpath="aspects.jar"/>
-		<run class="Code">
-		<stdout>
-		<!--
-		 These don't come out because AA is missing required type A in the last compile step.
-		 Difference between this test and the previous one is that this is a different order
-		 of aspects (addOrReplaceAspects called with the abstract aspect first here).
-		<line text="X.before"/>
-		<line text="X.before"/>
-		-->
-		<line text="Code.m()"/>
-		</stdout>
-		</run>
-    </ajc-test>
-    
-	<ajc-test dir="bugs183/436653" title="suppress type not found 4">
-		<compile options="-1.8 -Xlint:ignore" files="X.java" outjar="aspects.jar"/>
-		<compile options="-1.8" files="Runner.java"/>
-		<run class="Runner" ltw="aop.xml">
-	        <stdout>
-	        <line text="Code.m() running"/>
-	        </stdout>
-	    </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs183/436653" title="suppress type not found 5">
-		<compile options="-1.8 -Xlint:ignore" files="X.java" outjar="aspects.jar"/>
-		<compile class="-1.8" files="A.java"/>
-		<compile options="-1.8" files="Runner.java"/>
-		<run class="Runner" ltw="aop.xml">
-	        <stdout>
-	        <line text="x"/>
-	        <line text="Code.m() running"/>
-	        </stdout>
-	    </run>
-    </ajc-test>
-    
-    <!-- annotation style aspect, missing type so deactivated -->
-   	<ajc-test dir="bugs183/436653" title="suppress type not found 6">
-		<compile options="-1.8 -Xlint:ignore" files="AnnoX.java" outjar="aspects.jar"/>
-		<compile options="-1.8" files="Runner.java"/>
-		<run class="Runner" ltw="aop2.xml">
-	        <stdout>
-	        <line text="Code.m() running"/>
-	        </stdout>
-	    </run>
-    </ajc-test>
-    
-    <!-- annotation style aspect, type not missing so not deactivated -->
-    <ajc-test dir="bugs183/436653" title="suppress type not found 7">
-		<compile options="-1.8 -Xlint:ignore" files="AnnoX.java A.java" outjar="aspects.jar"/>
-		<compile options="-1.8" files="Runner.java"/>
-		<run class="Runner" ltw="aop2.xml">
-	        <stdout>
-	        <line text="x"/>
-	        <line text="Code.m() running"/>
-	        </stdout>
-	    </run>
-    </ajc-test>
-    
-    <!-- annotation style aspect, type not missing so not deactivated -->
-    <ajc-test dir="bugs183/436653" title="suppress type not found 8">
-		<compile options="-1.8 -Xlint:ignore" files="AnnoX.java A.java" outjar="aspects.jar"/>
-		<compile options="-1.8 -showWeaveInfo" files="Runner.java" aspectpath="aspects.jar">
-			<message kind="weave" text="Join point 'method-execution(void Code.m())' in Type 'Code' (Runner.java:8) advised by before advice from 'X' (aspects.jar!AnnoX.class(from AnnoX.java))"/>
-		</compile>
-		<run class="Runner">
-	        <stdout>
-	        <line text="x"/>
-	        <line text="Code.m() running"/>
-	        </stdout>
-	    </run>
-    </ajc-test>
-
-	<ajc-test dir="bugs183/436653" title="suppress type not found 3">
-		<compile options="-1.8" files="A.java" outjar="typeA.jar"/>
-		<compile options="-1.8" files="B.java" outjar="typeB.jar"/>
-		<!-- adviceDidNotMatch messages are suppressed here -->
-		<compile options="-1.8" files="XA3.java XCode.java" outjar="aspects.jar" classpath="typeA.jar"/>
-		<compile options="-1.8 -verbose" files="Code.java" classpath="typeA.jar" aspectpath="aspects.jar">
-			<!-- '*' is a hint that we care about only this message, not other messages. avoids needing to list them all -->
-			<message kind="info" text="*deactivating aspect 'XA2' as it requires type 'B' which cannot be found on the classpath"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs183/436653" title="suppress type not found 2">
-		<compile options="-1.8" files="A.java" outjar="typeA.jar"/>
-		<!-- adviceDidNotMatch messages are suppressed here -->
-		<compile options="-1.8" files="XA2.java XCode.java" outjar="aspects.jar" classpath="typeA.jar"/>
-		<compile options="-1.8" files="Code.java" aspectpath="aspects.jar">
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs183/436653" title="suppress type not found">
-		<compile options="-1.8" files="A.java" outjar="typeA.jar"/>
-		<!-- adviceDidNotMatch messages are suppressed here -->
-		<compile options="-1.8" files="XA.java XCode.java" outjar="aspects.jar" classpath="typeA.jar"/>
-		<compile options="-1.8" files="Code.java" aspectpath="aspects.jar">
-		  <message kind="error" text="can't determine modifiers of missing type A"/>
-		</compile>
-	</ajc-test>
-
-	<ajc-test dir="bugs183/445395" title="constant pool 0">
-		<compile options="-1.8" files="Code.java">
-		</compile>
-		<run class="Code">
-		<stdout>
-		<line text="4"/>
-		<line text="5"/>
-		<line text="6"/>
-		</stdout>
-		</run>
-	</ajc-test>
-
-	<ajc-test dir="bugs183/445395" title="constant pool">
-		<compile options="-1.8" files="ControlFlow.java ForReplacer.java ControlFlowCommand.java ControlFlowDriver.java">
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs183/444398" title="abstract aspect npe">
-		<compile options="-1.8" files="Bottom.java Middle.java Top.java">
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs183/442425" title="anno style decp">
-		<compile options="-1.8" files="EntityController.java IEntityController.java MyAnnotatedController.java EntityControllerAspect.java EntityMongoController.java">
-			<message kind="error" line="23" text="Type mismatch: cannot convert from MyAnnotatedController&lt;String&gt; to IEntityController&lt;String&gt;"/>
-			<message kind="error" line="30" text="Cannot infer type arguments for MyAnnotatedController&lt;&gt;"/>
-		</compile>
-		<!--
-		<run class="de.scrum_master.app.MyAnnotatedController">
-		<stdout>
-		<line text="Doing something"/>
-		<line text="public static void de.scrum_master.app.MyAnnotatedController.main(java.lang.String[])"/>
-		<line text="public void de.scrum_master.app.MyAnnotatedController.doSomething()"/>
-		<line text="public java.lang.Object de.scrum_master.app.MyAnnotatedController.getEntity()"/>
-		<line text="public void de.scrum_master.app.MyAnnotatedController.setEntity(java.lang.Object)"/>
-		<line text="Entity value = foo"/>
-		<line text="Entity value = 123"/>
-		</stdout>
-		</run>
-		-->
-	</ajc-test>
-	
-	<ajc-test dir="bugs183/443477" title="verifyerror">
-	  <compile options="-1.7" files="Coo.java"/>
-	  <run class="Coo"/>
-	</ajc-test>
-	
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc184/ajc184.xml b/tests/src/test/java/org/aspectj/systemtest/ajc184/ajc184.xml
deleted file mode 100644
index 3010ce169..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc184/ajc184.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-
-
-<ajc-test dir="bugs1612/pr239649" title="thisAspectInstance - 1">
-<compile files="One.java" options="-1.8"/>
-<run class="One">
-  <stdout>
-  <line text="In instance check method doit()"/>
-  <line text="In advice()"/>
-  <line text="Method m() running"/>
-  </stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr239649" title="thisAspectInstance - 2">
-<compile files="Two.java" options="-1.8"/>
-<run class="Two">
-  <stdout>
-  <line text="In instance check method, count=1 so doit returns false"/>
-  <line text="Method m() running"/>
-  <line text="In instance check method, count=2 so doit returns true"/>
-  <line text="In advice()"/>
-  <line text="Method m() running"/>
-  <line text="In instance check method, count=3 so doit returns false"/>
-  <line text="Method m() running"/>
-  <line text="In instance check method, count=4 so doit returns true"/>
-  <line text="In advice()"/>
-  <line text="Method m() running"/>
-  </stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr239649" title="thisAspectInstance - 3">
-<compile files="Three.java" options="-1.8"/>
-<run class="Three">
-  <stdout>
-  <line text="Method m() running"/>
-  <line text="In instance check method, count=1 so doit returns false"/>
-  <line text="Method m() running"/>
-  <line text="In instance check method, count=2 so doit returns true"/>
-  <line text="In advice()"/>
-  <line text="Method m() running"/>
-  <line text="In instance check method, count=3 so doit returns false"/>
-  <line text="Method m() running"/>
-  <line text="In instance check method, count=4 so doit returns true"/>
-  <line text="In advice()"/>
-  </stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr239649" title="thisAspectInstance - 4">
-<compile files="Four.java" options="-1.8"/>
-<run class="Four">
-  <stdout>
-  <line text="In instance check method doit()"/>
-  <line text="In advice() execution(void Four.m())"/>
-  <line text="Method m() running"/>
-  </stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr239649" title="thisAspectInstance - 5">
-<compile files="Five.java" options="-1.8"/>
-<run class="Five">
-  <stdout>
-  <line text="In instance check method doit()"/>
-  <line text="In advice() arg0=abc"/>
-  <line text="Method m() running"/>
-  </stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr239649" title="thisAspectInstance - 6">
-<compile files="Six.java" options="-1.8"/>
-<run class="Six">
-  <stdout>
-  <line text="In instance check method doit()"/>
-  <line text="In advice() execution(void Six.main(String[]))"/>
-  <line text="Method m() running"/>
-  </stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr239649" title="thisAspectInstance - 7">
-<compile files="Seven.java" options="-1.8"/>
-<run class="Seven">
-  <stdout>
-  <line text="In instance check method doit()"/>
-  <line text="In advice() call(void Seven.m()) execution(void Seven.main(String[]))"/>
-  <line text="Method m() running"/>
-  </stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr239649" title="thisAspectInstance - 8">
-<compile files="Eight.java" options="-1.8"/>
-<run class="Eight">
-  <stdout>
-  <line text="in doit(): class=X"/>
-  <line text="In advice()"/>
-  <line text="Method m() running"/>
-  </stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr239649" title="thisAspectInstance - 9">
-<compile files="Nine.java" options="-1.8"/>
-<run class="Nine">
-  <stdout>
-  <line text="in doit(): class=X"/>
-  <line text="In advice()"/>
-  <line text="Method m() running"/>
-  </stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr239649" title="thisAspectInstance - 10">
-<compile files="Ten.java" options="-1.8"/>
-<run class="com.foo.bar.Ten">
-  <stdout>
-  <line text="In instance check method doit() class=com.foo.bar.X"/>
-  <line text="In advice()"/>
-  <line text="Method m() running"/>
-  </stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr239649" title="thisAspectInstance - 11">
-<compile files="Eleven.java" options="-1.8">
-<message kind="error" text="thisAspectInstance can only be used inside an if() clause for singleton aspects (compiler limitation)"/>
-</compile>
-</ajc-test>
-
-<ajc-test dir="bugs184/449739" title="is final">
-<compile files="Code.java" options="-1.8"/>
-<run class="Code">
-  <stdout>
-  <line text="execution(void Code.run())"/>
-  </stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs184/449739" title="is final - 2">
-<compile files="Code2.java" options="-1.8"/>
-<run class="Code2">
-  <stdout>
-  <line text="execution(void Helper.run())"/>
-  </stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr239649" title="thisAspectInstance - 12">
-<compile files="Twelve.java" options="-1.8"/>
-<run class="Twelve">
-  <stdout>
-  <line text="In instance check method doit()"/>
-  <line text="In advice() arg=abc tjpsp=execution(void Twelve.m(String))"/>
-  <line text="Method m() running"/>
-  </stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr239649" title="thisAspectInstance - 13">
-<compile files="Thirteen.java" options="-1.8"/>
-<run class="Thirteen">
-  <stdout>
-  <line text="instance is X"/>
-  <line text="In advice() arg=abc tjpsp=execution(void Thirteen.m(String))"/>
-  <line text="Method m() running"/>
-  </stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr239649" title="thisAspectInstance - 14">
-<compile files="Fourteen.java" options="-1.8"/>
-<run class="Fourteen">
-  <stdout>
-  <line text="instance is X"/>
-  <line text="In advice()"/>
-  <line text="Method m() running"/>
-  </stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs1612/pr239649" title="thisAspectInstance - 15">
-<compile files="Fifteen.java" options="-1.8"/>
-<run class="Fifteen">
-  <stdout>
-  <line text="in doit(): class=X"/>
-  <line text="In advice()"/>
-  <line text="Method m() running"/>
-  </stdout>
-</run>
-</ajc-test>
-
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc185/ajc185.xml b/tests/src/test/java/org/aspectj/systemtest/ajc185/ajc185.xml
deleted file mode 100644
index 15fee4e84..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc185/ajc185.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-
-<ajc-test dir="bugs185/456357" title="unresolvable member">
-<compile files="DummyClass.java LogMe.java SampleAspect.java SampleUtil.java" options="-1.7">
-</compile>
-</ajc-test>
-
-<ajc-test dir="bugs185/455608" title="bad annos">
-<compile files="Code2.java" options="-1.8 -proceedOnError">
-  <message kind="error" text="String cannot be resolved to a variable"/>
-</compile>
-</ajc-test>
-
-<ajc-test dir="bugs185/455608" title="bad annos 2">
-<compile files="Code3.java" options="-1.8 -proceedOnError">
-  <message kind="error" text="String cannot be resolved to a variable"/>
-</compile>
-</ajc-test>
-
-<ajc-test dir="bugs185/451966" title="itd interface">
-<compile files="Code.java" options="-1.8"/>
-<run class="Code">
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs185/451966" title="itd interface - 2">
-<compile files="Code2.java" options="-1.8"/>
-<run class="Code2">
-</run>
-</ajc-test>
-
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc186/ajc186.xml b/tests/src/test/java/org/aspectj/systemtest/ajc186/ajc186.xml
deleted file mode 100644
index 4f1394a95..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc186/ajc186.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-
-<ajc-test dir="bugs186/lambdaBeans" title="lambda beans">
-<compile files="Foo.java Application.java" options="-1.8">
-</compile>
-</ajc-test>
-
-<ajc-test dir="bugs186/462821" title="missing method">
-<compile files="FooService.java AbstractLoggerAspect.java FooServiceLoggerAspect.java" options="-1.8">
-</compile>
-</ajc-test>
-
-<ajc-test dir="bugs186/romain" title="missing extends on generic target">
-<compile files="Code.java SubCode.java" options="-1.5" outjar="code.jar"/>
-<compile files="X.java Runner1.java" options="-1.5" inpath="code.jar"/>
-<run class="Runner1">
-<stdout>
-<line text="foo"/>
-</stdout>
-</run>
-</ajc-test>
-
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc187/ajc187.xml b/tests/src/test/java/org/aspectj/systemtest/ajc187/ajc187.xml
deleted file mode 100644
index dfa22f696..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc187/ajc187.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-
-<ajc-test dir="bugs187/476245" title="compile error">
-<compile files="Testing.java" options="-1.8"/>
-</ajc-test>
-
-<ajc-test dir="bugs187/307147" title="missing joinpoint">
-<compile files="Test.java TestAspect.aj ITDAspect.aj" options="-1.8"/>
-<run class="test.Test">
-<stdout>
-<line text="Around call(void test.Test.function())"/>
-<line text="Normal function"/>
-<line text="Around call(void test.Test.privateMethod())"/>
-<line text="private method"/>
-<line text="Around call(void test.Test.publicMethod())"/>
-<line text="public method"/>
-<line text="Around call(void test.Test.itdFunction())"/>
-<line text="ITD function"/>
-<line text="Around call(void test.Test.privateMethod())"/>
-<line text="private method"/>
-<line text="Around call(void test.Test.publicMethod())"/>
-<line text="public method"/>
-</stdout></run>
-</ajc-test>
-
-<ajc-test dir="bugs187/307147_2" title="missing joinpoint 2">
-<compile files="Test.java TestAspect.aj ITDAspect.aj" options="-1.8"/>
-<run class="test.Test">
-<stdout>
-<line text="ITD function"/>
-<line text="Around call(void test.Test.privateMethod(String))"/>
-<line text="Captured Foo"/>
-<line text="hello FOO"/>
-</stdout></run>
-</ajc-test>
-
-<ajc-test dir="bugs187/475152" title="infinite loop">
-<compile files="AbstractAspect.aj, BaseAspect.aj, TestClass.java, AjTarget.java, TestAspect.aj" options="-1.8"/>
-</ajc-test>
-
-<ajc-test dir="bugs187/469889" title="broken java">
-<!-- 
-<compile files="A.java B.java AbstractA.java BImpl.java Main.java" options="-1.8"/>
--->
-<compile files="Code.java" options="-1.8"/>
-<run class="Code">
-<stdout>
-<line text="B"/>
-</stdout>
-</run>
-</ajc-test>
-
-
-<ajc-test dir="bugs187/470633" title="lambda">
-<compile files="Maps.java" options="-1.8"/>
-</ajc-test>
-
-<ajc-test dir="bugs187/474165" title="anno conversion">
-<compile files="B.java" options="-XhasMember -1.8 -showWeaveInfo">
-<message kind="weave" text="Extending interface set for type 'B' (B.java) to include 'java.io.Serializable' (B.java)"/>
-</compile>
-<run class="B"></run>
-</ajc-test>
-
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc188/ajc188.xml b/tests/src/test/java/org/aspectj/systemtest/ajc188/ajc188.xml
deleted file mode 100644
index 685b50240..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc188/ajc188.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-
-
-   <ajc-test dir="bugs188/485055" title="classcast">
-     <compile files="AspectWithConstant.aj" options="-1.5"/>
-     <run class="AspectWithConstant">
-     <stdout>
-     <line text="MAXS=hello"/>
-     <line text="@AspectWithConstant$Loggable()"/>
-     </stdout></run>
-   </ajc-test>
-   
-<ajc-test dir="bugs188/484941" title="annotation discovery npe">
-<compile files="Test2.java" options="-1.8 -XnoInline"/>
-</ajc-test>
-
-<ajc-test dir="bugs188/defaultmethods" title="default methods 1">
-<compile files="Code.java" options="-1.8 -XnoInline"/>
-<run class="Code">
-<stdout>
-<line text="a"/>
-<line text="b"/>
-</stdout>
-</run>
-</ajc-test>
-
-
-<ajc-test dir="bugs188/defaultmethods" title="default methods 2">
-<compile files="Code2.java" options="-1.8"/>
-<run class="Code2">
-<stdout>
-<line text="a"/>
-<line text="b"/>
-</stdout>
-</run>
-</ajc-test>
-
-<ajc-test dir="bugs188/478003" title="compile error">
-<compile files="OrientDBKeyIO.java" options="-1.8"/>
-</ajc-test>
-
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc189/ajc189.out.xml b/tests/src/test/java/org/aspectj/systemtest/ajc189/ajc189.out.xml
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc189/ajc189.xml b/tests/src/test/java/org/aspectj/systemtest/ajc189/ajc189.xml
deleted file mode 100644
index 8693c1e24..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc189/ajc189.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-
-	<ajc-test dir="bugs189/433351" title="jar weaving">
-		<compile options="-1.5" files="InterfaceProj1.java" outjar="code.jar"/>
-		<compile options="-1.5 -showWeaveInfo" inpath="code.jar" files="Extender.aj InterfaceProj2.java">
-		<message kind="weave" text="Extending interface set for type 'test.InterfaceProj1' (InterfaceProj1.java) to include 'test.extender.InterfaceProj2' (Extender.aj)"/>
-		</compile>
-	</ajc-test>
-
-	<ajc-test dir="bugs189/433351" title="jar weaving 2">
-		<compile options="-1.5" files="InterfaceProj1.java ClassProj1.java" outjar="code.jar"/>
-		<compile options="-1.5 -showWeaveInfo" inpath="code.jar" files="Extender2.aj" outjar="code2.jar">
-		<message kind="weave" text="Extending interface set for type 'test.InterfaceProj1' (InterfaceProj1.java) to include 'java.io.Serializable' (Extender2.aj)"/>
-		</compile>
-	</ajc-test>
-
-	<ajc-test dir="bugs189/433351" title="jar weaving 3">
-		<compile options="-1.5" files="InterfaceProj1.java ClassProj1.java" outjar="code.jar"/>
-		<compile options="-1.5 -showWeaveInfo" inpath="code.jar" files="Extender3.aj InterfaceProj2.java ClassProj2.java" outjar="code2.jar">
-		<message kind="weave" text="Setting superclass of type 'test.ClassProj1' (ClassProj1.java) to 'test.extender.ClassProj2' (Extender3.aj)"/>
-		<message kind="weave" text="Extending interface set for type 'test.InterfaceProj1' (InterfaceProj1.java) to include 'test.extender.InterfaceProj2' (Extender3.aj)"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs189/433351" title="jar weaving 4">
-		<compile options="-1.5" files="ClassProj1.java InterfaceProj1.java" outjar="code.jar"/>
-		<compile options="-1.5 -showWeaveInfo" inpath="code.jar" files="Extender2.aj" outjar="code2.jar">
-		<message kind="weave" text="Extending interface set for type 'test.InterfaceProj1' (InterfaceProj1.java) to include 'java.io.Serializable' (Extender2.aj)"/>
-		</compile>
-	</ajc-test>
-	
-<ajc-test dir="bugs189/485583" title="NPE at aspectj">
-  <compile files="Foo.aj Bar.aj" options="-1.8">
-  <message kind="error" text="The abstract pointcut deprecatedCode can only be defined in an aspect"/>
-  </compile>
-</ajc-test>
-
-<ajc-test dir="bugs189/486612" title="lost bounds">
-  <compile files="Code.java Azpect.java" options="-1.8"/>
-</ajc-test>
-
-
-<ajc-test dir="bugs189/486203" title="while npe">
-<compile files="While.java" options="-1.8"/>
-</ajc-test>
-
-<ajc-test dir="bugs189/352389" title="overweaving">
-
-	<compile files="A.java Code.java" outjar="one.jar" options="-1.8 -showWeaveInfo">
-		<message kind="weave" text="Join point 'method-execution(void Code.m())' in Type 'Code' (Code.java:6) advised by before advice from 'A' (A.java:2)"/>
-	</compile>
-	<run class="Code" classpath="$sandbox/one.jar">
-		<stdout>
-		<line text="a"/>
-		</stdout>
-	</run>
-
-	<!-- The non overweaving case would look like this -->
-	<compile files="B.java" inpath="one.jar" options="-1.8 -showWeaveInfo" outjar="two.jar">
-		<message kind="weave" text="Join point 'method-execution(void Code.m())' in Type 'Code' (Code.java:6) advised by before advice from 'B' (B.java:2)"/>
-		<message kind="weave" text="Join point 'method-execution(void Code.m())' in Type 'Code' (Code.java:6) advised by before advice from 'A' (one.jar!A.class:2(from A.java))"/>
-	</compile>
-	
-	<!-- With overweaving it looks like the advice from A isn't applying but it just isn't applying during this weave step, it
-	     remains in the bytecode applied from before. -->
-	<compile files="B.java" inpath="one.jar" options="-1.8 -Xset:pipelineCompilation=false{overWeaving=true -showWeaveInfo" outjar="two.jar">
-		<message kind="warning" text="advice defined in A has not been applied [Xlint:adviceDidNotMatch]"/>
-		<message kind="weave" text="Join point 'method-execution(void Code.m())' in Type 'Code' (Code.java:6) advised by before advice from 'B' (B.java:2)"/>
-	</compile>
-	<!-- Note: with overweaving output is b>a  without overweaving it is a>b -->
-	<run class="Code" classpath="$sandbox/two.jar">
-		<stdout>
-		<line text="b"/>
-		<line text="a"/>
-		</stdout>
-	</run>
-
-	<compile files="C.java" inpath="two.jar" options="-1.8 -Xset:overWeaving=true -showWeaveInfo" outjar="three.jar">
-		<message kind="warning" text="advice defined in A has not been applied [Xlint:adviceDidNotMatch]"/>
-		<message kind="warning" text="advice defined in B has not been applied [Xlint:adviceDidNotMatch]"/>
-		<message kind="weave" text="Join point 'method-execution(void Code.m())' in Type 'Code' (Code.java:6) advised by before advice from 'C' (C.java:2)"/>
-	</compile>
-	<!-- 
-	<compile files="C.java" inpath="two.jar" options="-1.8 -showWeaveInfo" outjar="three.jar">
-		<message kind="weave" text="Join point 'method-execution(void Code.m())' in Type 'Code' (Code.java:6) advised by before advice from 'C' (C.java:2)"/>
-		<message kind="weave" text="Join point 'method-execution(void Code.m())' in Type 'Code' (Code.java:6) advised by before advice from 'B' (two.jar!B.class:2(from B.java))"/>
-		<message kind="weave" text="Join point 'method-execution(void Code.m())' in Type 'Code' (Code.java:6) advised by before advice from 'A' (two.jar!A.class:2(from A.java))"/>
-	</compile>
-	-->
-	<!-- Note: with overweaving c>b>a  but without overweaving a>b>c -->
-	<run class="Code" classpath="$sandbox/three.jar">
-		<stdout>
-		<line text="c"/>
-		<line text="b"/>
-		<line text="a"/>
-		</stdout>
-	</run>
-</ajc-test>
-
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc190/Annotations.java b/tests/src/test/java/org/aspectj/systemtest/ajc190/Annotations.java
index b2f8c267e..d573a4d33 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc190/Annotations.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc190/Annotations.java
@@ -28,7 +28,7 @@ public class Annotations extends XMLBasedAjcTestCase {
 	}
 
 	protected File getSpecFile() {
-		return new File("../tests/src/org/aspectj/systemtest/ajc190/ajc190_from150.xml");
+        return getClassResource("ajc190_from150.xml");
 	}
 
 	public void testCompilingAnnotation() {
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc190/ajc190.xml b/tests/src/test/java/org/aspectj/systemtest/ajc190/ajc190.xml
deleted file mode 100644
index d6507dace..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc190/ajc190.xml
+++ /dev/null
@@ -1,216 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-
-
-  <ajc-test dir="bugs190/paramannos" title="param annos negative">
-    <compile files="Code.java" options="-1.9 -showWeaveInfo">
-    		<message kind="weave" text="Join point 'constructor-execution(void Code.&lt;init&gt;(java.lang.Object))' in Type 'Code' (Code.java:8) advised by before advice from 'X' (Code.java:12)"/>
-	</compile>
-  </ajc-test>
-
-
-  <ajc-test dir="bugs190/modules/aaa" title="build a module">
-    <compile files="module-info.java com/foo1/C1.java" options="-1.9"/>
-  </ajc-test>
-
-  <ajc-test dir="bugs190/modules/bbb" title="run a module - classpath">
-    <compile files="module-info.java aaa/bbb/A.java" options="-1.9"/>
-    <run class="aaa.bbb.A">
-    <stdout>
-    <line text="A running"/>
-    </stdout>
-    </run>
-  </ajc-test>
-
-  <ajc-test dir="bugs190/modules/bbb" title="run a module - modulepath">
-    <compile files="module-info.java aaa/bbb/A.java" options="-1.9"/>
-    <run modulepath="$sandbox" module="my.module/aaa.bbb.A">
-    <stdout>
-    <line text="A running"/>
-    </stdout>
-    </run>
-  </ajc-test>
-  
-  <ajc-test dir="bugs190/modules/bbb" title="package and run a module - modulepath">
-    <compile files="module-info.java aaa/bbb/A.java" options="-1.9" outjar="my.module.jar"/>
-   	<file deletefile="module-info.java"/>
-    <file deletefile="aaa"/>
-    <run modulepath="my.module.jar" module="my.module/aaa.bbb.A">
-    <stdout>
-    <line text="A running"/>
-    </stdout>
-    </run>
-   </ajc-test>
-  
-  <ajc-test dir="bugs190/modules/ccc" title="compile regular code using module code">
-    <compile files="module-info.java aaa/bbb/A.java" options="-1.9" outjar="modules/my.module.jar"/>
-    <file deletefile="module-info.java"/>
-    <file deletefile="aaa"/>
-    <compile files="InvokeA.java" options="-1.9" modulepath="$sandbox/modules/my.module.jar"/>
-  </ajc-test>
-  
-  <ajc-test dir="bugs190/modules/ddd" title="compile regular code using module code that isn't visible">
-    <compile files="module-info.java aaa/bbb/A.java" options="-1.9" outjar="modules/my.module.jar"/>
-    <compile files="InvokeA.java" options="-1.9" modulepath="$sandbox/modules/my.module.jar">
-		<message kind="error" text="package aaa.bbb is not visible"/>
-    </compile>
-  </ajc-test>
-
-
-  <ajc-test dir="bugs190/modules/eee" title="binary weaving module">
-    <compile files="module-info.java aaa/bbb/A.java" options="-1.9" outjar="my.module.jar"/>
-    <file deletefile="module-info.java"/>
-    <file deletefile="aaa"/>
-    <compile files="Azpect.java" inpath="my.module.jar" outjar="my.module.woven.jar"/>
-    <run modulepath="my.module.woven.jar" module="my.module/aaa.bbb.A">
-      <stdout>
-      <line text="Azpect running"/>
-      <line text="A running"/>
-      </stdout>
-    </run>
-  </ajc-test>
-
-
-  <ajc-test dir="bugs190/520135" title="funny signature with method reference">
-    <compile files="FailsApectJ.java" options="-1.8"/>
-  </ajc-test>
-
-  <ajc-test dir="bugs190/modules/fff" title="compile module including aspects">
-    <compile files="module-info.java pkg/Demo.java otherpkg/Azpect.java" modulepath="$runtime" outjar="demomodule.jar" options="-1.9"/>
-    <run modulepath="$runtime:demomodule.jar" module="demo/pkg.Demo">
-      <stdout>
-      <line text="Azpect running"/>
-      <line text="Demo running"/>
-      </stdout>
-    </run>
-  </ajc-test>
-  
-  <ajc-test dir="bugs190/modules/eee" title="compile module and apply aspects via aspectpath">
-    <compile files="module-info.java aaa/bbb/A.java" options="-1.9" outjar="my.module.jar"/>
-    <file deletefile="module-info.java"/>
-    <file deletefile="aaa"/>
-    <compile files="Azpect.java" outjar="azpects.jar" options="-1.4"/>
-    <compile options="-showWeaveInfo" inpath="my.module.jar" aspectpath="azpects.jar" outjar="my.module.woven.jar">
-    		<message kind="weave" text="Join point 'method-execution(void aaa.bbb.A.main(java.lang.String[]))' in Type 'aaa.bbb.A' (A.java:4) advised by before advice from 'aspects.Azpect' (azpects.jar!Azpect.class:4(from Azpect.java))"/>    
-    </compile>
-    <file deletefile="my.module.jar"/>
-    <run classpath="my.module.woven.jar:azpects.jar" class="aaa.bbb.A">
-      <stdout>
-      <line text="Azpect running"/>
-      <line text="A running"/>
-      </stdout>
-    </run>
-  </ajc-test>
-  
-  <ajc-test dir="bugs190/modules/ggg" title="module path vs classpath 1">
-    <!-- build some simple code into a jar we can depend on *not a module* -->
-    <compile files="ddd/D.java" options="-1.9" outjar="foo.jar"/>
-    <file deletefile="ddd/D.java"/>
-    <!-- compile a module that depends on that -->
-    <!-- this fails because if you start working with modules you commit to the modules story and classpath
-         becomes irrelevant -->
-    <compile files="module-info.java aaa/bbb/A.java" options="-1.9" outjar="module.jar" classpath="foo.jar">
-    <message kind="error" text="The import ddd cannot be resolved"/>
-    <message kind="error" text="D cannot be resolved"/>
-    </compile>
-  </ajc-test>
-  
-  <ajc-test dir="bugs190/modules/hhh" title="module path vs classpath 2">
-    <!-- build some simple code into a jar we can depend on *not a module* -->
-    <file renamefrom="module-info-a.java" renameto="module-info.java"/>
-    <compile files="module-info.java ddd/D.java" options="-1.9" outjar="my.module.a.jar"/>
-    <!-- 
-    <file renamefrom="module-info-b.java" renameto="module-info.java"/>
-    <compile files="module-info.java aaa/bbb/A.java" options="-1.9" outjar="my.module.b.jar" modulepath="my.module.a.jar"/>
-     -->
-  </ajc-test>
-  
-  <ajc-test dir="bugs190/modules/iii" title="compile use of java.xml.bind">
-    <compile files="UsesJAXB.java" options="--add-modules java.xml.bind -1.9"/>
-    <run class="UsesJAXB" vmargs="--add-modules java.xml.bind">
-      <stdout>
-      <line text="UsesJAXB.running..."/>
-      </stdout>
-    </run>
-  </ajc-test>
-    
-  <ajc-test dir="bugs190/modules/iii" title="weave use of java.xml.bind">
-    <compile files="UsesJAXB.java Azpect.java" options="--add-modules java.xml.bind -1.9"/>
-    <run class="UsesJAXB" vmargs="--add-modules java.xml.bind">
-      <stdout>
-      <line text="UsesJAXB.running..."/>
-      <line text="null"/>
-      </stdout>
-    </run>
-  </ajc-test>
-  
-  <ajc-test dir="bugs190/modules/iii" title="limit modules 1">
-    <compile files="UsesJAXB.java Azpect.java" options="--limit-modules java.xml.bind -1.9"/>
-    <run class="UsesJAXB" vmargs="--limit-modules java.xml.bind">
-      <stdout>
-      <line text="UsesJAXB.running..."/>
-      <line text="null"/>
-      </stdout>
-    </run>
-  </ajc-test>
-  
-  <ajc-test dir="bugs190/modules/iii" title="add reads 1">
-    <compile files="UsesJAXB.java Azpect.java" options="--add-reads java.sql=java.xml.bind --add-modules java.sql -1.9"/>
-    <run class="UsesJAXB" vmargs="--add-modules java.xml.bind ">
-      <stdout>
-      <line text="UsesJAXB.running..."/>
-      <line text="null"/>
-      </stdout>
-    </run>
-  </ajc-test>
-  
-  <!-- 
-    <compile files="module-info.java aaa/bbb/A.java" options="-1.9" outjar="module.jar" aspectpath="foo.jar"/>
-    <compile files="module-info.java aaa/bbb/A.java" options="-1.9" outjar="my.module.jar"/>
-    <file deletefile="module-info.java"/>
-    <file deletefile="aaa"/>
-    <compile files="Azpect.java" outjar="azpects.jar"/>
-    <compile options="-showWeaveInfo" inpath="my.module.jar" aspectpath="azpects.jar" outjar="my.module.woven.jar">
-    		<message kind="weave" text="Join point 'method-execution(void aaa.bbb.A.main(java.lang.String[]))' in Type 'aaa.bbb.A' (A.java:4) advised by before advice from 'aspects.Azpect' (azpects.jar!Azpect.class:4(from Azpect.java))"/>    
-    </compile>
-    <file deletefile="my.module.jar"/>
-    <run classpath="my.module.woven.jar:azpects.jar" class="aaa.bbb.A">
-      <stdout>
-      <line text="Azpect running"/>
-      <line text="A running"/>
-      </stdout>
-    </run>
-  </ajc-test>
-     -->
-  
-  <ajc-test dir="bugs190/modules" title="weave module">
-    <compile files="aspect1/Azpect1.java" inpath="module1/module-one.jar" outjar="runner.jar" options="-1.8"/>
-    <java classpath="runner.jar" class="a.b.c.Code"/>
-  </ajc-test>
-  
-  <ajc-test dir="bugs190/various" title="setting static final outside clinit">
-	  <compile files="Code.java" options="-1.9"/>
-	  <run class="Code">
-	  <stdout>
-	  <line text="call(void java.io.PrintStream.println(String))"/>
-	  <line text="running"/>
-	  </stdout>
-	  </run>
-  </ajc-test>
-
-	<!-- from ajc153 -->
-    <ajc-test dir="bugs153/pr156962" title="Test Annot Method Has Member 1">
-      <compile files="Sample.java, LiftDeprecation.aj" options="-1.9 -XhasMember -showWeaveInfo -Xlint:ignore">
-        <message kind="weave" text="'Sample' (Sample.java:1) is annotated with @Deprecated type annotation from 'LiftDeprecation' (LiftDeprecation.aj:2)"/>
-      </compile>
-    </ajc-test>
-
-	<!-- from ajc153 -->
-    <ajc-test dir="bugs153/pr156962" title="Test Annot Method Has Member 2">
-      <compile files="Sample.java, LiftDeprecation.aj" options="-1.8 -XhasMember -showWeaveInfo -Xlint:ignore">
-        <message kind="weave" text="'Sample' (Sample.java:1) is annotated with @Deprecated type annotation from 'LiftDeprecation' (LiftDeprecation.aj:2)"/>
-      </compile>
-    </ajc-test>
-
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc190/ajc190_from150.xml b/tests/src/test/java/org/aspectj/systemtest/ajc190/ajc190_from150.xml
deleted file mode 100644
index 24d683928..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc190/ajc190_from150.xml
+++ /dev/null
@@ -1,6290 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<!-- AspectJ v1.5.0 Tests -->
-<suite>
-
-    <ajc-test dir="bugs150" title="abstract perthis in @AspectJ">
-        <compile files="pr121197.aj" options="-1.9"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" title="different numbers of type vars">
-        <compile files="pr121575.aj" options="-1.9"/>
-        <run class="pr121575"/>
-    </ajc-test>
-
-    
-    <ajc-test dir="bugs150/pr121385" title="mixing aspect styles">
-        <compile files="A.java" options="-1.9"/>
-        <run class="A"/>
-    </ajc-test>
-    
-    <ajc-test dir="java5/generics/tvars" title="different numbers of type vars - 2">
-        <compile files="Case1.aj" options="-1.9 -showWeaveInfo">
-          <message kind="weave" text="Join point 'method-execution(void MyClass.read(java.lang.String))' in Type 'MyClass' (Case1.aj:13) advised by before advice from 'MyAspect' (Case1.aj:5)"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/generics/tvars" title="different numbers of type vars - 3">
-        <compile files="Case2.aj" options="-1.9 -showWeaveInfo">
-          <message kind="weave" text="Join point 'method-execution(void MyClass.read(java.lang.Number))' in Type 'MyClass' (Case2.aj:13) advised by before advice from 'MyAspect' (Case2.aj:5)"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/generics/tvars" title="different numbers of type vars - 4">
-        <compile files="Case3.aj" options="-1.9 -showWeaveInfo">
-          <message kind="error" line="9" text="The type MyClass&lt;T,E&gt; must implement the inherited abstract method MyInterface&lt;T&gt;.read(T)"/>
-        </compile>
-    </ajc-test>
-
-
-    <ajc-test dir="bugs150" title="access to private ITD from nested type">
-        <compile files="pr118698.aj"/>
-        <run class="pr118698"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" title="modifier overrides">
-       <compile files="pr119749.aj" options="-1.9">
-        	<message kind="warning" line="26" text="C E.*()"/>
-        	<message kind="warning" line="25" text="D E.*()"/>
-        	<message kind="warning" line="17" text="aa @Me void m()"/>
-        	<message kind="warning" line="17" text="aa void m() throws Exception"/>
-        	<message kind="warning" line="17" text="aa * *(..) throws Exception"/>
-        	<message kind="warning" line="37" text="aa call void m() throws Exception"/>
-        	<message kind="warning" line="38" text="aa call void m() throws Exception"/>
-       </compile>
-        <run class="pr119749">
-            <stdout>
-             <line text="execution(void pr119749.C.m()): execMe[Me]"/>
-             <line text="execution(void pr119749.C.m()): execEx"/>
-            </stdout>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr120826" pr="120826" title="varargs NPE">
-     <compile files="TestVarargs.java" options="-1.9"/>
-    </ajc-test> 
-    
-
-    <ajc-test dir="bugs150/pr112476/case1" title="binary weaving decp broken">
-        <compile files="lib/A.java,lib/B.java,lib/C.java" outjar="library.jar" options="-1.9"/>
-        <!-- library.jar on the aspectpath here just for resolution when compiling SuperC -->
-        <compile aspectpath="library.jar" files="weaved/SuperC.java" outjar="newsuper.jar" options="-1.9"/>
-        <compile inpath="library.jar;newsuper.jar" files="weaved/DeclareAspect.aj" options="-1.9 -showWeaveInfo">
-          <message kind="weave" text="Setting superclass of type 'lib.C' (C.java) to 'weaved.SuperC' (DeclareAspect.aj)"/>
-        </compile>
-        <run class="weaved.SuperC">
-          <stdout>
-             <line text="Is [class lib.C] subcass of [class weaved.SuperC]? true"/>
-          </stdout>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr114005" title="Annotated ITDFs - 1">
-      <compile files="Declaration1.java" options="-1.9"/>
-      <run class="Declaration1">
-        <stdout>
-          <line text="public java.lang.String Test.firstProperty has annotation:true"/>
-          <line text="public java.lang.String Test.secondProperty has annotation:true"/>
-        </stdout>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" pr="114495" title="parameterized pointcut and advice">
-    		<compile files="Pr114495.aj" options="-1.9">
-    			<message kind="warning" line="3" text="going()"/>
-    		</compile>
-    		<run class="Pr114495">
-    			<stdout>
-    				<line text="A.going()"/>
-    				<line text="AA.going()"/>
-    			</stdout>
-    		</run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" pr="112880" title="double parameter generic abstract type">
-    	  <compile files="Pr112880.aj" options="-1.9">
-    	  </compile>
-    	  <run class="Pr112880">
-    	  	<stdout>
-    	  		<line text="method returning C1 or C2"/>
-    	  		<line text="method returning C1 or C2"/>
-    	  	</stdout>
-    	  </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr114005" title="Annotated ITDFs - 2">
-      <compile files="Declaration2.java" options="-1.9"/>
-      <run class="Declaration2">
-        <stdout>
-          <line text="public java.lang.String Test.firstProperty has annotation:true"/>
-          <line text="public java.lang.String Test.secondProperty has annotation:true"/>
-        </stdout>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" pr="114054" title="pertarget and negated pointcut">
-     <compile files="Pr114054.aj" options=""/>
-     <run class="Pr114054"/>
-    </ajc-test>  
-    
-    <ajc-test dir="bugs150" pr="121385" title="mixing styles">
-     <compile files="pr121385.aj" options="-1.9"/>
-    </ajc-test> 
-        
-    <ajc-test dir="java5/decps" title="decps - 1">
-     <compile files="Basic1.java" options="-1.9"/>
-     <run class="Basic1"/>
-    </ajc-test>  
-
-    <ajc-test dir="java5/decps" title="decps - 1b">
-     <compile files="Basic1b.java" options="-1.9"/>
-     <run class="Basic1b"/>
-    </ajc-test>   
-    
-    <ajc-test dir="java5/decps" title="decps - 2">
-     <compile files="Basic2.java" options="-1.9 -showWeaveInfo">
-       <message kind="weave" text="Join point 'method-execution(void X$I.m2())' in Type 'X' (Basic2.java:15) advised by before advice from 'X' (Basic2.java:23)"/>
-       <message kind="weave" text="Type 'X$I' (Basic2.java) has intertyped method from 'X' (Basic2.java:'void X$I.m2()')"/>
-       <message kind="weave" text="Extending interface set for type 'Basic2' (Basic2.java) to include 'X$I' (Basic2.java)"/>
-       <message kind="weave" text="Type 'Basic2' (Basic2.java) has intertyped method from 'X' (Basic2.java:'void X$I.m2()')"/>
-       <message kind="weave" text="Join point 'method-execution(void Basic2.main(java.lang.String[]))' in Type 'Basic2' (Basic2.java:2) advised by before advice from 'X' (Basic2.java:23)"/>
-     </compile>
-     <run class="Basic2"/>
-    </ajc-test>  
-
-    <ajc-test dir="java5/decps" title="decps - 2b">
-     <compile files="Basic2b.java" options="-1.9 -showWeaveInfo">
-       <message kind="weave" text="Join point 'method-execution(void X$IIimpl.m2())' in Type 'X$IIimpl' (Basic2b.java:18) advised by before advice from 'X' (Basic2b.java:27)"/>
-       <message kind="weave" text="Extending interface set for type 'Basic2b' (Basic2b.java) to include 'X$I' (Basic2b.java)"/>
-       <message kind="weave" text="Join point 'method-execution(void Basic2b.main(java.lang.String[]))' in Type 'Basic2b' (Basic2b.java:4) advised by before advice from 'X' (Basic2b.java:27)"/>
-     </compile>
-     <run class="Basic2b"/>
-    </ajc-test>  
-    
-    <ajc-test dir="java5/decps" title="decps - 3">
-     <compile files="Basic3.java" options="-1.9 -showWeaveInfo">
-       <message kind="weave" text="Extending interface set for type 'Basic3' (Basic3.java) to include 'X$I' (Basic3.java)"/>
-       <message kind="weave" text="Type 'Basic3' (Basic3.java) has intertyped method from 'X' (Basic3.java:'void X$I.m2()')"/>
-       <message kind="weave" text="Type 'Basic3' (Basic3.java) has intertyped method from 'X' (Basic3.java:'void X$I.m3()')"/>
-	   <message kind="weave" text="Type 'Basic3' (Basic3.java) has intertyped method from 'X' (Basic3.java:'void X$I.m4()')"/>
-	   <message kind="weave" text="Join point 'method-call(void X$I.m2())' in Type 'Basic3' (Basic3.java:7) advised by before advice from 'X' (Basic3.java:29)"/>
-	   <message kind="weave" text="Join point 'method-call(void X$I.m3())' in Type 'Basic3' (Basic3.java:8) advised by before advice from 'X' (Basic3.java:29)"/>
-	   <message kind="weave" text="Join point 'method-call(void X$I.m2())' in Type 'Basic3' (Basic3.java:9) advised by before advice from 'X' (Basic3.java:29)"/>
-	   <message kind="weave" text="Join point 'method-call(void X$I.m4())' in Type 'Basic3' (Basic3.java:10) advised by before advice from 'X' (Basic3.java:29)"/>
-	   <message kind="weave" text="Type 'X$I' (Basic3.java) has intertyped method from 'X' (Basic3.java:'void X$I.m2()')"/>
-	   <message kind="weave" text="Type 'X$I' (Basic3.java) has intertyped method from 'X' (Basic3.java:'void X$I.m3()')"/>
-	   <message kind="weave" text="Type 'X$I' (Basic3.java) has intertyped method from 'X' (Basic3.java:'void X$I.m4()')"/>
-	 </compile>
-     <run class="Basic3"/>
-    </ajc-test>  
-
-    <ajc-test dir="java5/decps" title="decps - 3b">
-     <compile files="Basic3b.java" options="-1.9 -showWeaveInfo">
-       <message kind="weave" text="Extending interface set for type 'Basic3b' (Basic3b.java) to include 'X$I' (Basic3b.java)"/>
-       <message kind="weave" text="Type 'Basic3b' (Basic3b.java) has intertyped method from 'X' (Basic3b.java:'void X$I.m2()')"/>
-       <message kind="weave" text="Type 'Basic3b' (Basic3b.java) has intertyped method from 'X' (Basic3b.java:'void X$I.m3()')"/>
-	   <message kind="weave" text="Type 'Basic3b' (Basic3b.java) has intertyped method from 'X' (Basic3b.java:'void X$I.m4()')"/>
-	   <message kind="weave" text="Join point 'method-call(void X$I.m2())' in Type 'Basic3b' (Basic3b.java:7) advised by before advice from 'X' (Basic3b.java:35)"/>
-	   <message kind="weave" text="Join point 'method-call(void X$I.m3())' in Type 'Basic3b' (Basic3b.java:8) advised by before advice from 'X' (Basic3b.java:35)"/>
-	   <message kind="weave" text="Join point 'method-call(void X$I.m2())' in Type 'Basic3b' (Basic3b.java:9) advised by before advice from 'X' (Basic3b.java:35)"/>
-	   <message kind="weave" text="Join point 'method-call(void X$I.m4())' in Type 'Basic3b' (Basic3b.java:10) advised by before advice from 'X' (Basic3b.java:35)"/>
-	 </compile>
-     <run class="Basic3b"/>
-    </ajc-test>   
-    
-    <ajc-test dir="java5/decps" title="decps - 3c">
-     <compile files="Basic3c.java" options="-1.9">
-       <message kind="error" text="@DeclareParents: defaultImpl=&quot;X$IImpl&quot; has a no argument constructor, but it is of incorrect visibility"/>
-	 </compile>
-    </ajc-test>  
-        
-    <ajc-test dir="bugs150/pr119570" pr="119570" title="spurious override method warning">
-     <compile files="NodeImpl.java,INode.java,ParameterizedDP.java" options="-1.9"/>
-     <run class="bugs.ParameterizedDP"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr119570" pr="119570" title="spurious override method warning - 2">
-     <compile files="ParameterizedDP.java,NodeImpl.java,INode.java" options="-1.9"/>
-     <run class="bugs.ParameterizedDP"/>
-    </ajc-test>  
-    
-    <ajc-test dir="bugs150/pr119570" pr="119570" title="spurious override method warning - 3">
-     <compile files="SimpleTest.java" options="-1.9"/>
-     <run class="SimpleTest"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs150/pr120521" pr="120521" title="named pointcut not resolved in pertarget pointcut">
-     <compile files="PerTargetSubaspectError.java"/>
-    </ajc-test>  
-
-    <ajc-test dir="bugs150/pr119210" pr="119210" title="autoboxing around advice - 1">
-     <compile files="TestLib.java,ThreadAspectLib.java" options="-1.9"/>
-     <run class="TestLib">
-       <stderr>
-          <line text="obtaining five, got 3"/>
-       </stderr>
-     </run>
-    </ajc-test> 
- 
-    <ajc-test dir="bugs150/pr119210" pr="119210" title="autoboxing around advice - 2">
-     <compile files="TestLib2.java,ThreadAspectLib2.java" options="-1.9"/>
-     <run class="TestLib2">
-       <stderr>
-          <line text="obtaining five, got 3"/>
-       </stderr>
-     </run>
-    </ajc-test> 
-   
-    <ajc-test dir="bugs150/pr119210" pr="119210" title="autoboxing around advice - 3">
-     <compile files="TestLib2.java,ThreadAspectLib2.java">
-       <message kind="error" line="16" text="incompatible return type applying to method-call(java.lang.Integer TestLib2.getFive())"/>
-       <message kind="error" line="4" text="incompatible return type applying to method-call(java.lang.Integer TestLib2.getFive())"/>
-     </compile>
-    </ajc-test> 
-    
-    <ajc-test dir="bugs150/pr119539" pr="119539" title="generic pertypewithin aspect - 1">
-     <compile files="GenericPerTypeWithin.java" options="-1.9 -showWeaveInfo">
-     	<message kind="weave" text="Join point 'constructor-execution(void bugs.C.&lt;init&gt;())' in Type 'bugs.C' (GenericPerTypeWithin.java:10) advised by before advice from 'bugs.A' (GenericPerTypeWithin.java:21)"/>
-	    <message kind="weave" text="Join point 'constructor-execution(void bugs.C.&lt;init&gt;())' in Type 'bugs.C' (GenericPerTypeWithin.java:10) advised by before advice from 'bugs.A' (GenericPerTypeWithin.java:20)"/>
-	 </compile>
-     <run class="bugs.GenericPerTypeWithin"/>
-    </ajc-test>  
-    
-    <ajc-test dir="bugs150/pr119539" pr="119539" title="generic pertypewithin aspect - 2">
-     <compile files="GenericPerTypeWithin2.java" options="-1.9 -showWeaveInfo">
-       <message kind="error" line="24" text="a generic super-aspect must be fully parameterized in an extends clause"/>
-	 </compile>
-    </ajc-test>  
-    
-    <ajc-test dir="bugs150/pr119539" pr="119539" title="generic pertypewithin aspect - 3">
-     <compile files="GenericPerTypeWithin3.java" options="-1.9 -showWeaveInfo">
-     	<message kind="weave" text="Join point 'constructor-execution(void bugs.GenericPerTypeWithin3$C.&lt;init&gt;())' in Type 'bugs.GenericPerTypeWithin3$C' (GenericPerTypeWithin3.java:15) advised by before advice from 'bugs.GenericPerTypeWithin3$A' (GenericPerTypeWithin3.java:10)"/>
-		<message kind="warning" line="15" text="Singleton.creation()"/>
-	 </compile>
-     <run class="bugs.GenericPerTypeWithin3"/>
-    </ajc-test>  
-    
-    <ajc-test dir="bugs150/pr117854" pr="117854" title="broken switch transform">
-     <compile files="BrokenSwitch.java" options=""/>
-     <run class="BrokenSwitch"/>
-    </ajc-test>  
-    
-    <ajc-test dir="bugs150/pr119749" pr="119749" title="incorrect exception signature matching">
-     <compile files="InheritedThrows.java" options="-showWeaveInfo">  
-     	<message kind="weave" text="Join point 'method-execution(void InheritedThrows$NestedClassBoth.m())' in Type 'InheritedThrows$NestedClassBoth' (InheritedThrows.java:24) advised by afterThrowing advice from 'InheritedThrows$A' (InheritedThrows.java:4)"/>
-     	<message kind="weave" text="Join point 'method-execution(void InheritedThrows$NestedClass1.m())' in Type 'InheritedThrows$NestedClass1' (InheritedThrows.java:16) advised by afterThrowing advice from 'InheritedThrows$A' (InheritedThrows.java:4)"/>
-     </compile>
-    </ajc-test>  
-    
-    <ajc-test dir="bugs150/pr118599" pr="118599" title="ambiguous method when binary weaving - 1">
-     <!-- separate compilation was failing  -->
-     <compile files="Attributable.java" outjar="foo.jar" options="-1.9"/>
-     <compile files="AnAttributedClass.java" aspectpath="foo.jar" options="-1.9"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr118599" pr="118599" title="ambiguous method when binary weaving - 2">
-     <!-- complete compilation works -->
-     <compile files="Attributable.java,AnAttributedClass.java" options="-1.9"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs150" pr="104220" title="adviceexecution join point toString forms">
-      <compile files="Pr104220.aj"/>
-      <run class="Pr104220">
-        <stdout>
-          <line text="adviceexecution"/>
-          <line text="adviceexecution(void SomeAspect.before())"/>
-          <line text="adviceexecution(SomeAspect.before())"/>
-          <line text="adviceexecution(void SomeAspect.before())"/>
-        </stdout>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" pr="112756" title="pointcut expression containing 'assert'">
-     <compile files="Pr112756.aj" options="-warn:assertIdentifier -Xdev:Pinpoint"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr118781" pr="118781" title="verify error with around advice array sigs">
-     <compile files="MyMain.java,MyAspect.java,MyClass.java" options="-XnoInline"/>
-     <run class="blah.MyMain"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr117681" pr="117681" title="at declare parents">
-     <compile files="Test.java,TestAspect.java,Audit.java,AuditImpl.java" options="-1.9"/>
-     <run class="Test"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr120474" pr="120474" title="Dollar classes">
-     <compile files="$ProxyPr120474.java"/>
-     <compile files="X.aj" options="-outxml"/>
-     <run class="$ProxyPr120474" ltw="aop.xml">
-        <stdout>
-        </stdout>
-     </run>
-    </ajc-test>
-        
-    <ajc-test dir="bugs150/pr111667" pr="111667" title="lint for advice sorting">
-     <compile files="A.java,X.java,Y.java" options="-1.9 -Xlint:warning">
-       <message kind="warning" line="9" text="at this shadow method-execution(void A.m1()) no precedence is specified between advice applying from aspect X and aspect Y [Xlint:unorderedAdviceAtShadow]"/>
-     </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs150/pr118326" pr="118326" title="illegal initialization - 1">
-     <compile files="Foo.java,Bar.java">
-       <message kind="error" line="2" text="Type mismatch: cannot convert from null to int"/>
-       <message kind="error" line="6" text="Type mismatch: cannot convert from Integer to int"/>
-       <message kind="error" line="8" text="Type mismatch: cannot convert from String to int"/>
-     </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr118326" pr="118326" title="illegal initialization - 2">
-     <compile files="Foo.java,Bar.java" options="-1.9">
-       <message kind="error" line="2" text="Type mismatch: cannot convert from null to int"/>
-       <message kind="error" line="8" text="Type mismatch: cannot convert from String to int"/>
-     </compile>
-    </ajc-test>
-        
-    <ajc-test dir="bugs150/pr117296" pr="117296" title="self bounding generic types">
-     <compile files="PropertySupport.java" options="-1.9"/>
-     <run class="PropertySupport"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" pr="113368" title="thisJoinPointStaticPart in if test">
-    		<compile files="Pr113368.aj"/>
-    		<run class="Pr113368">
-    		</run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr87525" pr="87525" title="privilege problem with switch">
-   		<compile files="A.java,B.java">
-   		  <message kind="error" line="5" text="Fields accessible due to an aspect being privileged can not be used in switch statements"/>
-   		</compile>
-    </ajc-test>
-
-	<ajc-test dir="java5/reflection" title="pointcut parsing with ajc compiled pointcut references">
-		<compile files="PointcutLibrary.aj,ReflectOnAjcCompiledPointcuts.java" options="-1.9"></compile>
-		<run class="ReflectOnAjcCompiledPointcuts" classpath="../lib/bcel/bcel.jar"/>
-	</ajc-test>
-	
-	<ajc-test dir="java5/reflection" title="reflection on itds">
-		<compile files="InterTypeDeclarations.aj,ReflectOnCodeStyleITDs.java" options="-1.9 -Xlint:ignore -makeAjReflectable"></compile>
-		<run class="ReflectOnCodeStyleITDs" classpath="../lib/bcel/bcel.jar">
-		  <stdout>
-		  	<line text="public C.new(int, int, int)"/>
-		  	<line text="C.new(int, int)"/>
-		  	<line text="private C.new(int)"/>
-		  	<line text="private C.new(int)"/>	
-		  	<line text="public C.new(int, int, int)"/>
-		  	<line text="public C.new(int, int, int)"/>
-		  	<line text="int C.getY()"/>
-		  	<line text="int I.getY()"/>
-		  	<line text="public int C.getZ()"/>
-		  	<line text="public int I.getZ()"/>
-		  	<line text="private int C.getX()"/>
-		  	<line text="private int I.getX()"/>
-		  	<line text="private int C.getX()"/>
-		  	<line text="public int C.getZ()"/>
-		  	<line text="public int I.getZ()"/>
-		  	<line text="public int C.getZ()"/>
-		  	<line text="int C.y"/>
-		  	<line text="int I.y"/>
-		  	<line text="public int C.z"/>
-		  	<line text="public int I.z"/>
-		  	<line text="private int C.x"/>
-		  	<line text="private int I.x"/>
-		  	<line text="private int C.x"/>
-		  	<line text="public int C.z"/>
-		  	<line text="public int I.z"/>
-		  	<line text="public int C.z"/>
-		  </stdout>
-		</run>
-	</ajc-test>
-
-	<ajc-test dir="java5/reflection" title="reflection on @DeclareParents">
-		<compile files="AtAspectJDeclareParents.aj,ReflectOnAtAspectJDeclareParents.java" options="-1.9 -Xlint:ignore"></compile>
-		<run class="ReflectOnAtAspectJDeclareParents" classpath="../lib/bcel/bcel.jar">
-		  <stdout>
-		    <line text="declare parents : C implements I"/>
-		  	<line text="public int I.getX()"/>
-		  	<line text="public void I.setX(int)"/>
-		  	<line text="public int I.getX()"/>
-			<line text="public int I.getX()"/>
-		  	<line text="public void I.setX(int)"/>
-		  	<line text="public int I.getX()"/>
-		  </stdout>
-		</run>
-	</ajc-test>
-	
-	<ajc-test dir="compatibility/case1" title="generating code for a 1.2.1 runtime - 1">
-		<compile files="Simple.java" options="-Xajruntimetarget:1.2"/>
-		<run class="Simple" classpath="../lib/aspectj/lib/aspectjrt121.jar"/>
-	</ajc-test>
-	
-	<ajc-test dir="compatibility/case2" title="generating code for a 1.2.1 runtime - 2">
-		<compile files="TrackingErrors.aj,A.java" options="-Xajruntimetarget:1.2 -Xlint:ignore"/>
-		<run class="A" classpath="../lib/aspectj/lib/aspectjrt121.jar"/>
-	</ajc-test>
-		
-	<ajc-test dir="java5/reflection" title="arg names in advice annotations">
-		<compile files="AdviceWithArgs.aj" options="-1.9"></compile>
-		<run class="AdviceWithArgs"/>
-	</ajc-test>
-	
-	
-	<ajc-test dir="java5/reflection" pr="114322" title="reflection on abstract ITDs (Billing example)">
-		<compile files="ReflectBilling.java,Billing.aj" options="-1.9 -makeAjReflectable"/>
-		<run class="ReflectBilling">
-			<stdout>
-				<line text="public void Customer.addCharge(long)"/>
-				<line text="public long Local.callRate()"/>
-				<line text="public long LongDistance.callRate()"/>
-				<line text="public abstract long Connection.callRate()"/>
-				<line text="public Customer Connection.payer"/>
-				<line text="public long Customer.totalCharge"/>
-			</stdout>
-		</run>
-	</ajc-test>
-	
-	<ajc-test dir="bugs150" pr="103157" title="returning(Object) binding">
-		<compile files="Pr103157.aj"/>
-		<run class="Pr103157">
-			<stdout>
-				<line text="returning from staticinit"/>
-				<line text="returning from preinit"/>
-				<line text="returning from set"/>
-				<line text="returning from cons exe"/>
-				<line text="returning from init"/>
-			</stdout>
-		</run>
-	</ajc-test>
-	
-	<ajc-test dir="bugs150" title="declare soft and adviceexecution" pr="103051">
-		<compile files="Pr103051.aj" options="-Xdev:Pinpoint"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs150" title="declare soft and exclusions" pr="103097">
-		<compile files="Pr103097.aj" options="-Xlint:ignore"/>
-		<run class="Pr103097"/>
-	</ajc-test>
-		    
-
-	<ajc-test dir="bugs150" title="Range problem">
-		<compile files="pr109614.java"/>
-		<run class="pr109614"/>
-	</ajc-test>
-	    
-    <ajc-test dir="bugs150/pr114436" title="ClassFormatError binary weaving perthis">
-     <compile files="SimpleTrace.aj,ConcreteSimpleTracing.aj" outjar="aspects.jar"/>
-     <compile files="TestClass.java" aspectpath="aspects.jar"/>
-     <run class="TestClass"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr113066" title="possible static imports bug - 1">
-        <compile files="Consts.java,TestNPE.java" options="-1.9"/>
-    </ajc-test>
-  
-    <ajc-test dir="bugs150" title="parameterized type and around advice">
-        <compile files="pr115250.aj" options="-1.9 -Xlint:ignore">
-          <!-- this first error happens twice, once for each piece of around advice -->
-          <message kind="error" line="10" text="incompatible return type applying to constructor-execution(void pr115250$C.&lt;init&gt;())"/>
-          <message kind="error" line="17" text="incompatible return type applying to constructor-execution(void pr115250$C.&lt;init&gt;())"/>
-          <message kind="error" line="27" text="incompatible return type applying to constructor-execution(void pr115250$C.&lt;init&gt;())"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" title="parameterized type and around advice - 2">
-        <compile files="pr115250_2.aj" options="-1.9 -Xlint:ignore -showWeaveInfo">
-          	<message kind="weave" text="Join point 'method-execution(pr115250_2$C pr115250_2$C.foo())' in Type 'pr115250_2$C' (pr115250_2.aj:7) advised by around advice from 'pr115250_2$A' (pr115250_2.aj:22)"/>
-			<message kind="weave" text="Join point 'method-execution(pr115250_2$C pr115250_2$C.foo())' in Type 'pr115250_2$C' (pr115250_2.aj:7) advised by around advice from 'pr115250_2$Normal' (pr115250_2.aj:12)"/>
-		</compile>
-        <run class="pr115250_2">
-          <stderr>
-            <line text="funky advice running"/>
-          </stderr>
-        </run>
-    </ajc-test>
-      
-    <ajc-test dir="bugs150/pr115788" title="parser exception">
-        <compile files="AAA.java">
-          <message kind="warning" line="3" text="no match for this type name: Screen"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr113066" title="possible static imports bug - 2">
-        <compile files="Consts2.java,TestNPE2.java" options="-1.9">
-          <message kind="error" line="2" text="The field Consts2.a.Consts2.A_CONST is not visible"/>
-          <!--  message has changed with 3.3 compiler upgrade, it used to be this: -->
-          <!-- message kind="error" line="2" text="The import a.Consts2.A_CONST cannot be resolved"/-->
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr113066" title="possible static imports bug - 3">
-        <compile files="Consts3.java,TestNPE3.java" options="-1.9"/>
-    </ajc-test>
-    
-    <ajc-test dir="java5/staticImports" title="import static java.lang.System.out">
-        <compile files="StaticImport.aj" options="-1.9"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs150" title="Problem with constructor ITDs">
-        <compile files="pr112783.aj" options="-1.9"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs150" title="NPE in ensureScopeSetup">
-        <compile files="pr115038.aj" options="-1.9">
-          <message kind="error" line="2" text="Cannot make inter-type declarations on type variables"/>
-        </compile>
-    </ajc-test>
- 
-    <ajc-test dir="bugs150" title="ITDC with no explicit cons call">
-      <compile files="Pr62606.aj" options="-1.9">
-        <message kind="warning" line="6" text="[Xlint:noExplicitConstructorCall]"/>
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/generics/bugs" title="using same type variable in ITD">
-      <compile files="SameTypeVariable.aj" options="-1.9">
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" title="capturebinding wildcard problem">
-      <compile files="pr114744.aj" options="-1.9">
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" title="Anonymous types and nome matching">
-      <compile files="Pr73050.aj" outjar="jar1.jar">
-        <message kind="warning" line="16" text="anonymous types should be matched by a * wild card"/>
-      </compile>
-      <compile inpath="jar1.jar">
-        <message kind="warning" line="0" text="anonymous types should be matched by a * wild card"/>     
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr86903" title="bcelrenderer bad">
-      <compile files="GenericService.java,Service.java,Main.java,BadWormhole.java"/>
-      <run class="Main"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr114343" title="field-get, generics and around advice">
-      <compile files="Test.java,Test1.java,Test2.java,TestAspect.aj" options="-1.9">
-          <message kind="warning" line="7" text="unchecked conversion when advice applied at shadow field-get(java.util.Set Test1.intsSet), expected java.util.Set&lt;java.lang.Integer&gt; but advice uses java.util.Set"/>
-          <message kind="warning" line="8" text="unchecked conversion when advice applied at shadow field-get(java.util.Set Test2.doubSet), expected java.util.Set&lt;java.lang.Double&gt; but advice uses java.util.Set"/>
-      </compile>
-      <run class="TestAspect"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr113947/case1" title="maws generic aspect - 1">
-        <compile files="AbstractListSupport.java,AnotherItem.java,Item.java,LinkedList.java,LinkedListItem.java,ListItem.java,StringList.java" options="-1.9">
-          <message kind="error" line="6" text="Cannot make inter-type declarations on type variables"/>
-          <message kind="error" line="8" text="Cannot make inter-type declarations on type variables"/>
-          <message kind="error" line="12" text="Cannot make inter-type declarations on type variables"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" title="aspectOf and generic aspects">
-        <compile files="pr115237.aj" options="-1.9"/>
-        <run class="pr115237"/>
-    </ajc-test>
-
-   <ajc-test dir="bugs150/pr114343/case2" title="field-get, generics and around advice - 2">
-      <compile files="Test.java,TTT.java,TestAspect.java" options="-1.9"/>
-      <run class="TestAspect">
-        <stderr>
-          <line text="TestAspect.main: Calling foo"/>
-          <line text="Creating Test&lt;Integer&gt; instance"/>
-          <line text="Calling toArray"/>
-          <line text="In around advice"/>
-          <line text="In toArray()"/>
-          <line text="done"/>
-          <line text="TestAspect.main: done"/>
-        </stderr>
-      </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr114343/case3" title="field-get, generics and around advice - 3">
-      <compile files="Test.java,TTT.java,TestAspect.java" options="-1.9"/>
-      <run class="TestAspect">
-        <stderr>
-          <line text="TestAspect.main: Calling foo"/>
-          <line text="Creating Test&lt;Integer&gt; instance"/>
-          <line text="Calling toArray"/>
-          <line text="In around advice"/>
-          <line text="In toArray()"/>
-          <line text="done"/>
-          <line text="Creating Test&lt;Integer&gt; instance"/>
-          <line text="Calling getFirst"/>
-          <line text="around on getFirstExec(): running"/>
-          <line text="done"/>
-          <line text="TestAspect.main: done"/>
-        </stderr>
-      </run>
-    </ajc-test>
-
-
-    <ajc-test dir="bugs150/pr113947/case2" title="maws generic aspect - 2">
-        <compile files="AbstractListSupport.java,AnotherItem.java,Item.java,LinkedList.java,LinkedListItem.java,ListItem.java,StringList.java" options="-1.9"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr113861" title="field-get problems with generic field">
-        <compile files="Test.java,TestAspect.java" options="-1.9"/>
-        <run class="com.Test"/>
-    </ajc-test>
-    
-    
-    <ajc-test dir="bugs150/pr99191" title="declare annotation on non existent type - 1">
-        <compile files="pr99191_1.java" options="-1.9">
-        	<message kind="error" line="4" text="The field 'int C.noSuchField' does not exist"/>
-			<message kind="error" line="5" text="The field 'int B.noSuchField' does not exist"/>
-        </compile>
-    </ajc-test> 
-    
-    <ajc-test dir="java5/generics/bugs/lists/case1" title="generics and ITD overrides - 1">
-        <compile files="Identifiable.java,Bean.java,LongIdentifiable.java,IdentifiableAspect.java" options="-1.9">
-        </compile>
-        <run class="IdentifiableAspect"/>
-    </ajc-test> 
-
-    <ajc-test dir="java5/generics/bugs/lists/case2" title="generics and ITD overrides - 2">
-        <compile files="Identifiable.java,Bean.java,LongIdentifiable.java,IdentifiableAspect.java" options="-1.9">
-        </compile>
-        <run class="IdentifiableAspect"/>
-    </ajc-test>
-    
-    <ajc-test dir="java5/generics/bugs/lists/case3" title="generics and ITD overrides - 3">
-        <compile files="Identifiable.java,Bean.java,LongIdentifiable.java,IdentifiableAspect.java" options="-1.9">
-        </compile>
-        <run class="IdentifiableAspect"/>
-    </ajc-test> 
-    
-    <ajc-test dir="java5/generics/bugs/lists/case4" title="generics and ITD overrides - 4">
-        <compile files="Identifiable.java,Bean.java,LongIdentifiable.java,IdentifiableAspect.java" options="-1.9">
-        </compile>
-        <run class="IdentifiableAspect"/>
-    </ajc-test> 
-
-    <!-- Currently a warning doesn't occur if the annotation is already on the field
-         (see bug 113029). If this is fixed, need to add check for this warning to this
-         test as in test "declare annotation on non existent type - 4" -->
-    <ajc-test dir="bugs150/pr99191" title="declare annotation on non existent type - 2">
-        <compile files="pr99191_2.java" options="-1.9">
-        </compile>
-    </ajc-test> 
-
-    <ajc-test dir="bugs150/pr99191" title="declare annotation on non existent type - 3">
-        <compile files="pr99191_3.java" options="-1.9">
-        	<message kind="error" line="4" text="The method 'public * C.noSuchMethod(..)' does not exist"/>
-			<message kind="error" line="5" text="The method '* B.noSuchMethod(..)' does not exist"/>
-        </compile>
-    </ajc-test> 
-
-    <ajc-test dir="bugs150/pr99191" title="declare annotation on non existent type - 4">
-        <compile files="pr99191_4.java" options="-1.9">
-        	<message kind="warning" text="void C.amethod() - already has an annotation of type Annotation, cannot add a second instance [Xlint:elementAlreadyAnnotated]"/>
-        </compile>
-    </ajc-test> 
-
-    <ajc-test dir="bugs150/pr99191" title="declare annotation on non existent type - 5">
-        <compile files="pr99191_5.java" options="-1.9">
-        	<message kind="error" line="4" text="The method 'C.new(java.lang.String)' does not exist"/>
-			<message kind="error" line="5" text="The method 'B.new(int)' does not exist"/>
-        </compile>
-    </ajc-test> 
-
-    <ajc-test dir="bugs150/pr99191" title="declare annotation on non existent type - 6">
-        <compile files="pr99191_6.java" options="-1.9">
-        	<message kind="warning" text="void C.&lt;init&gt;(int) - already has an annotation of type Annotation, cannot add a second instance [Xlint:elementAlreadyAnnotated]"/>
-        </compile>
-    </ajc-test>
- 
-    <ajc-test dir="bugs150/pr113630/case1" title="IncompatibleClassChangeError - errorscenario">
-        <compile files="Bean.java,BeanTestCase.java,javaBean.java,propertyChanger.java,PropertySupportAspect5.aj" options="-1.9">
-          <message kind="warning" line="9" text="Failing match because annotation 'javaBean' on type 'Bean' has SOURCE retention.  Matching allowed when RetentionPolicy is CLASS or RUNTIME"/>
-          <message kind="error" line="18" text="The method addPropertyChangeListener(String, BeanTestCase) is undefined for the type Bean"/>
-        </compile>
-    </ajc-test>  
-
-    <ajc-test dir="bugs150/pr113630/case2" title="IncompatibleClassChangeError - workingscenario">
-        <compile files="Bean.java,BeanTestCase.java,javaBean.java,propertyChanger.java,PropertySupportAspect5.aj" options="-1.9"/>
-        <run class="BeanTestCase"/>
-    </ajc-test>  
- 
-    <ajc-test dir="bugs150" title="Generics ClassCastException">
-        <compile files="pr113445.aj" options="-1.9,-emacssym"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" title="test illegal change to pointcut declaration">
-        <compile files="pr111915.java" options="-1.9 -showWeaveInfo">
-          <message kind="weave" text="Join point 'method-execution(void SomeClass.doSomething())' in Type 'SomeClass' (pr111915.java:4) advised by around advice from 'DoesntCompile' (pr111915.java:15)"/>
-          <message kind="weave" text="Extending interface set for type 'SomeClass' (pr111915.java) to include 'java.io.Serializable' (pr111915.java)"/>
-        </compile>
-    </ajc-test> 
-
-    <ajc-test dir="java5/bridgeMethods" pr="72766" title="Ignore bridge methods">
-        <compile files="AspectX.aj" inpath="testcode.jar" options="-showWeaveInfo">
-  <!--        <message kind="warning" line="7" text="pointcut did not match on the method call to a bridge method."/>
-          <message kind="warning" line="7" text="does not match because declaring type is Number"/>-->
-          <message kind="weave" text="(AspectX.aj:18) advised by before advice from 'AspectX'"/>
-          <message kind="weave" text="(AspectX.aj:19) advised by before advice from 'AspectX'"/>
-          <message kind="weave" text="(Number.java:5) advised by before advice from 'AspectX'"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test title="intermediate annotation matching" dir="bugs150">
-        <compile files="AnnotationPlusPatternMatchingError.aj" options="-1.9">
-            <message kind="warning" line="28" text="matched"/>
-        </compile>
-        <run class="AnnotationPlusPatternMatchingError">
-            <stdout>
-                <line text="In advice"/>
-            </stdout>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="migration" title="load aspectj 1.2.1 aspects in aspectj 5">
-        <compile files="Program.java" aspectpath="aspects121.jar">
-        </compile>
-        <run class="Program"/>
-    </ajc-test>
-
-	<ajc-test dir="bugs/java5/arrayCloning" pr="72150" vm="1.5"
-	   title="AJC possible bug with static nested classes">
-	   <compile files="A.java,C.java" options="-1.9,-showWeaveInfo">
-	       <message kind="weave" text="Type 'C' (C.java:14) advised by around advice from 'A' (A.java:2)"/>
-	   </compile>
-	   <run class="C"/>
-    </ajc-test>
-
-	<ajc-test dir="java5/pseudoKeywords" 
-	   title="method called around in class">
-	   <compile files="MethodCalledAround.java">
-	   </compile>
-    </ajc-test>
-
-	<ajc-test dir="java5/pseudoKeywords" 
-	   title="method called around in aspect">
-	   <compile files="MethodCalledAroundAspect.java">
-	       <message kind="error" line="2"/>
-	   </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" pr="64568" title="clear error message on itd with type pattern">
-        <compile files="pr64568.aj">
-            <message line="4" kind="error" text="Syntax error on token &quot;*&quot;, delete this token"/>
-            <message line="4" kind="error" text="foo cannot be resolved to a type"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs150" pr="74562" title="before and after are valid identifiers in classes">
-        <compile files="pr74562.aj">
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="bugs150" pr="107486" title="anonymous inner classes">
-        <compile files="pr107486.aj">
-        </compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150" pr="102210" title="NullPointerException trying to compile">
-        <compile files="PR102210.java"/>
-        <run class="PR102210">
-          <stderr>
-            <line text="List size is 1"/>
-            <line text="m1 running"/>
-            <line text="List size is 2"/>
-            <line text="m2 running"/>
-            <line text="List size is 3"/>
-            <line text="m3 running"/>
-          </stderr>
-        </run>
-   </ajc-test>
-
-   <ajc-test dir="bugs150" pr="107486" title="multiple anonymous inner classes">
-        <compile files="pr107486part2.aj">
-        </compile>
-        <run class="pr107486part2">
-            <stdout>
-                <line text="[advised] f"/>
-                <line text="[advised] g"/>
-            </stdout>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="java5/compliance" title="java 5 pointcuts and declares at pre-java 5 compliance levels">
-      <compile files="AJ5FeaturesAtJ14.aj" options="-1.4">
-        <message kind="error" line="3" text="the @annotation pointcut expression is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="11" text="the @within pointcut expression is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="13" text="the @withincode pointcut expression is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="5" text="the @this pointcut expression is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="7" text="the @target pointcut expression is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="9" text="the @args pointcut expression is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="15" text="declare @type is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="15" text="annotations are only available if source level is 1.5 or greater"/>
-        <message kind="error" line="15" text="cannot convert from Foo to Annotation"/>     
-        <message kind="error" line="17" text="declare @method is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="17" text="annotations are only available if source level is 1.5 or greater"/>
-        <message kind="error" line="17" text="cannot convert from Foo to Annotation"/>
-        <message kind="error" line="19" text="declare @field is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="19" text="annotations are only available if source level is 1.5 or greater"/>
-        <message kind="error" line="19" text="cannot convert from Foo to Annotation"/>
-        <message kind="error" line="21" text="declare @constructor is only supported at Java 5 compliance level or above"/>       
-        <message kind="error" line="21" text="annotations are only available if source level is 1.5 or greater"/>
-        <message kind="error" line="21" text="cannot convert from Foo to Annotation"/>
-        <message kind="error" line="25" text="annotation type patterns are only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="27" text="annotation type patterns are only supported at Java 5 compliance level or above"/>
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/compliance" title="java 5 pointcuts and declares at pre-java 5 compliance levels - 1.7">
-      <compile files="AJ5FeaturesAtJ14.aj" options="-1.4">
-        <message kind="error" line="3" text="the @annotation pointcut expression is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="11" text="the @within pointcut expression is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="13" text="the @withincode pointcut expression is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="5" text="the @this pointcut expression is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="7" text="the @target pointcut expression is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="9" text="the @args pointcut expression is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="15" text="declare @type is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="15" text="annotations are only available if source level is 1.5 or greater"/>
-        <message kind="error" line="15" text="Foo is not an annotation type"/>     
-        <message kind="error" line="17" text="declare @method is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="17" text="annotations are only available if source level is 1.5 or greater"/>
-        <message kind="error" line="17" text="Foo is not an annotation type"/>
-        <message kind="error" line="19" text="declare @field is only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="19" text="annotations are only available if source level is 1.5 or greater"/>
-        <message kind="error" line="19" text="Foo is not an annotation type"/>
-        <message kind="error" line="21" text="declare @constructor is only supported at Java 5 compliance level or above"/>       
-        <message kind="error" line="21" text="annotations are only available if source level is 1.5 or greater"/>
-        <message kind="error" line="21" text="Foo is not an annotation type"/>
-        <message kind="error" line="25" text="annotation type patterns are only supported at Java 5 compliance level or above"/>
-        <message kind="error" line="27" text="annotation type patterns are only supported at Java 5 compliance level or above"/>
-      </compile>
-    </ajc-test>
-    
-    
-    <ajc-test dir="bugs150" pr="91114" title="before and after are valid identifiers in classes, part 2">
-        <compile files="pr91114.aj">
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs150" pr="78621" title="void field type in pointcut expression">
-        <compile files="pr78261.aj">
-            <message line="3" kind="error" text="fields cannot have a void type"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs150" pr="86057" title="overriding final pointcut from super-aspect">
-        <compile files="pr86057.aj">
-            <message line="9" kind="error" text="can't override final pointcut Base.foo()"/>
-        </compile>
-    </ajc-test>
-                                
-   <ajc-test dir="bugs150" pr="78707" title="before returning advice not allowed!">
-        <compile files="pr78707.aj">
-            <message line="3" kind="error" text="Syntax error on token &quot;returning&quot;, delete this token"/>
-            <message line="3" kind="error" text="Syntax error on token &quot;throwing&quot;, delete this token"/>
-         </compile>
-    </ajc-test>        
-            
-    <ajc-test dir="bugs150" pr="104529" title="@SuppressWarnings should suppress">
-        <compile files="pr104529.aj" options = "-1.9 -warn:+unchecked">
-            <message line="11" kind="warning" text="needs unchecked conversion"/>
-        </compile>
-    </ajc-test>
-            
-    <ajc-test dir="bugs150" pr="79523" title="declare warning : foo(str) : ...;">
-        <compile files="pr79523.aj">
-            <message line="4" kind="warning" text="no match for this type name: str"/>
-            <message line="4" kind="error" text="bad parameter"/>
-            <message line="4" kind="error" text="args() pointcut designator cannot be used in declare statement"/>
-        </compile>
-    </ajc-test>
-                        
-    <ajc-test dir="bugs150" pr="107059" title="parser crashes on call(void (@a *)(..)">
-        <compile files="pr107059.aj">
-            <message line="3" kind="error" text="Syntax error on token &quot;(&quot;, &quot;name pattern&quot; expected"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" pr="107059" title="target(@Foo *)">
-        <compile files="pr107059_2.aj" options="-1.9">
-            <message kind="error" line="4" text="wildcard type pattern not allowed"></message>
-        </compile>
-    </ajc-test>
- 
-     <ajc-test dir="bugs150"  title="varargs with type variable">
-        <compile files="ParameterizedVarArgMatch.aj" options="-1.9">
-        </compile>
-    </ajc-test>
- 
- 
-    <ajc-test dir="bugs150" pr="108104" title="multiple anonymous inner classes 2">
-        <compile files="pr108104.aj" options="-1.9">
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs150" pr="108050" title="signature matching in override scenario">
-        <compile files="pr108050.aj" options="-1.9">
-            <message kind="warning" line = "2" text="servlet request"></message>
-            <message kind="warning" line = "7" text="servlet request"></message>
-            <message kind="warning" line = "21" text="servlet request"></message>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs150/pr108425" pr="108245" title="wildcard annotation matching - pr108245">
-        <compile files="package1/Bean.java,package2/Bean.java,package2/propertyChanger.java,package3/pr108425.aj" options="-1.9 -Xlint:ignore">
-        </compile>
-    </ajc-test>
-           
-    <ajc-test dir="bugs150/" pr="108104" title="inner types and type variables">
-        <compile files="ShapeCommandMap.java" options="-1.9">
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs150/" pr="107953" title="@AfterThrowing with no formal specified">
-        <compile files="pr107953.java" options="-1.9">
-            <message kind="error" line="8" text="throwing formal 'RuntimeException' must be declared as a parameter in the advice signature"></message>
-        </compile>
-    </ajc-test>
-               
-    <ajc-test dir="bugs150/pr106130" pr="106130" title="test weaving with > 256 locals">
-        <compile files="AroundLotsOfVars.java LotsOfVars.java" options="-preserveAllLocals"/>
-        <run class="LotsOfVars">
-            <stdout>
-                <line text="hello"/>
-                <line text="2"/>
-            </stdout>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr87376" title="structure model npe on type not found">
-        <compile files="I.java,NPE.aj" options="-emacssym">
-            <message kind="error" line="8" text="I cannot be resolved to a type"/>
-            <message kind="error" line="10" text="I cannot be resolved to a type"/>
-        </compile>
-    </ajc-test>
-    
-   <ajc-test dir="bugs150" pr="83311" title="overriding/polymorphism error on interface method introduction">
-     <compile files="pr83311.aj"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150" pr="103266" title="NPE on syntax error">
-     <compile files="pr103266.aj">
-          <message kind="error" line="41" text="ConnectionRequestContext cannot be resolved to a type"/>
-          <!-- this next message is new in e37 -->
-          <message kind="error" line="41" text="Type mismatch: cannot convert from new ConnectionRequestContext(){} to WorkerExample.RequestContext"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test title="itd override with no exception clause" dir="bugs150">
-       <compile files="pr83377.aj"></compile>
-   </ajc-test>
-    
-    <ajc-test dir="bugs150/pr84260" vm="1.5" title="static import failures">
-        <compile files="A.java,I1.java,I2.java" options="-1.9"/>
-        <run class="I1">
-          <stderr>
-            <line text="static method running"/>
-          </stderr>
-        </run>
-        <run class="I2">
-          <stderr>
-            <line text="static method running"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test title="anonymous inner class with method returning type parameter"  pr="107898" dir="bugs150">
-        <compile files="pr107898.aj" options="-1.9"></compile>
-    </ajc-test>
-
-    <ajc-test title="matching against Object[]"  pr="72668" dir="bugs150">
-        <compile files="pr72668.aj" options="-1.9">
-            <message kind="error" line="3" text="incompatible return type applying to method-execution(java.lang.Number[] pr72668.getThoseInts())"></message>
-            <message kind="error" line="10" text="incompatible return type applying to method-execution(java.lang.Number[] pr72668.getThoseInts())"></message>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="decp" pr="80249" title="Order of types passed to compiler determines weaving behavior">
-        <compile files="A.java,B.java,AspectX.java"/>
-        <run class="B"/>
-        <compile files="B.java,A.java,AspectX.java"/>
-        <run class="B"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" pr="99228" vm="1.5" title="ITD of a field into a generic class">
-        <compile files="PR99228.aj" options="-1.9"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" pr="98320" vm="1.5" title="intertype with nested generic type">
-        <compile files="PR98320.aj" options="-1.9"/>
-    </ajc-test>
-    
-    <ajc-test dir="decs" pr="42743" title="declare soft of runtime exception">
-        <compile files="DeclareSoftRuntimeException.aj">
-            <message kind="warning" line="3" text="MyRuntimeException will not be softened as it is already a RuntimeException"/>
-        </compile>
-        <run class="DeclareSoftRuntimeException">
-            <stdout>
-                <line text="MyRuntimeException"/>
-                <line text="org.aspectj.lang.SoftException"/>
-                <line text="MyRuntimeException"/>
-            </stdout>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="decs" pr="42743" title="declare soft w. catch block">
-        <compile files="VerifyError.aj" options="-Xlint:ignore">
-        </compile>
-        <run class="VerifyError"/>
-    </ajc-test>
-        
-    <ajc-test dir="bugs" pr="61568" title="Various kinds of ambiguous bindings">
-        <compile files="AmbiguousBindings.aj">
-            <message line="17" text="ambiguous binding of parameter(s) foo across '||' in pointcut"></message>
-            <message line="19" text="ambiguous binding of parameter(s) foo across '||' in pointcut"></message>
-            <message line="21" text="ambiguous binding of parameter(s) foo across '||' in pointcut"></message>
-            <message line="23" text="ambiguous binding of parameter(s) x across '||' in pointcut"></message>
-            <message line="25" text="ambiguous binding of parameter(s) foo across '||' in pointcut"></message>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="61658" title="ambiguous args">
-        <compile files="PR61658.java">
-            <message line="17" text="ambiguous binding of parameter(s) a, b across '||' in pointcut"></message>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" pr="78021" title="Injecting exception into while loop with break statement causes catch block to be ignored">
-        <compile files="PR78021.java"/>
-        <run class="PR78021"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr99089" vm="1.5" pr="99089" title="ArrayIndexOutOfBoundsException - Generics in privileged aspects">
-        <compile files="DataClass.java,TracingAspect.java" options="-1.9"/>
-        <run class="DataClass">
-          <stderr>
-          <line text="before:Length of v=1"/>
-          <line text="after:Length of v=2"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" pr="79554" title="Return in try-block disables catch-block if final-block is present">
-        <compile files="PR79554.java"/>
-        <run class="PR79554"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" pr="82570" title="Weaved code does not include debug lines">
-        <compile files="PR82570_1.java"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" pr="83303" title="compiler error when mixing inheritance, overriding and polymorphism">
-        <compile files="PR83303.java"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs150" pr="83563" title="pertypewithin() handing of inner classes (1)">
-        <compile files="PR83563_1.java"/>
-        <run class="PR83563_1"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs150" pr="83563" title="pertypewithin() handing of inner classes (2)">
-        <compile files="PR83563_2.java"/>
-        <run class="PR83563_2"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs150" pr="83645" title="pertypewithin({interface}) illegal field modifier">
-        <compile files="PR83645.java" options="-Xlint:ignore"/>
-        <run class="PR83645"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" title="bad asm for enums" vm="1.5">
-        <compile files="Rainbow.java" options="-emacssym,-1.9,-Xset:minimalModel=false"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" pr="10461" title="missing name pattern">
-        <compile files="PR106461.aj">
-            <message kind="error" line="3" text="Syntax error on token &quot;(&quot;, &quot;name pattern&quot; expected"/>
-            <message kind="error" line="5" text="Syntax error on token &quot;)&quot;, &quot;name pattern&quot; expected"/>
-            <message kind="error" line="7" text="Syntax error on token &quot;.&quot;, &quot;name pattern&quot; expected"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" pr="106634" title="IllegalStateException unpacking signature of nested parameterized type">
-        <compile files="pr106634.aj" options="-1.9"/>
-    </ajc-test>
-        
-    <ajc-test dir="bugs150" title="(@Foo *)+ type pattern parse error">
-            <compile files="AnnotationPlusPatternParseError.aj" options="-1.9"/>
-    <!-- next line needs the change for inherited anno matching... -->
-        <!--compile files="AnnotationPlusPatternParseError.aj" options="-1.9">
-          <message kind="warning" line="19"/>
-        </compile-->
-    </ajc-test>
-
-    <ajc-test dir="bugs150" pr="80571" title="around advice on interface initializer">
-        <compile files="pr80571.aj">
-          <message kind="warning" text="The joinpoint 'constructor-call(void pr80571.&lt;init&gt;())' cannot be advised"/>
-        </compile>
-        <run class="pr80571">
-            <stdout>
-                <line text="before"/>
-                <line text="after"/>
-            </stdout>
-        </run>
-    </ajc-test>
- 
-     <ajc-test dir="bugs150" pr="78314" title="good error message for unmatched member syntax">
-        <compile files="pr78314.aj" options="-1.9">
-          <message kind="error" line="5" text="Syntax error on token &quot;foo&quot;, no accurate correction available"/>
-         </compile>
-        <compile files="pr78314.aj">
-          <message kind="error" line="5" text="Syntax error on token &quot;foo&quot;, no accurate correction available"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" pr="108377" title="itd field access inside itd method">
-        <compile files="pr108377.aj"/>
-        <run class="pr108377"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs150/pr108054" pr="108054" title="type variable with type variable bound">
-        <compile files="pr108054.aj" options="-1.9"/>
-        <compile files="ISequence.java,ICounter.java,ASequence.java" options="-1.9"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs150/pr108370" pr="108370" title="switch on enum inside ITD method">
-        <compile files="et/Q.java" options="-1.9"/>
-        <compile files="EnumTest.aj" options="-1.9 -inpath et"/>
-        <run class="EnumTest">
-            <stdout>
-                <line text="B!"/>
-            </stdout>
-        </run>
-    </ajc-test>
- 
-    <ajc-test dir="bugs150" pr="95992" title="inner type of generic interface reference from parameterized type">
-        <compile files="pr95992.aj" options="-1.9"/>
-    </ajc-test>
-
-
-    <ajc-test dir="bugs150" pr="104024" title="inner class passed as argument to varargs method">
-        <compile files="pr104024.aj" options="-1.9"/>
-    </ajc-test>  
-    
-    <ajc-test dir="bugs150" pr="107858" title="inlined field access in proceed call">
-        <compile files="pr107858.aj" options="-1.9">
-            <message kind="error" line="9" text="too many arguments to proceed, expected 0"></message>
-            <message kind="error" line="10" text="too many arguments to proceed, expected 0"></message>
-        </compile>
-    </ajc-test>  
- 
-    <ajc-test dir="bugs150/pr71159" pr="71159" title="visibility in signature matching with overrides - 1">
-        <compile files="pr71159.aj">
-            <message kind="warning" line="26" text="should match"/>
-        </compile>
-    </ajc-test>  
-
-    <ajc-test dir="bugs150/pr71159" pr="71159" title="visibility in signature matching with overrides - 2">
-        <compile files="PrivateITD.aj">
-            <message kind="warning" line="28" text="should match"/>
-        </compile>
-    </ajc-test>  
-
-    <ajc-test dir="bugs150/pr71159" pr="71159" title="visibility in signature matching with overrides - 3">
-        <compile files="pkg1/A.java,pkg1/B.java,pkg1/C.java,pkg2/ITDInDiffPackage.aj">
-            <message kind="warning" line="10" text="should match"/>
-        </compile>
-    </ajc-test>  
- 
-    <ajc-test dir="bugs150" pr="59196" title="args generated correctly for advice execution join point">
-        <compile files="pr59196.aj" options="-XnoInline -1.9"/>
-    </ajc-test>  
-  
-    <ajc-test dir="bugs150" pr="74048" title="no unused warnings on aspect types">
-        <compile files="pr74048.aj" options="-warn:unusedPrivate"/>
-    </ajc-test>  
-  
-    <ajc-test dir="bugs150" pr="59397" title="synthetic arguments on itd cons are not used in matching">
-        <compile files="pr59397.aj">
-            <message line="6" kind="warning" text="should match"/>
-        </compile>
-    </ajc-test>  
- 
-    <ajc-test dir="bugs150" pr="108602" title="parse generic type signature with parameterized type in interface">
-        <compile files="pr108602.java" options="-1.9"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs150" pr="105479" title="declare parents introducing override with covariance">
-        <compile files="pr105479.aj" options="-1.9"/>
-    </ajc-test>                   
-    
-    <ajc-test dir="bugs150" pr="105479" title="override and covariance with decp - runtime">
-        <compile files="pr105479part2.aj" options="-1.9"/>
-        <run class="pr105479part2">
-            <stdout>
-                <line text="in Test.hashCode()"/>
-                <line text="in Test.hashCode()"/>
-                <line text="id"/>
-                <line text="in Test.hashCode()"/>
-            </stdout>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="bugs150/pr105479/case1" pr="105479" title="override and covariance with decp - runtime separate files">
-        <compile files="ReturnTypeTest.aj,ReturnTypeTester.java,Driver.java" options="-1.9"/>
-        <run class="Driver">
-            <stdout>
-                <line text="in Test.hashCode()"/>
-                <line text="in Test.hashCode()"/>
-                <line text="id"/>
-                <line text="in Test.hashCode()"/>
-            </stdout>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr105479/case2" pr="105479" title="override and covariance with decp - binary weaving">
-        <compile files="ReturnTypeTest.java" outjar="jar1.jar" options="-1.9 -Xlint:ignore"/>
-        <compile files="ReturnTypeTester.java" outjar="jar2.jar" options="-1.9"/>
-        <compile inpath="jar1.jar;jar2.jar" options="-1.9"/>
-        <run class="ReturnTypeTester"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" pr="102212" title="abstract synchronized itdms not detected">
-        <compile files="pr102212.aj">
-            <message line="7" kind="error" text="The abstract method _abstract in type Parent can only set a visibility modifier, one of public or protected"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs150" pr="102212" title="synchronized itd interface methods">
-        <compile files="SynchronizedInterfaceMethods.aj" options="-1.9">
-        </compile>
-        <run class="SynchronizedInterfaceMethods"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs150" pr="101606" title="unused private pointcuts">
-        <compile files="pr101606.aj" options="-warn:unusedPrivate">
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr99125" pr="99125" title="itd interface method already existing on interface">
-        <compile files="p/pr99125.aj,p/I.java,p/J.java" options="-1.9">
-        </compile>
-        <compile files="Aspects.aj" options="-inpath p"/>
-        <run class="p.pr99125"/>
-        <compile files="p2/pr99125.aj,p/I.java,p/J.java"/> <!-- actually in package p, introduces incompatible change -->
-        <compile files="Aspects.aj" options="-inpath p">
-            <message kind="error" line="7" text="inter-type declaration from X conflicts with existing member"/>
-            <!-- 275032 - new error at affected member location too -->
-            <message kind="error" line="10" text="inter-type declaration from X conflicts with existing member"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr87530" pr="87530" title="final itd methods on interfaces">
-        <compile files="FinalITDMOnInterface.aj">
-            <message kind="error" line="12" text="Cannot override the final method from A.TestInterface"></message>
-        </compile>
-        <compile files="FinalITDMOnInterface2.aj">
-            <!--message kind="error" line="8" text="Cannot override the final method from A.TestInterface"></message-->
-            <message kind="error" line="8" text="can't override final void A$TestInterface.m()"></message>
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="bugs150" pr="108818" title="can't override private pointcut in abstract aspect">
-        <compile files="PrivatePointcutOverriding.aj">
-            <message kind="warning" line="19" text="matched join point from super advice"/>
-            <message kind="warning" line="21" text="matched join point from sub advice"/>
-        </compile>
-    </ajc-test>
- 
-    <ajc-test dir="bugs150" pr="108816" title="advising cflow advice execution">
-        <compile files="pr108816.aj" >
-        </compile>
-    </ajc-test>   
-
-    <ajc-test dir="bugs150/pr108902" pr="108902" title="no type mismatch on generic types in itds">
-        <compile files="Subject.java,Observer.java,ObserverProtocol.aj" >
-        </compile>
-    </ajc-test>   
-
-    <ajc-test dir="bugs150" pr="108903" title="super call in ITD">
-        <compile files="pr108903.aj" >
-            <message kind="error" line="14" text="The method print() is undefined for the type Object"/>
-        </compile>
-    </ajc-test>  
-
-    <ajc-test dir="bugs150" pr="109042" title="no unused parameter warnings for synthetic advice args">
-        <compile files="pr109042.aj" options="-warn:+unusedArgument -warn:+unusedPrivate -warn:+unusedImport -1.9">
-        </compile>
-    </ajc-test>  
-    
-    <ajc-test dir="bugs150" pr="109486" title="Internal compiler error (ClassParser.java:242)">
-        <compile files="PR109486.java" >
-          <message kind="error" line="1" text="The class PR109486 can be either abstract or final, not both"/>
-        </compile>
-    </ajc-test>  
-    
-    <ajc-test dir="bugs150" pr="109124" title="no verify error with set on inner type">
-        <compile files="VerifyErrorOnSet.aj" options="-1.9" >
-        </compile>
-        <run class="test.VerifyErrorOnSet"/>
-        <compile files="pr106874.aj" options="-1.9" >
-        </compile>
-        <run class="pr106874"/>    
-    </ajc-test>  
-        
-    <ajc-test dir="bugs150" pr="108826" title="cant find type error with generic return type or parameter">
-        <compile files="pr108826.aj" options="-1.9 -emacssym" >
-        </compile>
-    </ajc-test> 
- 
-     <ajc-test dir="bugs150" pr="105181" title="no verify error on generic collection member access">
-        <compile files="pr105181.aj" options="-1.9">
-        </compile>
-        <run class="pr105181"/>
-    </ajc-test> 
-
-    <ajc-test dir="bugs150/pr108903" pr="108903" title="super call in ITD - part 2">
-        <compile files="com/designpattern/decorator/HeaderDecorator.aj,com/designpattern/decorator/Main.java,com/designpattern/decorator/Order.java,com/designpattern/decorator/OrderDecorator.aj,com/designpattern/decorator/SalesOrder.java" options="-1.9" >
-        </compile>
-    </ajc-test> 
-        
-    <ajc-test dir="bugs150/pr103740" pr="103740" title="Compiler failure on at_annotation">
-     <compile files="AroundAdvice.aj" options="-1.9,-showWeaveInfo">
-       <message kind="weave" text="Join point 'method-execution(void C.m1())' in Type 'C' (AroundAdvice.aj:12) advised by before advice from 'ErrorHandling' (AroundAdvice.aj:8)"/>
-	   <message kind="weave" text="Join point 'method-execution(void C.m3())' in Type 'C' (AroundAdvice.aj:14) advised by before advice from 'ErrorHandling' (AroundAdvice.aj:8)"/>
-	 </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150/pr106554" pr="106554" title="Problem in staticinitialization with pertypewithin aspect">
-        <compile files="A.aj" options="-showWeaveInfo">
-          <message kind="weave" text="Join point 'staticinitialization(void A.&lt;clinit&gt;())' in Type 'A' (A.aj:1) advised by before advice from 'StopsInit' (A.aj:21)"/>
-        </compile>
-        <run class="A">
-          <stdout>
-            <line text="test = 1"/>
-          </stdout>
-        </run>
-    </ajc-test> 
-
-    <ajc-test dir="bugs150/SimpleInsuranceFailure" title="raw and generic type conversion with itd cons">
-        <compile files="" options=" -emacssym, -sourceroots ." >
-        </compile>
-    </ajc-test> 
-    
-    <ajc-test dir="bugs150" title="@annotation binding with around advice">
-        <compile files="AnnotationBinding.aj" options="-1.9"/>
-        <run class="AnnotationBinding"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" title="declare parents on a missing type">
-        <compile files="Pr76374.aj" options="-1.9">
-            <message kind="warning" line="3" text="no match for this type name"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs150" title="parameterized generic methods">
-        <compile files="Pr109283.aj" options="-1.9 -warn:indirectStatic">
-        </compile>
-    </ajc-test> 
-    
-    <ajc-test dir="bugs150" title="call join points in anonymous inner classes">
-        <compile files="pr104229.aj" options="-1.9">
-            <message kind="warning" line="54" text="bingo"/>
-            <message kind="warning" line="115" text="bingo"/>
-            <message kind="warning" line="130" text="bingo"/>
-        </compile>
-        <run class="pr104229">
-            <stdout>
-                <line text="call match class pr104229"/>
-                <line text="OK it worked!"/>
-            </stdout>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="bugs150" title="default impl of Runnable">
-        <compile files="pr88900.aj" options="-Xdev:Pinpoint">
-        </compile>
-    </ajc-test> 
-    
-     <ajc-test dir="bugs150" title="array clone call join points in 1.4 vs 1.3">
-        <compile files="pr102933.aj" options="-1.3">
-            <message kind="warning" line="7" text="a call within pr102933"/>
-        </compile>
-        <compile files="pr102933.aj" options="-1.4">
-            <message kind="warning" line="7" text="a call within pr102933"/>
-        </compile>     
-        <compile files="pr102933.aj" options="-1.9">
-            <message kind="warning" line="7" text="a call within pr102933"/>
-        </compile>   
-     </ajc-test> 
-     
-    <ajc-test dir="bugs150" pr="100195" title="debug info in around advice inlining">
-        <compile files="pr100195.aj">
-        </compile>
-        <run class="pr100195"/>
-    </ajc-test> 
-
-    <ajc-test dir="bugs150" title="weaveinfo message for declare at method on an ITDd method">
-        <compile files="pr113073.java" options="-1.9 -showWeaveInfo">
-			<message kind="weave" text="Type 'C' (pr113073.java) has intertyped method from 'D' (pr113073.java:'void C.anotherMethod()')"/>
-			<message kind="weave" text="'public void C.anotherMethod()' (pr113073.java) is annotated with @Annotation method annotation from 'B' (pr113073.java:3)"/>
-			<message kind="weave" text="Type 'C' (pr113073.java) has intertyped method from 'D' (pr113073.java:'void C.anotherMethod(java.lang.String)')"/>
-			<message kind="weave" text="'public void C.anotherMethod(String)' (pr113073.java) is annotated with @Annotation method annotation from 'B' (pr113073.java:3)"/>
-			<message kind="weave" text="Type 'C' (pr113073.java) has intertyped constructor from 'D' (pr113073.java:'void C."/>
-			<message kind="weave" text="'public void C.new(String)' (pr113073.java) is annotated with @Annotation constructor annotation from 'B' (pr113073.java:4)"/>
-        </compile>
-    </ajc-test> 
-
-    <ajc-test dir="bugs150/pr113447" title="no verify error with two this pcds">
-        <compile files="PR113447.java">
-        </compile>
-        <run class="PR113447"/>
-    </ajc-test> 
-
-	<ajc-test dir="bugs150/pr113447" title="no verify error with two at this pcds">
-        <compile files="PR113447a.java" options="-1.9">
-        </compile>
-        <run class="PR113447a"/>
-    </ajc-test>
-
-	<ajc-test dir="bugs150/pr113447" title="no verify error with at within pcds">
-        <compile files="PR113447b.java" options="-1.9">
-        </compile>
-        <run class="PR113447b"/>
-    </ajc-test>
-
-	<ajc-test dir="bugs150/pr113447" title="no verify error with at withincode pcds">
-        <compile files="PR113447c.java" options="-1.9">
-        </compile>
-        <run class="PR113447c"/>
-    </ajc-test>
-
-	<ajc-test dir="bugs150/pr113447" title="no verify error with at annotation pcds">
-        <compile files="PR113447d.java" options="-1.9">
-        </compile>
-        <run class="PR113447d"/>
-    </ajc-test>
-
-	<ajc-test dir="bugs150/pr113447" title="no verify error with two args pcds">
-        <compile files="PR113447e.java" options="-1.9">
-        </compile>
-        <run class="PR113447e"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs150" title="no StackOverflowError with circular pcd in generic aspect">
-        <compile files="pr115235.aj" options="-1.9">
-        	<message kind="warning" line="3" text="advice defined in GenericAbstractAspect has not been applied [Xlint:adviceDidNotMatch]"/>
-        	<message kind="error" text="circular pointcut declaration involving: pc()"/>
-        	<message kind="error" line="20" text="circular pointcut declaration involving: pc2()"/>
-	    </compile>
-    </ajc-test> 
-
-    <ajc-test dir="bugs150" title="no StackOverflowError with circular pcd in generic aspect - 2">
-        <compile files="pr115235b.aj" options="-1.9">
-        </compile>
-    </ajc-test>
-
-	<ajc-test dir="bugs150/pr115252" title="xlint message for improper exact annotation type">
-        <compile files="ExactAnnotationTypePattern.java" options="-1.9">
-			<message kind="warning" line="20" text="field blah"/>
-        	<message kind="warning" line="28" text="does not match because annotation @TypeAnnotation has @Target{ElementType.TYPE} [Xlint:unmatchedTargetKind]"/>
-        	<message kind="warning" line="37" text="does not match because annotation @FieldAnnotation has @Target{ElementType.FIELD} [Xlint:unmatchedTargetKind]"/>
-            <message kind="warning" line="46" text="does not match because annotation @MethodAnnotation has @Target{ElementType.METHOD} [Xlint:unmatchedTargetKind]"/>
-        </compile>
-    </ajc-test>
-
-	<ajc-test dir="bugs150/pr115252" title="xlint message for improper annotation type inside OR">
-        <compile files="OrTypePattern.java" options="-1.9">
-            <message kind="warning" line="26" text="does not match because annotation @FieldAnnotation has @Target{ElementType.FIELD} [Xlint:unmatchedTargetKind]"/>
-        	<message kind="warning" line="31" text="does not match because annotation @TypeAnnotation has @Target{ElementType.TYPE} [Xlint:unmatchedTargetKind]"/>
-        	<message kind="warning" line="31" text="does not match because annotation @FieldAnnotation has @Target{ElementType.FIELD} [Xlint:unmatchedTargetKind]"/>
-        </compile>
-    </ajc-test>
-
-	<ajc-test dir="bugs150/pr115252" title="xlint message for improper annotation type inside AND">
-        <compile files="AndTypePattern.java" options="-1.9">
-            <message kind="warning" line="23" text="does not match because annotation @FieldAnnotation has @Target{ElementType.FIELD} [Xlint:unmatchedTargetKind]"/>
-        </compile>
-    </ajc-test>
-
-	<ajc-test dir="bugs150/pr115252" title="xlint message for improper annotated return type">
-        <compile files="AnnotationReturnType.java" options="-1.9">
-            <!-- warnings coming from matching pointcuts and corresponding declare warnings -->
-			<message kind="warning" line="12" text="(@TypeAnnotation *) *(..)"/>
-			<message kind="warning" line="12" text="(@(TypeAnnotation || MethodAnnotation) *) *(..)"/>
-            <!-- xlint warnings that were put in as part of fix for pr115252 -->
-        	<message kind="warning" line="32" text="does not match because annotation @MethodAnnotation has @Target{ElementType.METHOD} [Xlint:unmatchedTargetKind]"/>
-        	<message kind="warning" line="37" text="does not match because annotation @MethodAnnotation has @Target{ElementType.METHOD} [Xlint:unmatchedTargetKind]"/>
-        </compile>
-    </ajc-test>
-
-	<ajc-test dir="bugs150/pr115252" title="xlint message for improper annotated declaring type">
-        <compile files="AnnotationDeclaringType.java" options="-1.9">
-            <!-- warning coming from matching pointcuts and corresponding declare warnings -->
-			<message kind="warning" line="13" text="* (@TypeAnnotation *).*(..)"/>
-            <!-- xlint warning that was put in as part of fix for pr115252 -->
-        	<message kind="warning" line="27" text="does not match because annotation @MethodAnnotation has @Target{ElementType.METHOD} [Xlint:unmatchedTargetKind]"/>
-        </compile>
-    </ajc-test>
-
-	<ajc-test dir="bugs150/pr115252" title="xlint message for improper annotated parameter type">
-        <compile files="AnnotationParameterType.java" options="-1.9">
-            <!-- warning coming from matching pointcuts and corresponding declare warnings -->
-			<message kind="warning" line="12" text="* *(@TypeAnnotation *)"/>
-            <!-- xlint warning that was put in as part of fix for pr115252 -->
-        	<message kind="warning" line="31" text="does not match because annotation @MethodAnnotation has @Target{ElementType.METHOD} [Xlint:unmatchedTargetKind]"/>
-        </compile>
-    </ajc-test>
-
-	<ajc-test dir="bugs150/pr115252" title="xlint message for improper annotated throws pattern">
-        <compile files="AnnotationThrowsPattern.java" options="-1.9">
-            <!-- warnings coming from matching pointcuts and corresponding declare warnings -->
-			<message kind="warning" line="12" text="(* *.*(..) throws (@TypeAnnotation *))"/>
-			<message kind="warning" line="12" text="* *.*(..) throws !(@MethodAnnotation *)"/>
-			<message kind="warning" line="14" text="(* *.*(..) throws !(@TypeAnnotation *))"/>
-			<message kind="warning" line="14" text="* *.*(..) throws !(@MethodAnnotation *)"/>
-            <!-- xlint warnings that were put in as part of fix for pr115252 -->
-        	<message kind="warning" line="40" text="does not match because annotation @MethodAnnotation has @Target{ElementType.METHOD} [Xlint:unmatchedTargetKind]"/>
-        	<message kind="warning" line="46" text="does not match because annotation @MethodAnnotation has @Target{ElementType.METHOD} [Xlint:unmatchedTargetKind]"/>
-        </compile>
-    </ajc-test>
-
-	<ajc-test dir="bugs150/pr115252" title="xlint message for more than one improper annotated parameter type">
-        <compile files="MoreThanOneTargetAnnotation.java" options="-1.9">
-            <!-- xlint warning that was put in as part of fix for pr115252 -->
-        	<message kind="warning" line="28" text="does not match because annotation @MethodAndFieldAnnotation has @Target{ElementType.FIELD,ElementType.METHOD} [Xlint:unmatchedTargetKind]"/>
-        	<message kind="warning" line="38" text="does not match because annotation @TypeAndMethodAnnotation has @Target{ElementType.METHOD,ElementType.TYPE} [Xlint:unmatchedTargetKind]"/>
-        </compile>
-    </ajc-test>
-
-	<ajc-test dir="bugs150/pr119019" title="no NPE when inaccessible method is called within itd">
-        <compile files="bar/TargetITDClass.java,foo/ITDWithACall.aj"/>
-        <run class="foo.ITDWithACall"/>
-    </ajc-test>
-
-	<ajc-test dir="bugs150" title="no NPE with or pointcut and more than one args">
-        <compile files="PR118149.aj"/>
-    </ajc-test>
-
-	<ajc-test dir="bugs150" title="no StringOutOfBoundsException with generic inner aspects">
-        <compile files="PR119543.java" options="-1.9">
-		   	<message kind="warning" line="8" text="advice defined in PR119543$A has not been applied [Xlint:adviceDidNotMatch]"/>
-        </compile>
-    </ajc-test>
-
-    <!-- ============================================================================ -->
-    <!-- ============================================================================ -->
-    
-    <!-- atOverride tests with ITDs -->
-    
-    <ajc-test dir="java5/generics/itds" pr="106630" title="atOverride used with ITDs">
-      <compile files="AtOverride.aj" options="-1.9"/>
-    </ajc-test>
-    <ajc-test dir="java5/generics/itds" pr="106630" title="atOverride used with ITDs - 1">
-      <compile files="AtOverride1.aj" options="-1.9">
-        <message kind="error" line="9" text="The method method() of type Child must override a superclass method"/>
-      </compile>
-    </ajc-test>
-    <ajc-test dir="java5/generics/itds" pr="106630" title="atOverride used with ITDs - 2">
-      <compile files="AtOverride2.aj" options="-1.9"/>
-    </ajc-test>
-    <ajc-test dir="java5/generics/itds" pr="106630" title="atOverride used with ITDs - 3">
-      <compile files="AtOverride3.aj" options="-1.9"/>
-    </ajc-test>
-    <ajc-test dir="java5/generics/itds" pr="106630" title="atOverride used with ITDs - 4">
-      <compile files="AtOverride4.aj" options="-1.9"/>
-    </ajc-test>
-    <ajc-test dir="java5/generics/itds" pr="106630" title="atOverride used with ITDs - 5">
-      <compile files="AtOverride5.aj" options="-1.9">
-        <message kind="error" line="11" text="The method method() of type Child must override a superclass method"/>
-      </compile>
-    </ajc-test>
-    <ajc-test dir="java5/generics/itds" pr="106630" title="atOverride used with ITDs - 6">
-      <compile files="AtOverride6.aj" options="-1.9"/>
-    </ajc-test>
-    <ajc-test dir="java5/generics/itds" pr="106630" title="atOverride used with ITDs - 7">
-      <compile files="AtOverride7.aj" options="-1.9"/>
-    </ajc-test>
-               
-    <!-- end of atOverride tests with ITDs -->
-
-    <ajc-test dir="../docs/dist/doc/examples/introduction" title="introduction sample" vm="1.5">
-        <compile files="CloneablePoint.java,ComparablePoint.java,HashablePoint.java,Point.java" options="-1.9 -Xlint:ignore"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/varargs" title="varargs in constructor sig" vm="1.5">
-        <compile files="Pr88652.aj" options="-1.9">
-            <message kind="warning" line="8" text="should match"/>
-            <message kind="warning" line="9" text="should match"/>        
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/varargs" title="Varargs with .. in pointcut" vm="1.5">
-        <compile files="pr93356.aj" options="-1.9">  
-        	<message kind="warning" line="5" text="a"/>
-        	<message kind="warning" line="5" text="b"/>    
-        	<message kind="warning" line="5" text="c"/>    
-        	<message kind="warning" line="5" text="d"/>    
-        	<message kind="warning" line="5" text="e"/>  
-        	<message kind="warning" line="5" text="k"/> 
-        	<message kind="warning" line="5" text="l"/>
-        	
-        	<message kind="warning" line="4" text="f"/>
-        	<message kind="warning" line="4" text="g"/>    
-        	<message kind="warning" line="4" text="h"/>    
-        	<message kind="warning" line="4" text="i"/>    
-        	<message kind="warning" line="4" text="j"/>  
-        	
-        	<message kind="warning" line="7" text="f"/>      
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/varargs" title="star varargs pattern" vm="1.5">
-        <compile files="StarVarargsPattern.aj" options="-1.9">
-            <message kind="warning" line="5" text="you used a varargs signature"/>
-            <message kind="warning" line="7" text="you used a varargs signature"/>        
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations" title="invalid cons syntax" vm="1.5">
-        <compile files="SyntaxError.aj" options="-1.9">
-            <message kind="error" line="3" text="Syntax error on token &quot;new&quot;, &quot;method name (not constructor)&quot; expected"/>
-        </compile>
-    </ajc-test>
-
-    <!-- hasmethod / hasfield tests -->
-
-   <ajc-test title="declare parents : hasmethod(..) - 1" dir="hasmember">
-        <compile files="HasMethod.aj">
-            <message kind="error" line="5" text="the type pattern hasmethod(* print(..)) can only be used when the -XhasMember option is set"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test title="declare parents : hasmethod(..) - 1" dir="hasmember">
-        <compile files="HasMethod.aj" options="-XhasMember">
-        </compile>
-        <run class="HasMethod"></run>
-    </ajc-test>
-
-    <ajc-test title="declare parents : hasmethod(..) - 2" dir="hasmember">
-        <compile files="HasMethodInherited.aj" options="-XhasMember">
-        </compile>
-        <run class="HasMethodInherited"></run>
-    </ajc-test>
-
-    <ajc-test title="declare parents : hasmethod(..) - 3" dir="hasmember">
-        <compile files="HasPrivateMethodInherited.aj" options="-XhasMember">
-        </compile>
-        <run class="HasPrivateMethodInherited"></run>
-    </ajc-test>
-
-    <ajc-test title="declare parents : hasmethod(..) - 4" dir="hasmember">
-        <compile files="HasMethodViaITD.aj" options="-XhasMember">
-            <message kind="warning" line="15" text="hasmethod matched on ITD ok"/>
-        </compile>
-    </ajc-test>
-         
-    <ajc-test title="declare parents : hasfield(..) - 1" dir="hasmember">
-        <compile files="HasField.aj" options="-XhasMember">
-        </compile>
-        <run class="HasField"></run>
-    </ajc-test>
-
-    <ajc-test title="declare parents : hasfield(..) - 2" dir="hasmember">
-        <compile files="HasFieldInherited.aj"  options="-XhasMember">
-        </compile>
-        <run class="HasFieldInherited"></run>
-    </ajc-test>
-
-    <ajc-test title="declare parents : hasfield(..) - 3" dir="hasmember">
-        <compile files="HasPrivateFieldInherited.aj" options="-XhasMember">
-        </compile>
-        <run class="HasPrivateFieldInherited"></run>
-    </ajc-test>
-                              
-    <!-- Annotation binding tests -->
-    
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="call annotation binding 1">
-        <compile files="CallAnnBinding.aj" options="-1.9"/>
-        <run class="CallAnnBinding"/>    
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="call annotation binding 2">
-        <compile files="CallAnnBinding2.aj" options="-1.9"/>
-        <run class="CallAnnBinding2"/>    
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="call annotation binding 3">
-        <compile files="CallAnnBinding3.aj" options="-1.9"/>
-        <run class="CallAnnBinding3"/>    
-    </ajc-test>
- 
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="call annotation binding 4">
-        <compile files="CallAnnBinding4.aj" options="-1.9"/>
-        <run class="CallAnnBinding4"/>    
-    </ajc-test>
-
-   <ajc-test dir="java5/annotations/binding" vm="1.5" title="call annotation binding 5">
-        <compile files="CallAnnBinding5.aj" options="-1.9"/>
-        <run class="CallAnnBinding5"/>    
-    </ajc-test>
-    
-           <ajc-test dir="java5/annotations/binding" vm="1.5" title="call annotation binding 6">
-        <compile files="CallAnnBinding6.aj" options="-1.9"/>
-        <run class="CallAnnBinding6"/>    
-    </ajc-test>
-    
-   <ajc-test dir="java5/annotations/binding" vm="1.5" title="call annotation binding 7">
-        <compile files="CallAnnBinding7.aj" options="-1.9"/>
-        <run class="CallAnnBinding7"/>    
-    </ajc-test>
-        
-     <ajc-test dir="java5/annotations/binding" vm="1.5" title="@target annotation binding 1">
-        <compile files="AtTarget1.aj" options="-1.9"/>
-        <run class="AtTarget1"/>    
-    </ajc-test>
-
-     <ajc-test dir="java5/annotations/binding" vm="1.5" title="@target annotation binding 2">
-        <compile files="AtTarget2.aj" options="-1.9"/>
-        <run class="AtTarget2"/>    
-    </ajc-test>
-
-     <ajc-test dir="java5/annotations/binding" vm="1.5" title="@target annotation binding 3">
-        <compile files="AtTarget3.aj" options="-1.9"/>
-        <run class="AtTarget3"/>    
-    </ajc-test>
-
-     <ajc-test dir="java5/annotations/binding" vm="1.5" title="@target annotation binding 4">
-        <compile files="AtTarget4.aj" options="-1.9"/>
-        <run class="AtTarget4"/>    
-    </ajc-test>
-
-     <ajc-test dir="java5/annotations/binding/usingPackageNames" vm="1.5" title="@target annotation binding 5">
-        <compile files="MyAspect.aj,MyAnnotation.java,MyClass.java" options="-1.9"/>
-        <run class="test.MyClass"/>    
-    </ajc-test>
-
-     <ajc-test dir="java5/annotations/binding" vm="1.5" title="@this annotation binding 1">
-        <compile files="AtThis1.aj" options="-1.9"/>
-        <run class="AtThis1"/>    
-    </ajc-test>
-
-     <ajc-test dir="java5/annotations/binding" vm="1.5" title="@this annotation binding 2">
-        <compile files="AtThis2.aj" options="-1.9"/>
-        <run class="AtThis2"/>    
-    </ajc-test>
-
-     <ajc-test dir="java5/annotations/binding" vm="1.5" title="@this annotation binding 3">
-        <compile files="AtThis3.aj" options="-1.9"/>
-        <run class="AtThis3"/>    
-    </ajc-test>
-
-     <ajc-test dir="java5/annotations/binding" vm="1.5" title="@this annotation binding 4">
-        <compile files="AtThis4.aj" options="-1.9"/>
-        <run class="AtThis4"/>    
-    </ajc-test>
-
-     <ajc-test dir="java5/annotations/binding" vm="1.5" title="@this annotation binding 5">
-        <compile files="AtThis5.aj" options="-1.9"/>
-        <run class="AtThis5"/>    
-    </ajc-test>
-
-     <ajc-test dir="java5/annotations/binding" vm="1.5" title="@args annotation binding 1">
-        <compile files="AtArgs1.aj" options="-1.9"/>
-        <run class="AtArgs1"/>    
-    </ajc-test>
-
-     <ajc-test dir="java5/annotations/binding" vm="1.5" title="@args annotation binding 2">
-        <compile files="AtArgs2.aj" options="-1.9"/>
-        <run class="AtArgs2"/>    
-    </ajc-test>
-
-     <ajc-test dir="java5/annotations/binding" vm="1.5" title="@args annotation binding 3">
-        <compile files="AtArgs3.aj" options="-1.9"/>
-        <run class="AtArgs3"/>    
-    </ajc-test>
-
-     <ajc-test dir="java5/annotations/binding" vm="1.5" title="@args annotation binding 4">
-        <compile files="AtArgs4.aj" options="-1.9"/>
-        <run class="AtArgs4"/>    
-    </ajc-test>
-
-     <ajc-test dir="java5/annotations/binding" vm="1.5" title="@args annotation binding 5">
-        <compile files="AtArgs5.aj" options="-1.9"/>
-        <run class="AtArgs5"/>    
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="execution and @annotation">
-        <compile files="ExecutionAnnBinding1.aj" options="-1.9"/>
-        <run class="ExecutionAnnBinding1"/>    
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="set and @annotation">
-        <compile files="FieldAnnBinding1.aj" options="-1.9"/>
-        <run class="FieldAnnBinding1"/>    
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="get and @annotation">
-        <compile files="FieldAnnBinding2.aj" options="-1.9"/>
-        <run class="FieldAnnBinding2"/>    
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="get and @annotation with arrays">
-        <compile files="FieldAnnBinding3.aj" options="-1.9"/>
-        <run class="FieldAnnBinding3"/>    
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="cons call and @annotation">
-        <compile files="CtorAnnBinding1.aj" options="-1.9"/>
-        <run class="CtorAnnBinding1"/>    
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="cons exe and @annotation">
-        <compile files="CtorAnnBinding2.aj" options="-1.9"/>
-        <run class="CtorAnnBinding2"/>    
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="staticinit and @annotation">
-        <compile files="StaticInitBinding.aj" options="-1.9"/>
-        <run class="StaticInitBinding"/>    
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="preinit and @annotation">
-        <compile files="PreInitBinding.aj" options="-1.9"/>
-        <run class="PreInitBinding"/>    
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="init and @annotation">
-        <compile files="InitBinding.aj" options="-1.9"/>
-        <run class="InitBinding"/>    
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="adviceexecution and @annotation">
-        <compile files="AdviceExecBinding.aj" options="-1.9"/>
-        <run class="AdviceExecBinding"/>    
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="handler and @annotation">
-        <compile files="HandlerBinding.aj" options="-1.9"/>
-        <run class="HandlerBinding"/>    
-    </ajc-test>
-        
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="@withincode() and call(* println(..))">
-       <compile files="WithinCodeBinding1.aj" options="-1.9"/>
-       <run class="WithinCodeBinding1"/>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="@within">
-       <compile files="WithinBinding1.aj" options="-1.9"/>
-       <run class="WithinBinding1"/>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="@within - multiple types">
-       <compile files="WithinBinding2.aj" options="-1.9"/>
-       <run class="WithinBinding2"/>
-    </ajc-test>
- 
-    <ajc-test dir="java5/annotations/binding/complexExample" vm="1.5" title="packages and no binding">
-        <compile files="A.java,B.java,Color.java,X.java" options="-1.9"/>
-        <run class="a.b.c.A"/>    
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/binding/complexExample" vm="1.5" title="packages and binding">
-        <compile files="A.java,B.java,Color.java,X2.java" options="-1.9"/>
-        <run class="a.b.c.A"/>    
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/binding" vm="1.5" title="binding with static methods">
-        <compile files="StaticMethods.java" options="-1.9"/>
-        <run class="StaticMethods"/>    
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations" vm="1.5" title="annotation matching on call">
-        <weave classesFiles="AnnotatedType.java,SimpleAnnotation.java,SimpleAnnotation2.java"
-               aspectsFiles="AnnotationAspect02.aj"
-               options="-1.9,-showWeaveInfo">
-               <message kind="weave" text="Type 'AnnotatedType' (AnnotatedType.java:3) advised by before advice from 'AnnotationAspect02' (aspects.jar!AnnotationAspect02.class:4(from AnnotationAspect02.aj))"/>
-               <message kind="weave" text="Type 'AnnotatedType' (AnnotatedType.java:3) advised by before advice from 'AnnotationAspect02' (aspects.jar!AnnotationAspect02.class:2(from AnnotationAspect02.aj))"/>
-               <message kind="weave" text="Type 'AnnotatedType' (AnnotatedType.java:4) advised by before advice from 'AnnotationAspect02' (aspects.jar!AnnotationAspect02.class:4(from AnnotationAspect02.aj))"/>
-        </weave>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations" vm="1.5" title="at annotation matching">
-        <weave classesFiles="AnnotatedType.java,SimpleAnnotation.java,SimpleAnnotation2.java"
-               aspectsFiles="AnnotationAspect03.aj"
-               options="-1.9,-showWeaveInfo">
-               <message kind="warning" line="8" text="@annotation matched here"/>
-        </weave>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/within_code" vm="1.5" title="annotations and within(code)">
-        <weave classesFiles="TestingAnnotations.java"
-               aspectsFiles="WithinAndWithinCodeTests.java"
-               options="-1.9,-showWeaveInfo">
-               <message kind="warning" line="31" text="@within match on non-inherited annotation"/>
-               <message kind="warning" line="39" text="@within match on non-inherited annotation"/>
-               <message kind="warning" line="39" text="@within match on inheritable annotation"/>
-               <message kind="warning" line="43" text="@within match on inheritable annotation"/>
-               <message kind="warning" line="32" text="@withincode match"/>
-        </weave>
-    </ajc-test>    
-    
-    <ajc-test dir="java5/annotations/within" vm="1.5" title="annotations and within">
-        <weave classesFiles="PlainWithin.java"
-               aspectsFiles="PlainWithinTests.java"
-               options="-1.9,-showWeaveInfo">
-               <message kind="warning" line="21" text="positive within match on annotation"/>
-               <message kind="warning" line="25" text="negative within match on annotation"/>
-        </weave>
-    </ajc-test>   
-    
-    <ajc-test dir="java5/annotations/thisOrtarget" vm="1.5" title="must have runtime retention">
-        <compile options="-1.9" files="NotRuntimeRetention.aj">
-         <message kind="error" line="20" text="Annotation type MySourceAnnotation does not have runtime retention"/>
-            <message kind="error" line="21" text="Annotation type MyClassAnnotation does not have runtime retention"/>
-            <message kind="error" line="22" text="Annotation type MyAnnotation does not have runtime retention"/>
-        </compile>
-    </ajc-test>
-     
-    <ajc-test dir="java5/annotations/thisOrtarget" vm="1.5" title="inheritable or not">
-        <compile options="-1.9" files="TestingAnnotations.java,ThisOrTargetTests.aj">
-        </compile>
-        <run class="TestingAnnotations"/>
-    </ajc-test> 
-
-    <ajc-test dir="java5/annotations/thisOrtarget" vm="1.5" title="use of @this/target in deow">
-        <compile options="-1.9" files="TestingAnnotations.java,DeclareEoW.java">
-               <message kind="error" line="3" text="this() pointcut designator cannot be used in declare statement"/>
-               <message kind="error" line="5" text="target() pointcut designator cannot be used in declare statement"/>
-        </compile>
-    </ajc-test> 
-
-    <ajc-test dir="java5/annotations/args" vm="1.5" title="@args tests">
-        <compile options="-1.9" files="TestingArgsAnnotations.java,AtArgsAspect.java">
-        </compile>
-        <run class="TestingArgsAnnotations"/>
-    </ajc-test> 
-    
-    <ajc-test dir="java5/annotations/args" vm="1.5" title="use of @args in deow">
-        <compile options="-1.9" files="TestingArgsAnnotations.java,DeclareEoW.java">
-               <message kind="error" line="3" text="args() pointcut designator cannot be used in declare statement"/>
-        </compile>
-    </ajc-test> 
-    
-    <ajc-test dir="java5/annotations" vm="1.5" title="compiling an annotation">
-        <compile options="-1.9" files="SimpleAnnotation.java">
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations" vm="1.5" title="compiling annotated file">
-        <compile options="-1.9" files="SimpleAnnotation.java,AnnotatedType.java">
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/within" vm="1.5" title="annotations and within (src)">
-        <compile files="PlainWithin.java,PlainWithinTests.java"
-               aspectsFiles="PlainWithinTests.java"
-               options="-1.9">
-               <message kind="warning" line="21" text="positive within match on annotation"/>
-               <message kind="warning" line="25" text="negative within match on annotation"/>
-        </compile>
-    </ajc-test>   
-
-    <ajc-test dir="java5/annotations/attarget" vm="1.5" title="losing annotations...">
-        <compile options="-1.9" files="Program.java,AtTargetAspect.java">
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations" vm="1.5" title="no itds on annotation types">
-        <compile files="AnnotatedType.java,SimpleAnnotation.java,SimpleAnnotation2.java,AnnotationAspect01.aj"
-               options="-1.9">
-               <message kind="error" line="4" text="can't make inter-type constructor declarations"/>
-               <message kind="error" line="8" text="can't make inter-type method declarations"/>
-               <message kind="error" line="13" text="can't make inter-type field declarations"/>
-        </compile>
-    </ajc-test>   
-
-   <ajc-test dir="java5/annotations" vm="1.5" title="no declare parents on annotation types">
-        <compile files="AnnotatedType.java,SimpleAnnotation.java,SimpleAnnotation2.java,AnnotationAspect04.aj"
-               options="-1.9">
-               <message kind="error" line="7" text="can't use declare parents to alter supertype of annotation type SimpleAnnotation"/>
-               <message kind="error" line="10" text="can't use declare parents to make 'java.lang.annotation.Annotation' the parent of type"/>
-               <message kind="error" line="4" text="can't use declare parents to make annotation type SimpleAnnotation implement an interface"/>
-        </compile>
-    </ajc-test>   
-
-   <ajc-test dir="java5/annotations" vm="1.5" title="declare parents wildcards matching annotation types">
-        <compile files="AnnotatedType.java,SimpleAnnotation.java,SimpleAnnotation2.java,AnnotationAspect05.aj"
-               options="-1.9">
-               <message kind="warning" line="4" text="annotation type SimpleAnnotation2 matches a declare parents type pattern but is being ignored"/>
-               <message kind="warning" line="4" text="annotation type SimpleAnnotation matches a declare parents type pattern but is being ignored"/>
-        </compile>
-    </ajc-test>   
-    
-   <ajc-test dir="java5/annotations/binding/complexExample" vm="1.5" title="annotated any pattern">
-        <compile files="A.java,B.java,C.java,Color.java,X3.java"
-               options="-1.9">
-        </compile>
-        <run class="g.h.i.C"/>
-        <run class="a.b.c.A"/>
-    </ajc-test>   
-    
-   <ajc-test dir="java5/annotations/binding/complexExample" vm="1.5" title="annotation not imported">
-        <compile files="A.java,B.java,C.java,Color.java,X4.java"
-               options="-1.9">
-               <message kind="warning" line="6" text="no match for this type name: Color"/>
-        </compile>
-        <run class="a.b.c.A"/>
-    </ajc-test>   
-    
-    <ajc-test dir="java5/annotations/itds" vm="1.5" title="annotated public itds">
-      <compile files="AtItd2.aj" options="-1.9"/>
-      <run class="AtItd2"/>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/itds" vm="1.5" title="annotated public itds - values">
-      <compile files="AtItd3.aj" options="-1.9"/>
-      <run class="AtItd3"/>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/itds" vm="1.5" title="annotated public itds - multiple complex annotations">
-      <compile files="AtItd4.aj" options="-1.9"/>
-      <run class="AtItd4"/>
-    </ajc-test>
-    
-    
-    <ajc-test dir="java5/annotations/itds" vm="1.5" title="nasty annotation and itds test">
-        <compile files="AnnotationsAndITDs.aj" options="-1.9">
-            <!-- first two are ITCs, second two are ITCs annotated via declare @ctor, third is default ctor -->
-            <message kind="warning" line="17" text="execution(@SomeAnnotation ...new(..)"/>    
-            <message kind="warning" line="20" text="execution(@SomeAnnotation ...new(..)"/>    
-            <message kind="warning" line="45" text="execution(@SomeAnnotation ...new(..)"/>    
-            <message kind="warning" line="46" text="execution(@SomeAnnotation ...new(..)"/>
-            <message kind="warning" line="180" text="execution(@SomeAnnotation ...new(..)"/>
-
-			<!-- first four are fields annotated via declare, last two are directly annotated ITDs -->
-            <message kind="warning" line="59" text="set(@SomeAnnotation...)"/>    
-            <message kind="warning" line="60" text="set(@SomeAnnotation...)"/>    
-            <message kind="warning" line="70" text="set(@SomeAnnotation...)"/>    
-            <message kind="warning" line="71" text="set(@SomeAnnotation...)"/>    
-            <message kind="warning" line="76" text="set(@SomeAnnotation...)"/>    
-            <message kind="warning" line="77" text="set(@SomeAnnotation...)"/>  
-
-			<!-- annotations added via declare -->
-            <message kind="warning" line="175" text="si(@SomeAnnotation...)"/>  
-            <message kind="warning" line="180" text="si(@SomeAnnotation...)"/>  
-            
-            <message kind="warning" line="25" text="execution(@SomeAnnotation ...)"/>        
-            <message kind="warning" line="28" text="execution(@SomeAnnotation ...)"/>        
-            <message kind="warning" line="52" text="execution(@SomeAnnotation ...)"/>        
-            <message kind="warning" line="53" text="execution(@SomeAnnotation ...)"/>    
-            <!--message kind="warning" line="70" text="set(@SomeAnnotation...)"/>    
-            <message kind="warning" line="71" text="set(@SomeAnnotation...)"/-->    
-        </compile>
-        <run class="AnnotationsAndITDs">
-            <stderr>
-                <line text="@type java.lang.System (AnnotationsAndITDs.aj:0)"/>
-                <line text="hello AnnotationsAndITDs (AnnotationsAndITDs.aj:17)"/>
-                <line text="goodbye java.lang.String (AnnotationsAndITDs.aj:20)"/>
-                <line text="goodbye java.lang.String (AnnotationsAndITDs.aj:20)"/>
-                <line text="y java.lang.Integer (AnnotationsAndITDs.aj:28)"/>
-                <line text="d java.lang.Double (AnnotationsAndITDs.aj:70)"/>
-                <line text="f java.lang.Double (AnnotationsAndITDs.aj:71)"/>
-                <line text="@type java.lang.System (AnnotationsAndITDs.aj:0)"/>
-                <line text="@field ITDMe2 (AnnotationsAndITDs.aj:59)"/>
-                <line text="@field ITDMe2 (AnnotationsAndITDs.aj:60)"/>
-                <line text="@cons java.lang.String (AnnotationsAndITDs.aj:45)"/>
-                <line text="@field ITDMe2 (AnnotationsAndITDs.aj:59)"/>
-                <line text="@field ITDMe2 (AnnotationsAndITDs.aj:60)"/>
-                <line text="@cons java.lang.String (AnnotationsAndITDs.aj:46)"/>
-                <line text="@cons java.lang.String (AnnotationsAndITDs.aj:46)"/>
-                <line text="@method ITDMe2 (AnnotationsAndITDs.aj:53)"/>
-                <line text="@field ITDMe2 (AnnotationsAndITDs.aj:76)"/>
-                <line text="@field ITDMe2 (AnnotationsAndITDs.aj:77)"/>
-                
-                <!--
-                <line text="method bar has 1 params, first param annotation is @ParamAnnotation"/>
-                -->
-            </stderr>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/declare" pr="91858" title="declare @Type (should be @type)">
-        <compile files="DeathByPoorSpelling.aj" options="-1.9">
-            <message kind="error" line="6" text="Syntax error on token &quot;:&quot;, &quot;one of type, method, field, constructor&quot; expected"/>
-        </compile>
-    </ajc-test>
-    
-   <!-- ======================================================================================= -->
-   <!--               Autoboxing tests                                                          -->
-   <!-- ======================================================================================= -->
-
-   <ajc-test dir="java5/autoboxing" vm="1.5" title="simple boxing test">
-        <compile files="AutoboxingB.java,AutoboxingC.java,AutoboxingD.java,AutoboxingF.java,AutoboxingI.java,AutoboxingJ.java,AutoboxingS.java,AutoboxingZ.java,SimpleAutoboxing.java,SimpleAutoboxingAspect.aj"
-               options="-1.9,-showWeaveInfo">
-               <message kind="weave" text="Type 'SimpleAutoboxing' (SimpleAutoboxing.java:7) advised by before advice from 'SimpleAutoboxingAspect' (SimpleAutoboxingAspect.aj:8)"/>
-               <message kind="weave" text="Type 'SimpleAutoboxing' (SimpleAutoboxing.java:7) advised by before advice from 'SimpleAutoboxingAspect' (SimpleAutoboxingAspect.aj:4)"/>
-        </compile>
-        <run class="SimpleAutoboxing">
-          <stderr>
-              <line text="Matching by Integer:20000"/>
-              <line text="Matching by int:20000"/>
-              <line text="method_takes_Integer=20000"/>
-          </stderr>
-        </run>
-   </ajc-test>   
-
-   <ajc-test dir="java5/autoboxing" vm="1.5" title="integer boxing">
-        <compile files="AutoboxingB.java,AutoboxingC.java,AutoboxingD.java,AutoboxingF.java,AutoboxingI.java,AutoboxingJ.java,AutoboxingS.java,AutoboxingZ.java,SimpleAutoboxing.java,AspectInteger.aj"
-               options="-1.9,-showWeaveInfo">
-               <message kind="weave" text="Type 'AutoboxingI' (AutoboxingI.java:11) advised by before advice from 'AspectInteger' (AspectInteger.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingI' (AutoboxingI.java:11) advised by before advice from 'AspectInteger' (AspectInteger.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingI' (AutoboxingI.java:12) advised by before advice from 'AspectInteger' (AspectInteger.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingI' (AutoboxingI.java:12) advised by before advice from 'AspectInteger' (AspectInteger.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingI' (AutoboxingI.java:13) advised by before advice from 'AspectInteger' (AspectInteger.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingI' (AutoboxingI.java:13) advised by before advice from 'AspectInteger' (AspectInteger.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingI' (AutoboxingI.java:14) advised by before advice from 'AspectInteger' (AspectInteger.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingI' (AutoboxingI.java:14) advised by before advice from 'AspectInteger' (AspectInteger.aj:4)"/>
-        </compile>
-        <run class="AutoboxingI">
-          <stderr>
-              <line text="Matching by Integer:10000"/>
-              <line text="Matching by int:10000"/>
-              <line text="method_takes_Integer=10000"/>
-              <line text="Matching by Integer:20000"/>
-              <line text="Matching by int:20000"/>
-              <line text="method_takes_Integer=20000"/>
-              <line text="Matching by Integer:30000"/>
-              <line text="Matching by int:30000"/>
-              <line text="method_takes_int=30000"/>
-              <line text="Matching by Integer:40000"/>
-              <line text="Matching by int:40000"/>
-              <line text="method_takes_int=40000"/>
-          </stderr>
-        </run>
-   </ajc-test>   
-   
-     <ajc-test dir="java5/autoboxing" vm="1.5" title="char boxing">
-        <compile files="AutoboxingB.java,AutoboxingC.java,AutoboxingD.java,AutoboxingF.java,AutoboxingI.java,AutoboxingJ.java,AutoboxingS.java,AutoboxingZ.java,SimpleAutoboxing.java,AspectChar.aj"
-               options="-1.9,-showWeaveInfo">
-               <message kind="weave" text="Type 'AutoboxingC' (AutoboxingC.java:11) advised by before advice from 'AspectChar' (AspectChar.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingC' (AutoboxingC.java:11) advised by before advice from 'AspectChar' (AspectChar.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingC' (AutoboxingC.java:12) advised by before advice from 'AspectChar' (AspectChar.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingC' (AutoboxingC.java:12) advised by before advice from 'AspectChar' (AspectChar.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingC' (AutoboxingC.java:13) advised by before advice from 'AspectChar' (AspectChar.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingC' (AutoboxingC.java:13) advised by before advice from 'AspectChar' (AspectChar.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingC' (AutoboxingC.java:14) advised by before advice from 'AspectChar' (AspectChar.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingC' (AutoboxingC.java:14) advised by before advice from 'AspectChar' (AspectChar.aj:4)"/>
-        </compile>
-        <run class="AutoboxingC">
-          <stderr>
-              <line text="Character:1"/>
-              <line text="char:1"/>
-              <line text="method_takes_Character=1"/>
-              <line text="Character:2"/>
-              <line text="char:2"/>
-              <line text="method_takes_Character=2"/>
-              <line text="Character:3"/>
-              <line text="char:3"/>
-              <line text="method_takes_char=3"/>
-              <line text="Character:4"/>
-              <line text="char:4"/>
-              <line text="method_takes_char=4"/>
-          </stderr>
-        </run>
-   </ajc-test>   
-   
-       <ajc-test dir="java5/autoboxing" vm="1.5" title="double boxing">
-        <compile files="AutoboxingB.java,AutoboxingC.java,AutoboxingD.java,AutoboxingF.java,AutoboxingI.java,AutoboxingJ.java,AutoboxingS.java,AutoboxingZ.java,SimpleAutoboxing.java,AspectDouble.aj"
-               options="-1.9,-showWeaveInfo">
-               <message kind="weave" text="Type 'AutoboxingD' (AutoboxingD.java:11) advised by before advice from 'AspectDouble' (AspectDouble.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingD' (AutoboxingD.java:11) advised by before advice from 'AspectDouble' (AspectDouble.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingD' (AutoboxingD.java:12) advised by before advice from 'AspectDouble' (AspectDouble.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingD' (AutoboxingD.java:12) advised by before advice from 'AspectDouble' (AspectDouble.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingD' (AutoboxingD.java:13) advised by before advice from 'AspectDouble' (AspectDouble.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingD' (AutoboxingD.java:13) advised by before advice from 'AspectDouble' (AspectDouble.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingD' (AutoboxingD.java:14) advised by before advice from 'AspectDouble' (AspectDouble.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingD' (AutoboxingD.java:14) advised by before advice from 'AspectDouble' (AspectDouble.aj:4)"/>
-        </compile>
-        <run class="AutoboxingD">
-          <stderr>
-              <line text="Double:100.0"/>
-              <line text="double:100.0"/>
-              <line text="method_takes_Double=100.0"/>
-              <line text="Double:200.0"/>
-              <line text="double:200.0"/>
-              <line text="method_takes_Double=200.0"/>
-              <line text="Double:300.0"/>
-              <line text="double:300.0"/>
-              <line text="method_takes_double=300.0"/>
-              <line text="Double:400.0"/>
-              <line text="double:400.0"/>
-              <line text="method_takes_double=400.0"/>
-          </stderr>
-        </run>
-   </ajc-test>   
-
-   <ajc-test dir="java5/autoboxing" vm="1.5" title="float boxing">
-        <compile files="AutoboxingB.java,AutoboxingC.java,AutoboxingD.java,AutoboxingF.java,AutoboxingI.java,AutoboxingJ.java,AutoboxingS.java,AutoboxingZ.java,SimpleAutoboxing.java,AspectFloat.aj"
-               options="-1.9,-showWeaveInfo">
-               <message kind="weave" text="Type 'AutoboxingF' (AutoboxingF.java:11) advised by before advice from 'AspectFloat' (AspectFloat.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingF' (AutoboxingF.java:11) advised by before advice from 'AspectFloat' (AspectFloat.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingF' (AutoboxingF.java:12) advised by before advice from 'AspectFloat' (AspectFloat.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingF' (AutoboxingF.java:12) advised by before advice from 'AspectFloat' (AspectFloat.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingF' (AutoboxingF.java:13) advised by before advice from 'AspectFloat' (AspectFloat.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingF' (AutoboxingF.java:13) advised by before advice from 'AspectFloat' (AspectFloat.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingF' (AutoboxingF.java:14) advised by before advice from 'AspectFloat' (AspectFloat.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingF' (AutoboxingF.java:14) advised by before advice from 'AspectFloat' (AspectFloat.aj:4)"/>
-        </compile>
-        <run class="AutoboxingF">
-          <stderr>
-              <line text="Float:100.0"/>
-              <line text="float:100.0"/>
-              <line text="method_takes_Float=100.0"/>
-              <line text="Float:200.0"/>
-              <line text="float:200.0"/>
-              <line text="method_takes_Float=200.0"/>
-              <line text="Float:300.0"/>
-              <line text="float:300.0"/>
-              <line text="method_takes_float=300.0"/>
-              <line text="Float:400.0"/>
-              <line text="float:400.0"/>
-              <line text="method_takes_float=400.0"/>
-          </stderr>
-        </run>
-   </ajc-test>   
-
-   <ajc-test dir="java5/autoboxing" vm="1.5" title="short boxing">
-        <compile files="AutoboxingB.java,AutoboxingC.java,AutoboxingD.java,AutoboxingF.java,AutoboxingI.java,AutoboxingJ.java,AutoboxingS.java,AutoboxingZ.java,SimpleAutoboxing.java,AspectShort.aj"
-               options="-1.9,-showWeaveInfo">
-               <message kind="weave" text="Type 'AutoboxingS' (AutoboxingS.java:11) advised by before advice from 'AspectShort' (AspectShort.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingS' (AutoboxingS.java:11) advised by before advice from 'AspectShort' (AspectShort.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingS' (AutoboxingS.java:12) advised by before advice from 'AspectShort' (AspectShort.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingS' (AutoboxingS.java:12) advised by before advice from 'AspectShort' (AspectShort.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingS' (AutoboxingS.java:13) advised by before advice from 'AspectShort' (AspectShort.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingS' (AutoboxingS.java:13) advised by before advice from 'AspectShort' (AspectShort.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingS' (AutoboxingS.java:14) advised by before advice from 'AspectShort' (AspectShort.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingS' (AutoboxingS.java:14) advised by before advice from 'AspectShort' (AspectShort.aj:4)"/>
-        </compile>
-        <run class="AutoboxingS">
-          <stderr>
-              <line text="Short:100"/>
-              <line text="short:100"/>
-              <line text="method_takes_Short=100"/>
-              <line text="Short:200"/>
-              <line text="short:200"/>
-              <line text="method_takes_Short=200"/>
-              <line text="Short:300"/>
-              <line text="short:300"/>
-              <line text="method_takes_short=300"/>
-              <line text="Short:400"/>
-              <line text="short:400"/>
-              <line text="method_takes_short=400"/>
-          </stderr>
-        </run>
-   </ajc-test>   
-
-   <ajc-test dir="java5/autoboxing" vm="1.5" title="long boxing">
-        <compile files="AutoboxingB.java,AutoboxingC.java,AutoboxingD.java,AutoboxingF.java,AutoboxingI.java,AutoboxingJ.java,AutoboxingS.java,AutoboxingZ.java,SimpleAutoboxing.java,AspectLong.aj"
-               options="-1.9,-showWeaveInfo">
-               <message kind="weave" text="Type 'AutoboxingJ' (AutoboxingJ.java:11) advised by before advice from 'AspectLong' (AspectLong.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingJ' (AutoboxingJ.java:11) advised by before advice from 'AspectLong' (AspectLong.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingJ' (AutoboxingJ.java:12) advised by before advice from 'AspectLong' (AspectLong.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingJ' (AutoboxingJ.java:12) advised by before advice from 'AspectLong' (AspectLong.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingJ' (AutoboxingJ.java:13) advised by before advice from 'AspectLong' (AspectLong.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingJ' (AutoboxingJ.java:13) advised by before advice from 'AspectLong' (AspectLong.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingJ' (AutoboxingJ.java:14) advised by before advice from 'AspectLong' (AspectLong.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingJ' (AutoboxingJ.java:14) advised by before advice from 'AspectLong' (AspectLong.aj:4)"/>
-        </compile>
-        <run class="AutoboxingJ">
-          <stderr>
-              <line text="Long:1000000"/>
-              <line text="long:1000000"/>
-              <line text="method_takes_Long=1000000"/>
-              <line text="Long:2000000"/>
-              <line text="long:2000000"/>
-              <line text="method_takes_Long=2000000"/>
-              <line text="Long:3000000"/>
-              <line text="long:3000000"/>
-              <line text="method_takes_long=3000000"/>
-              <line text="Long:4000000"/>
-              <line text="long:4000000"/>
-              <line text="method_takes_long=4000000"/>
-          </stderr>
-        </run>
-   </ajc-test>   
-
-   <ajc-test dir="java5/autoboxing" vm="1.5" title="boolean boxing">
-        <compile files="AutoboxingB.java,AutoboxingC.java,AutoboxingD.java,AutoboxingF.java,AutoboxingI.java,AutoboxingJ.java,AutoboxingS.java,AutoboxingZ.java,SimpleAutoboxing.java,AspectBoolean.aj"
-               options="-1.9,-showWeaveInfo">
-               <message kind="weave" text="Type 'AutoboxingZ' (AutoboxingZ.java:9) advised by before advice from 'AspectBoolean' (AspectBoolean.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingZ' (AutoboxingZ.java:9) advised by before advice from 'AspectBoolean' (AspectBoolean.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingZ' (AutoboxingZ.java:10) advised by before advice from 'AspectBoolean' (AspectBoolean.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingZ' (AutoboxingZ.java:10) advised by before advice from 'AspectBoolean' (AspectBoolean.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingZ' (AutoboxingZ.java:11) advised by before advice from 'AspectBoolean' (AspectBoolean.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingZ' (AutoboxingZ.java:11) advised by before advice from 'AspectBoolean' (AspectBoolean.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingZ' (AutoboxingZ.java:12) advised by before advice from 'AspectBoolean' (AspectBoolean.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingZ' (AutoboxingZ.java:12) advised by before advice from 'AspectBoolean' (AspectBoolean.aj:4)"/>
-        </compile>
-        <run class="AutoboxingZ">
-          <stderr>
-              <line text="Boolean:false"/>
-              <line text="boolean:false"/>
-              <line text="method_takes_Boolean=false"/>
-              <line text="Boolean:false"/>
-              <line text="boolean:false"/>
-              <line text="method_takes_Boolean=false"/>
-              <line text="Boolean:false"/>
-              <line text="boolean:false"/>
-              <line text="method_takes_boolean=false"/>
-              <line text="Boolean:false"/>
-              <line text="boolean:false"/>
-              <line text="method_takes_boolean=false"/>
-          </stderr>
-        </run>
-   </ajc-test>   
-
-   <ajc-test dir="java5/autoboxing" vm="1.5" title="byte boxing">
-        <compile files="AutoboxingB.java,AutoboxingC.java,AutoboxingD.java,AutoboxingF.java,AutoboxingI.java,AutoboxingJ.java,AutoboxingS.java,AutoboxingZ.java,SimpleAutoboxing.java,AspectByte.aj"
-               options="-1.9,-showWeaveInfo">
-               <message kind="weave" text="Type 'AutoboxingB' (AutoboxingB.java:11) advised by before advice from 'AspectByte' (AspectByte.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingB' (AutoboxingB.java:11) advised by before advice from 'AspectByte' (AspectByte.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingB' (AutoboxingB.java:12) advised by before advice from 'AspectByte' (AspectByte.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingB' (AutoboxingB.java:12) advised by before advice from 'AspectByte' (AspectByte.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingB' (AutoboxingB.java:13) advised by before advice from 'AspectByte' (AspectByte.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingB' (AutoboxingB.java:13) advised by before advice from 'AspectByte' (AspectByte.aj:4)"/>
-               <message kind="weave" text="Type 'AutoboxingB' (AutoboxingB.java:14) advised by before advice from 'AspectByte' (AspectByte.aj:8)"/>
-               <message kind="weave" text="Type 'AutoboxingB' (AutoboxingB.java:14) advised by before advice from 'AspectByte' (AspectByte.aj:4)"/>
-        </compile>
-        <run class="AutoboxingB">
-          <stderr>
-              <line text="Byte:1"/>
-              <line text="byte:1"/>
-              <line text="method_takes_Byte=1"/>
-              <line text="Byte:50"/>
-              <line text="byte:50"/>
-              <line text="method_takes_Byte=50"/>
-              <line text="Byte:3"/>
-              <line text="byte:3"/>
-              <line text="method_takes_byte=3"/>
-              <line text="Byte:52"/>
-              <line text="byte:52"/>
-              <line text="method_takes_byte=52"/>
-          </stderr>
-        </run>
-   </ajc-test>   
-
-   <ajc-test dir="java5/autoboxing" vm="1.5" title="boxing in after returning">
-        <compile files="AutoboxingB.java,AutoboxingC.java,AutoboxingD.java,AutoboxingF.java,AutoboxingI.java,AutoboxingJ.java,AutoboxingS.java,AutoboxingZ.java,SimpleAutoboxing.java,AspectAfterReturning.aj"
-               options="-1.9,-showWeaveInfo">
-               <message kind="weave" text="Type 'AspectAfterReturning' (AspectAfterReturning.aj:18) advised by afterReturning advice from 'AspectAfterReturning' (AspectAfterReturning.aj:4)"/>
-               <message kind="weave" text="Type 'AspectAfterReturning' (AspectAfterReturning.aj:18) advised by afterReturning advice from 'AspectAfterReturning' (AspectAfterReturning.aj:8)"/>
-               <message kind="weave" text="Type 'AspectAfterReturning' (AspectAfterReturning.aj:18) advised by afterReturning advice from 'AspectAfterReturning' (AspectAfterReturning.aj:12)"/>
-               <message kind="weave" text="Type 'AspectAfterReturning' (AspectAfterReturning.aj:19) advised by afterReturning advice from 'AspectAfterReturning' (AspectAfterReturning.aj:4)"/>
-               <message kind="weave" text="Type 'AspectAfterReturning' (AspectAfterReturning.aj:19) advised by afterReturning advice from 'AspectAfterReturning' (AspectAfterReturning.aj:8)"/>
-               <message kind="weave" text="Type 'AspectAfterReturning' (AspectAfterReturning.aj:19) advised by afterReturning advice from 'AspectAfterReturning' (AspectAfterReturning.aj:12)"/>
-        </compile>
-        <run class="AspectAfterReturning">
-          <stderr>
-              <line text="Returning I=5"/>
-              <line text="Returning Integer=5"/>
-              <line text="Returning Object=5"/>
-              <line text="Returning I=10"/>
-              <line text="Returning Integer=10"/>
-              <line text="Returning Object=10"/>
-          </stderr>
-        </run>
-   </ajc-test>   
-
-   <!-- ======================================================================================= -->
-   <!--               Covariance tests                                                          -->
-   <!-- ======================================================================================= -->
-
-    <ajc-test dir="java5/covariance" vm="1.5" title="covariance 1">
-        <compile options="-1.9,-showWeaveInfo" files="CovBaseProgram01.java,CovAspect01.aj">
-            <message kind="weave" text="Type 'CovBaseProgram01' (CovBaseProgram01.java:26) advised by before advice from 'CovAspect01' (CovAspect01.aj:5)"/>
-            <message kind="weave" text="Type 'CovBaseProgram01' (CovBaseProgram01.java:27) advised by before advice from 'CovAspect01' (CovAspect01.aj:5)"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/covariance" vm="1.5" title="covariance 2">
-        <compile options="-1.9,-showWeaveInfo" files="CovBaseProgram01.java,CovAspect02.aj">
-            <message kind="weave" text="Type 'CovBaseProgram01' (CovBaseProgram01.java:26) advised by before advice from 'CovAspect02' (CovAspect02.aj:5)"/>
-            <message kind="weave" text="Type 'CovBaseProgram01' (CovBaseProgram01.java:27) advised by before advice from 'CovAspect02' (CovAspect02.aj:5)"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/covariance" vm="1.5" title="covariance 3">
-        <compile options="-1.9,-showWeaveInfo" files="CovBaseProgram01.java,CovAspect03.aj">
-            <message kind="weave" text="Type 'CovBaseProgram01' (CovBaseProgram01.java:26) advised by before advice from 'CovAspect03' (CovAspect03.aj:5)"/>
-            <message kind="weave" text="Type 'CovBaseProgram01' (CovBaseProgram01.java:27) advised by before advice from 'CovAspect03' (CovAspect03.aj:5)"/>
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="java5/covariance" vm="1.5" title="covariance 4">
-        <compile options="-1.9,-showWeaveInfo" files="CovBaseProgram02.java,CovAspect04.aj">
-            <message kind="weave" text="Type 'CovBaseProgram02' (CovBaseProgram02.java:30) advised by before advice from 'CovAspect04' (CovAspect04.aj:5)"/>
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="java5/covariance" vm="1.5" title="covariance 5">
-        <compile options="-1.9,-showWeaveInfo" files="CovBaseProgram01.java,CovAspect05.aj">
-            <message kind="weave" text="Type 'CovBaseProgram01' (CovBaseProgram01.java:26) advised by before advice from 'CovAspect05' (CovAspect05.aj:5)"/>
-            <message kind="weave" text="Type 'CovBaseProgram01' (CovBaseProgram01.java:27) advised by before advice from 'CovAspect05' (CovAspect05.aj:5)"/>
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="java5/covariance" vm="1.5" title="covariance 6">
-        <compile options="-1.9,-showWeaveInfo" files="CovBaseProgram01.java,CovAspect06.aj">
-            <message kind="warning" line="3" text="does not match because declaring type is Super"/>
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="java5/covariance" vm="1.5" title="covariance 7">
-        <compile options="-1.9,-showWeaveInfo" files="CovBaseProgram01.java,CovAspect07.aj">
-            <message kind="weave" text="Type 'CovBaseProgram01' (CovBaseProgram01.java:27) advised by before advice from 'CovAspect07' (CovAspect07.aj:5)"/>
-            <message kind="warning" line="3" text="does not match because declaring type is Super"/>
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="java5/covariance" vm="1.5" title="covariance 8">
-        <compile options="-1.9,-showWeaveInfo" files="CovBaseProgram01.java,CovAspect08.aj">
-            <message kind="weave" text="Type 'CovBaseProgram01' (CovBaseProgram01.java:27) advised by before advice from 'CovAspect08' (CovAspect08.aj:11)"/>
-            <message kind="weave" text="Type 'CovBaseProgram01' (CovBaseProgram01.java:27) advised by before advice from 'CovAspect08' (CovAspect08.aj:5)"/>
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="java5/covariance" vm="1.5" title="covariance 9">
-        <compile options="-1.9,-showWeaveInfo" files="CovBaseProgram01.java,CovAspect09.aj">
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="java5/covariance" vm="1.5" title="covariance 10">
-        <compile options="-1.9,-showWeaveInfo" files="CovBaseProgram01.java,CovAspect10.aj">
-            <message kind="weave" text="Type 'CovBaseProgram01' (CovBaseProgram01.java:26) advised by before advice from 'CovAspect10' (CovAspect10.aj:5)"/>
-            <message kind="weave" text="Type 'CovBaseProgram01' (CovBaseProgram01.java:27) advised by before advice from 'CovAspect10' (CovAspect10.aj:5)"/>
-        </compile>
-    </ajc-test>
-
-   <!-- ======================================================================================= -->
-   <!--               Enum tests                                                                -->
-   <!-- ======================================================================================= -->
-
-    <ajc-test dir="java5/enums" vm="1.5" title="cant itd constructor on enum">
-        <compile files="SimpleEnum.java,SimpleEnum2.java,EnumAspect01.aj" options="-1.9">
-            <message kind="error" line="2" text="can't make inter-type constructor declarations on enum types"/>
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="java5/enums" vm="1.5" title="cant itd field or method on enum">
-        <compile files="SimpleEnum.java,SimpleEnum2.java,EnumAspect02.aj" options="-1.9">
-            <message kind="error" line="2" text="can't make inter-type method declarations on enum types"/>
-            <message kind="error" line="6" text="can't make inter-type field declarations on enum types"/>
-        </compile>
-    </ajc-test>
-    
-   <ajc-test dir="java5/enums" vm="1.5" title="declare parents and enums">
-        <compile files="SimpleEnum.java,SimpleEnum2.java,EnumAspect03.aj" options="-1.9">
-            <message kind="error" line="5" text="can't use declare parents to make enum type SimpleEnum implement an interface"/>
-            <message kind="error" line="8" text="can't use declare parents to alter supertype of enum type SimpleEnum"/>
-            <message kind="error" line="11" text="can't use declare parents to make 'java.lang.Enum' the parent of type EnumAspect03$D"/>          
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/enums" vm="1.5" title="wildcard enum match in itd">
-        <compile files="SimpleEnum.java,SimpleEnum2.java,EnumAspect04.aj" options="-1.9">
-            <message kind="warning" line="5" text="enum type SimpleEnum2 matches a declare parents type pattern but is being ignored"/>
-            <message kind="warning" line="5" text="enum type SimpleEnum matches a declare parents type pattern but is being ignored"/>
-        </compile>
-    </ajc-test>
-
-   <!-- ======================================================================================= -->
-   <!--               pertypewithin tests                                                       -->
-   <!-- ======================================================================================= -->
-    
-   <ajc-test dir="java5/pertypewithin" title="basic ptw test">
-       <compile files="A.java,B.java,C.java,D.java,Main.java,X.java" options="-Xlint:ignore"/>
-       <run class="p.A">
-           <stderr>
-               <line text="hi from A"/>
-               <line text="after() returning from a method call to sayhi()"/>
-               <line text="hi from A"/>
-               <line text="after() returning from a method call to sayhi()"/>
-               <line text="Tests in A have passed"/>
-               <line text="callcount = 2"/>
-           </stderr>
-       </run>
-   </ajc-test> 
-
-   <ajc-test dir="java5/pertypewithin" title="ptw hasAspect">
-       <compile files="A.java,B.java,C.java,D.java,Main.java,X.java" options="-Xlint:ignore"/>
-       <run class="p.B">
-           <stderr>
-               <line text="hi from B"/>
-               <line text="after() returning from a method call to sayhi()"/>
-               <line text="hi from B"/>
-               <line text="after() returning from a method call to sayhi()"/>
-               <line text="hi from B"/>
-               <line text="after() returning from a method call to sayhi()"/>
-               <line text="callcount = 3"/>
-           </stderr>
-       </run>
-   </ajc-test> 
-   
-    <ajc-test dir="java5/pertypewithin" title="ptw aspectOf">
-       <compile files="A.java,B.java,C.java,D.java,Main.java,X.java" options="-Xlint:ignore"/>
-       <run class="p.C"/>
-   </ajc-test> 
-
-    <ajc-test dir="java5/pertypewithin" title="ptw multi-aspects">
-       <compile files="P.java,Q.java,R.java"/>
-       <run class="P">
-           <stderr>
-               <line text="Q reporting 2"/>
-               <line text="R reporting 3"/>
-           </stderr>
-       </run>
-   </ajc-test> 
-
-    <ajc-test dir="java5/pertypewithin" title="ptw binary">
-       <weave classesFiles="G.java" aspectsFiles="H.java"/>
-       <run class="G">
-           <stderr>
-               <line text="advice running"/>
-           </stderr>
-       </run>
-   </ajc-test> 
-   
-   <ajc-test dir="java5/pertypewithin" title="ptw binary aspect">
-       <compile files="H.java" outjar="aspects.jar">
-           <message kind="warning" line="1" text="no match for this type name: G"/>
-       </compile>
-       <compile files="G.java" aspectpath="aspects.jar"/>
-       <run class="G">
-           <stderr>
-               <line text="advice running"/>
-           </stderr>
-       </run>
-   </ajc-test>
-
-   <!-- ======================================================================================= -->
-   <!--               varargs tests                                                             -->
-   <!-- ======================================================================================= -->
-
-   <ajc-test dir="java5/varargs" vm="1.5" title="varargs not matched by Object[] (call)">
-       <compile files="SimpleVarargs.java,VarargsAspect01.aj" options="-1.9,-showWeaveInfo">
-       </compile>
-   </ajc-test>
-
-   <ajc-test dir="java5/varargs" vm="1.5" title="varargs not matched by Object[] (exe)">
-       <compile files="SimpleVarargs.java,VarargsAspect02.aj" options="-1.9,-showWeaveInfo">
-       </compile>
-   </ajc-test>
-
-   <ajc-test dir="java5/varargs" vm="1.5" title="varargs not matched by Object[] (init)">
-       <compile files="SimpleVarargs.java,VarargsAspect03.aj" options="-1.9,-showWeaveInfo">
-       </compile>
-   </ajc-test>
-
-   <ajc-test dir="java5/varargs" vm="1.5" title="varargs not matched by Object[] (withincode)">
-       <compile files="SimpleVarargs.java,VarargsAspect04.aj" options="-1.9,-showWeaveInfo">
-       </compile>
-   </ajc-test>
-
-  <ajc-test dir="java5/varargs" vm="1.5" title="call with varargs signature">
-       <compile files="SimpleVarargs.java,VarargsAspect05.aj" options="-1.9,-showWeaveInfo">
-           <message kind="weave" text="Type 'SimpleVarargs' (SimpleVarargs.java:20) advised by before advice from 'VarargsAspect05' (VarargsAspect05.aj:3)"/>
-           <message kind="weave" text="Type 'SimpleVarargs' (SimpleVarargs.java:21) advised by before advice from 'VarargsAspect05' (VarargsAspect05.aj:3)"/>
-           <message kind="weave" text="Type 'SimpleVarargs' (SimpleVarargs.java:22) advised by before advice from 'VarargsAspect05' (VarargsAspect05.aj:3)"/>
-       </compile>
-   </ajc-test>
-
-     <ajc-test dir="java5/varargs" vm="1.5" title="call with varargs multi-signature">
-       <compile files="SimpleVarargs.java,VarargsAspect06.aj" options="-1.9,-showWeaveInfo">
-           <message kind="weave" text="Type 'SimpleVarargs' (SimpleVarargs.java:25) advised by before advice from 'VarargsAspect06' (VarargsAspect06.aj:3)"/>
-           <message kind="weave" text="Type 'SimpleVarargs' (SimpleVarargs.java:26) advised by before advice from 'VarargsAspect06' (VarargsAspect06.aj:3)"/>
-           <message kind="weave" text="Type 'SimpleVarargs' (SimpleVarargs.java:27) advised by before advice from 'VarargsAspect06' (VarargsAspect06.aj:3)"/>
-       </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/suppressedWarnings" vm="1.5" title="suppressing non-matching advice warnings">
-       <compile files="Suppression1.aj" options="-1.9,-showWeaveInfo">
-       	 <message kind="warning" line="13"/>
-         <message kind="warning" line="21"/>
-       </compile>
-   </ajc-test>
-   
-    <ajc-test dir="java5/suppressedWarnings" vm="1.5" title="suppressing non-matching advice warnings when multiple source files involved">
-       <compile files="A.java,A1.aj,A2.aj,A3.aj" options="-1.9,-showWeaveInfo">
-         <message kind="warning" line="4" file="A1.aj"/>
-         <message kind="warning" line="4" file="A2.aj"/>
-         <message kind="warning" line="11" file="A2.aj"/>
-         <message kind="warning" line="4" file="A3.aj"/>
-         <message kind="warning" line="11" file="A3.aj"/>
-       </compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150" title="XLint warning for advice not applied with cflow(execution)" pr="93345">
-     <compile options="-Xlint,-1.9" files="PR93345.aj" >
-       <message kind="warning" line="9" text="advice defined in AnAspect has not been applied [Xlint:adviceDidNotMatch]"/>
-     </compile>
-  </ajc-test>
-   
-  <ajc-test dir="bugs150" title="NPE in reflect implementation" pr="94167">
-     <compile files="PR94167.java"/>
-     <run class="reflect.PR94167"/>
-  </ajc-test>
-
-   <!-- ======================================================================================= -->
-   <!--               annotated aspect members                                                  -->
-   <!-- ======================================================================================= -->
-
-    <ajc-test dir="java5/annotations/aspectMembers" title="annotated annotations (@Target)">
-        <compile files="a/Annotations.java,a/Foo.java" options="-1.9">
-            <message kind="error" line="16" text="The annotation @MethodAnnotation is disallowed for this location"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/aspectMembers" title="simple annotated aspect members">
-        <compile files="a/Annotations.java,a/AnnotatedAspect.aj" options="-1.9">
-            <message kind="warning" line="4" text="annotated type"/>
-            <message kind="warning" line="6" text="annotated field"/>
-            <message kind="warning" line="8" text="annotated method"/>
-            <message kind="warning" line="11" text="annotated constructor"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/aspectMembers" title="simple annotated aspect members with bad target">
-        <compile files="a/Annotations.java,a/AnnotatedAspect02.aj" options="-1.9">
-            <message kind="error" line="3" text="The annotation @MethodAnnotation is disallowed for this location"/>
-            <message kind="error" line="6" text="The annotation @TypeAnnotation is disallowed for this location"/>
-            <message kind="error" line="8" text="The annotation @FieldAnnotation is disallowed for this location"/>
-            <message kind="error" line="10" text="The annotation @AnnotationAnnotation is disallowed for this location"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/aspectMembers" title="annotated itds">
-        <compile files="a/Annotations.java,a/AnnotatedAspect03.aj" options="-1.9">
-            <message kind="warning" line="4" text="annotated type"/>
-            <message kind="warning" line="6" text="annotated field"/>
-            <message kind="warning" line="8" text="annotated field"/>
-            <message kind="warning" line="10" text="annotated method"/>
-            <message kind="warning" line="12" text="annotated constructor"/>
-            <message kind="warning" line="12" text="annotated field"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/aspectMembers" title="annotated itds with bad target">
-        <compile files="a/Annotations.java,a/AnnotatedAspect04.aj" options="-1.9">
-            <message kind="error" line="6" text="The annotation @ConstructorAnnotation is disallowed for this location"/>
-            <message kind="error" line="8" text="The annotation @FieldAnnotation is disallowed for this location"/>
-            <message kind="error" line="10" text="The annotation @TypeAnnotation is disallowed for this location"/>
-            <!-- known limitation...
-                <message kind="error" line="12" text="The annotation @MethodAnnotation is disallowed for this location"/>
-            -->
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/aspectMembers" title="annotated advice">
-        <compile files="a/Annotations.java,a/AnnotatedAspect05.aj" options="-1.9">
-            <message kind="warning" line="17"/>
-        </compile>
-        <run class="a.AnnotatedAspect05"/>
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/aspectMembers" title="annotated advice with bad target">
-        <compile files="a/Annotations.java,a/AnnotatedAspect06.aj" options="-1.9">
-            <message kind="error" line="6" text="The annotation @ConstructorAnnotation is disallowed for this location"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/aspectMembers" title="annotated pointcut">
-        <compile files="a/Annotations.java,a/AnnotatedAspect07.aj" options="-1.9">
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="java5/annotations/aspectMembers" title="annotated declare statements">
-        <compile files="a/Annotations.java,a/AnnotatedAspect08.aj" options="-1.9">
-        </compile>
-    </ajc-test>
-
- <!-- ======================================================================================= -->
-   <!--               ajdk examples                                                             -->
-   <!-- ======================================================================================= -->
-   <ajc-test dir="java5/annotations/ajdkExamples" title="ajdk: annotating aspects chapter">
-        <compile files="AnnotatingAspects.aj" options="-1.9">
-        </compile>
-    </ajc-test>
-   
-    <ajc-test dir="java5/annotations/ajdkExamples" title="ajdk: annotating aspects chapter, ex 2">
-        <compile files="SuppressAj.aj" options="-1.9">
-        </compile>
-    </ajc-test>
-   
-    <ajc-test dir="java5/annotations/ajdkExamples" title="ajdk: annotation pattern matching">
-        <compile files="AnnotationPatternMatching.aj,org/xyz/OrgXYZAnnotation.java" options="-1.9">
-            <message kind="warning" line="25" text="@Immutable"/>
-            <message kind="warning" line="25" text="!@Persistent"/>
-            <message kind="warning" line="29" text="!@Persistent"/>
-            <message kind="warning" line="31" text="!@Persistent"/>
-            <message kind="warning" line="33" text="!@Persistent"/>
-            <message kind="warning" line="29" text="@Foo @Goo"/>
-            <message kind="warning" line="29" text="@(Foo || Goo)"/>
-            <message kind="warning" line="31" text="@(Foo || Goo)"/>
-            <message kind="warning" line="33" text="@(org.xyz..*)"/>            
-        </compile>
-    </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,anns/Immutable.java,anns/NonPersistent.java" options="-1.9">
-            <message kind="warning" line="23" text="(@Immutable *)"/>
-            <message kind="warning" line="32" text="(@Immutable *)"/>
-            <message kind="warning" line="3" text="(@Immutable *)"/>
-            <message kind="warning" line="5" text="(@Immutable *)"/>
-            <message kind="warning" line="8" text="(@Immutable *)"/>
-            <message kind="warning" line="25" text="(!@Immutable *)"/>
-            <message kind="warning" line="27" text="(!@Immutable *)"/>
-            <message kind="warning" line="29" text="(!@Immutable *)"/>
-            <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="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.*)"/>
-            <message kind="warning" line="32" text="((@Immutable Foo+) || Goo)"/>
-            <message kind="warning" line="27" text="((@Immutable Foo+) || Goo)"/>
-            <message kind="warning" line="3" text="@(Immutable || NonPersistent) org.xyz..*"/>
-            <message kind="warning" line="6" text="@(Immutable || NonPersistent) org.xyz..*"/>
-            <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,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.9">
-            <message kind="warning" line="32" text="@SensitiveData * *"/>
-            <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="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 *,..)"/>
-            
-            <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="17" text="staticinitialization(@Persisted *)"/>
-            <message kind="warning" line="56" text="call(@Oneway * *(..))"/>
-            <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>
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/ajdkExamples" title="ajdk: runtime annotations">
-        <compile files="RuntimeTypeMatching.aj" options="-1.9">
-            <message kind="warning" line="121" text="@within(Foo)"/>
-            <message kind="warning" line="122" text="@within(Foo)"/>
-        </compile>
-        <run class="RuntimeTypeMatching">
-            <stdout>
-              <line text="This information is TOP-SECRET"/>
-              <line text="@target(Classified) at call(void A.a())"/>
-              <line text="@this(Foo) at execution(void B.b())"/>
-              <line text="Classified data being passed at call(void B.callA(A))"/>
-              <line text="Classified data being passed at execution(void B.callA(A))"/>
-              <line text="This information is TOP-SECRET"/>
-              <line text="@target(Classified) at call(Class java.lang.Object.getClass())"/>
-              <line text="1 @Foo()"/>
-              <line text="1 @Foo()"/>
-              <line text="1 @Classified(classification=TOP-SECRET)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-              <line text="1 @Classified(classification=&quot;TOP-SECRET&quot;)" vm="9+"/>
-              <line text="This information is TOP-SECRET"/>
-              <line text="Entering critical join point with priority 3"/>
-              <line text="Entering critical join point with reflectively obtained priority 3"/>
-              <line text="@target(Classified) at call(void A.a())"/>
-              <line text="@this(Foo) at execution(void B.callA(A))"/>
-              <line text="(Class) Transaction required at execution(void ByeByeEJB.method1())"/>
-              <line text="(Method) Transaction required at execution(void ByeByeEJB.method1())"/>
-              <line text="(Class) Transaction required at execution(void ByeByeEJB.method2())"/>
-              <line text="(Method) Transaction required at execution(void ByeByeEJB.method2())"/>
-              <line text="(Class) Transaction required at execution(void ByeByeEJB.method3())"/>
-            </stdout>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/ajdkExamples" title="ajdk: @retention checking">
-        <compile files="RetentionTime.aj" options="-1.9">
-            <message kind="error" line="8" text="Annotation type Goo does not have runtime retention"/>
-            <message kind="error" line="13" text="Annotation type Goo does not have runtime retention"/>
-            <message kind="error" line="18" text="Annotation type Goo does not have runtime retention"/>
-        </compile>
-    </ajc-test>
-    
-     <ajc-test dir="java5/annotations/ajdkExamples" title="ajdk: @inherited">
-        <compile files="AnnotationInheritance.aj" options="-1.9">
-            <message kind="warning" line="16" text="annotatedMethodCall()"/>
-            <!-- <message kind="warning" line="17" text="annotatedMethodCall()"/> -->
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/ajdkExamples" title="ajdk: deow-ann">
-        <compile files="DeclaresWithAnnotations.aj,org/xyz/model/Model.java" options="-1.9">
-            <message kind="warning" line="27" text="Expensive operation called from within performance critical section"/>
-            <message kind="error" line="26" text="Untrusted code should not call the model classes directly"/>
-        </compile>
-    </ajc-test>    
-    
-      <ajc-test dir="java5/annotations/ajdkExamples" title="ajdk: decp-ann">
-        <compile files="DecpAnnotations.aj" options="-1.9">
-        </compile>
-        <run class="DecpAnnotations">
-            <stdout>
-                <line text="Test Foo is not secured: PASS"/>
-                <line text="Test Goo is secured: PASS"/>
-                <line text="goo credentials: none"/>
-                <line text="Test BankAccount is not secured: PASS"/>
-                <line text="Test PrivateBankAccount is not secured: PASS"/>
-                <line text="Test BusinessBankAccount is secured: PASS"/>
-            </stdout>
-        </run>
-    </ajc-test>    
-
-    <ajc-test dir="java5/annotations/ajdkExamples" title="ajdk: dec precedence">
-        <compile files="PrecedenceAnnotations.aj" options="-1.9">
-        </compile>
-        <run class="PrecedenceAnnotations">
-            <stdout>
-                <line text="@Security S2"/>
-                <line text="S1"/>
-                <line text="@Performance P2"/>
-                <line text="P1"/>
-            </stdout>
-        </run>
-    </ajc-test>  
-
-   <ajc-test dir="java5/annotations/ajdkExamples" title="ajdk: dec annotation">
-        <compile files="DeclareAnnotation.aj,org/xyz/model/Model.java" options="-1.9">
-            <message kind="warning" line="3" text="@BusinessDomain"/>
-            <message kind="warning" line="43" text="@Secured"/>
-            <message kind="warning" line="44" text="@Secured"/>
-            <message kind="warning" line="55" text="@Secured"/>
-            <message kind="warning" line="62" text="@Persisted"/>
-            <message kind="warning" line="68" text="@Persisted"/>
-            <message kind="warning" line="41" text="@Secured"/>
-            <message kind="warning" line="51" text="@Secured"/>
-        </compile>
-        <run class="DeclareAnnotation"/>
-    </ajc-test>  
-    
-    <ajc-test dir="java5/covariance/ajdk" title="ajdk: covariance">
-        <compile files="AJDKExamples.aj" options="-1.9">
-            <message kind="warning" line="43" text="call(* whoAreYou())"/>
-            <message kind="warning" line="44" text="call(* whoAreYou())"/>
-            <message kind="warning" line="43" text="call(* A.whoAreYou())"/>
-            <message kind="warning" line="44" text="call(* A.whoAreYou())"/>
-            <message kind="warning" line="43" text="call(A whoAreYou())"/>
-            <message kind="warning" line="44" text="call(A whoAreYou())"/>
-            <message kind="warning" line="44" text="call(A+ B.whoAreYou())"/>
-            <message kind="warning" line="44" text="call(B whoAreYou())"/>
-            <message kind="warning" line="44" text="call(B B.whoAreYou())"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/varargs/ajdk" title="ajdk: varargs">
-        <compile files="AJDKExamples.aj,org/xyz/Foo.java,org/xyz/Goo.java,org/xyz/Hoo.java" options="-1.9">
-            <message kind="warning" line="8" text="call vararg match"/>
-            <message kind="warning" line="14" text="execution vararg match"/>
-            <message kind="warning" line="5" text="init vararg match"/>
-            <message kind="warning" line="6" text="init vararg match"/>
-            <message kind="warning" line="27" text="single vararg"/>
-            <message kind="warning" line="28" text="single String[]"/>
-            <message kind="warning" line="18" text="single String[]"/>
-        </compile>
-        <run class="AJDKExamples">
-            <stdout>
-                <line text="Matched at call(void X.foo(int, String[]))"/>
-            </stdout>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="java5/pertypewithin/ajdk" title="ajdk: ptw">
-        <compile files="AJDKExamples.aj" options="-1.9 -showWeaveInfo">
-          <message kind="weave" text="Join point 'constructor-execution(void org.xyz.foo.B.&lt;init&gt;())' in Type 'org.xyz.foo.B' (AJDKExamples.aj:38) advised by afterReturning advice from 'org.xyz.foo.AJDKExamples' (AJDKExamples.aj:11)"/>
-          <message kind="weave" text="Join point 'constructor-execution(void org.xyz.foo.A.&lt;init&gt;())' in Type 'org.xyz.foo.A' (AJDKExamples.aj:36) advised by afterReturning advice from 'org.xyz.foo.AJDKExamples' (AJDKExamples.aj:11)"/>
-        </compile>
-        <run class="org.xyz.foo.AJDKExamples">
-            <stdout>
-            	<line text="Aspect instance constructed"/>
-            	<line text="Aspect instance constructed"/>
-                <line text="true"/>
-                <line text="true"/>
-                <line text="There are 2 As"/>
-                <line text="There are 3 Bs"/>
-            </stdout>
-        </run>
-    </ajc-test>
-
-   <!-- ======================================================================================= -->
-   <!--               declare annotation                                                        -->
-   <!-- ======================================================================================= -->
-
-   <ajc-test dir="java5/annotations/declare" title="basic declare annotation parse test">
-        <compile files="BasicParseTest.aj" options="-1.9">
-        </compile>
-    </ajc-test>
-
-   <!-- ======================================================================================= -->
-   <!--               declare annotation (@type)                                                        -->
-   <!-- ======================================================================================= -->
-
-    <ajc-test dir="java5/annotations/declare" title="declare @type 1">
-        <compile files="DecaType1.java" options="-1.9"/>
-        <run class="DecaType1">
-          <stderr>
-        	<line text="annotation is @MyAnnotation()"/>
-          </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/declare" title="declare @type 2">
-        <compile files="DecaType2.java" options="-1.9,-Xlint:ignore" >
-        </compile>
-        <run class="DecaType2">
-        <stderr>
-        	<line text="annotation on DecaType2 is @MyAnnotation()"/>
-        	<line text="annotation on X is @MyAnnotation()"/>
-        	<line text="annotation on MyAnnotation is @MyAnnotation()"/>
-        </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/declare" title="declare @type - with matching pointcut">
-        <compile files="DecaType3.java" options="-1.9"/>
-        <run class="DecaType3">
-        	<stderr>
-               <line text="hello world"/>
-               <line text="advice running"/>
-            </stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/declare" title="declare @type - binary weaving">
-        <weave classesFiles="BaseTypes.java"
-               aspectsFiles="DecaTypeBin1.aj,Colored.java"
-               options="-1.9"  xlintfile="ignoreTypeNotExposed.properties">
-        </weave>
-        <run class="BaseTypes">
-        <stderr>
-        	<line text="Color identified on class X"/>
-        	<line text="A.m() running"/>
-        	<line text="A.m() running"/>
-        	<line text="A.m() running"/>
-        </stderr>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/declare" title="declare @type - complex annotation - binary weaving">
-        <weave classesFiles="BaseTypes.java" aspectsFiles="DecaTypeBin2.aj" options="-1.9" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="BaseTypes">
-        	<stderr>
-        		<line text="ComplexAnnotation identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="A.m() running"/>
-        		<line text="A.m() running"/>
-        	</stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/declare" title="declare @type - complex annotation - source weaving">
-        <compile files="BaseTypes.java,DecaTypeBin2.aj" options="-1.9"/>
-        <run class="BaseTypes">
-        	<stderr>
-        		<line text="ComplexAnnotation identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="A.m() running"/>
-        		<line text="A.m() running"/>
-        	</stderr>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/declare" title="declare @type - two annotations hit one type - source weaving">
-        <compile files="BaseTypes.java,DecaTypeBin3.aj" options="-1.9"/>
-        <run class="BaseTypes">
-        	<stderr>
-        		<line text="Color identified on execution(void A.m())"/>
-        		<line text="Fruit identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="A.m() running"/>
-        		<line text="A.m() running"/>
-        	</stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/declare" title="declare @type - two annotations hit one type - binary weaving">
-        <weave classesFiles="BaseTypes.java" aspectsFiles="DecaTypeBin3.aj" options="-1.9"  xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="BaseTypes">
-        	<stderr>
-        		<line text="Color identified on execution(void A.m())"/>
-        		<line text="Fruit identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="A.m() running"/>
-        		<line text="A.m() running"/>
-        	</stderr>
-        </run> 	 	
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/declare" title="declare @type - declare parents interactions (order 1) - binary weaving">
-        <weave classesFiles="BaseTypes.java" aspectsFiles="DecaDecpInteractions1.aj" options="-1.9" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="BaseTypes">
-        	<stderr>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="Color annotation identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        	</stderr>
-        </run>
-    </ajc-test>
-    <ajc-test dir="java5/annotations/declare" title="declare @type - declare parents interactions (order 1) - source weaving">
-        <compile files="BaseTypes.java,DecaDecpInteractions1.aj" options="-1.9" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="BaseTypes">
-        	<stderr>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="Color annotation identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        	</stderr>
-        </run>
-    </ajc-test>
-    
-    
-    <ajc-test dir="java5/annotations/declare" title="declare @type - declare parents interactions (order 2) - binary weaving">
-        <weave classesFiles="BaseTypes.java" aspectsFiles="DecaDecpInteractions2.aj" options="-1.9" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="BaseTypes">
-        	<stderr>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="Color annotation identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        	</stderr>
-        </run>
-    </ajc-test>
-    <ajc-test dir="java5/annotations/declare" title="declare @type - declare parents interactions (order 2) - source weaving">
-        <compile files="BaseTypes.java,DecaDecpInteractions2.aj" options="-1.9" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="BaseTypes">
-        	<stderr>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="Color annotation identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        	</stderr>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/declare" title="declare @type - declare parents interactions (order 3) - binary weaving">
-        <weave classesFiles="BaseTypes.java" aspectsFiles="DecaDecpInteractions3.aj" options="-1.9,-Xlint:ignore"/>
-        <run class="BaseTypes">
-        	<stderr>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="Color annotation identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="Color annotation identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="Color annotation identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        	</stderr>
-        </run>
-    </ajc-test>
-    <ajc-test dir="java5/annotations/declare" title="declare @type - declare parents interactions (order 3) - source weaving">
-        <compile files="BaseTypes.java,DecaDecpInteractions3.aj" options="-1.9,-Xlint:ignore"/>
-        <run class="BaseTypes">
-        	<stderr>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="Color annotation identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="Color annotation identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="Color annotation identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        	</stderr>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="java5/annotations/declare" title="declare @type - declare parents interactions (order 4) - binary weaving">
-        <weave classesFiles="BaseTypes.java" aspectsFiles="DecaDecpInteractions4.aj" options="-1.9,-Xlint:ignore"/>
-        <run class="BaseTypes">
-        	<stderr>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="Color annotation identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="Color annotation identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="Color annotation identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        	</stderr>
-        </run>
-    </ajc-test>
-    <ajc-test dir="java5/annotations/declare" title="declare @type - declare parents interactions (order 4) - source weaving">
-        <compile files="BaseTypes.java,DecaDecpInteractions4.aj" options="-1.9,-Xlint:ignore"/>
-        <run class="BaseTypes">
-        	<stderr>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="Color annotation identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="Color annotation identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="Marker interface identified on execution(void A.m())"/>
-        		<line text="Color annotation identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        	</stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/declare" title="declare @type - annotating an already annotated type - binary weaving">
-        <weave classesFiles="AnnotatedType.java" aspectsFiles="DecaTypeBin4.aj" options="-1.9,-Xlint:ignore"/>
-        <run class="AnnotatedType">
-        	<stderr>
-        		<line text="Color identified on execution(void AnnotatedType.m())"/>
-        		<line text="Fruit identified on execution(void AnnotatedType.m())"/>
-        		<line text="m() running"/>
-        	</stderr>
-        </run>
-    </ajc-test>
-    <ajc-test dir="java5/annotations/declare" title="declare @type - annotating an already annotated type - source weaving">
-    	<compile files="AnnotatedType.java,DecaTypeBin4.aj" options="-1.9,-Xlint:ignore"/>
-        <run class="AnnotatedType">
-        	<stderr>
-        		<line text="Color identified on execution(void AnnotatedType.m())"/>
-        		<line text="Fruit identified on execution(void AnnotatedType.m())"/>
-        		<line text="m() running"/>
-        	</stderr>
-        </run>
-    </ajc-test>
-    
-    
-    <!--ajc-test dir="java5/annotations/declare" title="declare @type - annotations with different targets - binary weaving">
-        <weave classesFiles="BaseTypes.java" aspectsFiles="DecaTypeBin5.aj" options="-1.9"  xlintfile="ignoreTypeNotExposed.properties">
-            <message kind="error" line="15" text="The annotation @ColorM is disallowed for this location"/>
-            <message kind="error" line="16" text="The annotation @ColorC is disallowed for this location"/>
-            <message kind="error" line="18" text="The annotation @ColorF is disallowed for this location"/>
-            <message kind="error" line="19" text="The annotation @ColorP is disallowed for this location"/>
-            <message kind="error" line="20" text="The annotation @ColorL is disallowed for this location"/>
-            <message kind="error" line="21" text="The annotation @ColorPkg is disallowed for this location"/>
-        </weave>
-        <run class="BaseTypes">
-        	<stderr>
-        		<line text="ColorT identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="A.m() running"/>
-        		<line text="A.m() running"/>
-        	</stderr>
-        </run>
-    </ajc-test-->
-    
-    <ajc-test dir="java5/annotations/declare" title="declare @type - annotations with different targets - source weaving">
-        <compile files="BaseTypes.java,DecaTypeBin5.aj" options="-1.9"  xlintfile="ignoreTypeNotExposed.properties">
-            <message kind="error" line="15" text="The annotation @ColorM is disallowed for this location"/>
-            <message kind="error" line="16" text="The annotation @ColorC is disallowed for this location"/>
-            <message king="error" line="17" text="A is not a valid target for annotation ColorA"/>
-            <message kind="error" line="18" text="The annotation @ColorF is disallowed for this location"/>
-            <message kind="error" line="19" text="The annotation @ColorP is disallowed for this location"/>
-            <message kind="error" line="20" text="The annotation @ColorL is disallowed for this location"/>
-            <message kind="error" line="21" text="The annotation @ColorPkg is disallowed for this location"/>
-        </compile>
-    </ajc-test>
-    
-    <!--ajc-test dir="java5/annotations/declare" title="declare @type - annotations with different targets (using type patterns) - binary weaving">
-        <weave classesFiles="BaseTypes.java" aspectsFiles="DecaTypeBin6.aj" options="-1.9" xlintfile="ignoreTypeNotExposed.properties">
-          <message kind="warning" line="15" text="A is not a valid target for annotation ColorM"/>
-          <message kind="warning" line="16" text="A is not a valid target for annotation ColorC"/>        
-          <message kind="warning" line="17" text="A is not a valid target for annotation ColorL"/>
-          <message kind="warning" line="17" text="B is not a valid target for annotation ColorL"/>
-          <message kind="warning" line="17" text="C is not a valid target for annotation ColorL"/>
-        </weave>
-        <run class="BaseTypes">
-        	<stderr>
-        		<line text="ColorT identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="ColorT identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="ColorT identified on execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        	</stderr>
-        </run>
-    </ajc-test-->
-    
-    <ajc-test dir="java5/annotations/declare" title="declare @type - annotations with different targets (using type patterns) - source weaving">
-        <compile files="BaseTypes.java,DecaTypeBin6.aj" options="-1.9" xlintfile="ignoreTypeNotExposed.properties">
-          <message kind="error" line="15" text="The annotation @ColorM is disallowed for this location"/>
-          <message kind="error" line="16" text="The annotation @ColorC is disallowed for this location"/>        
-          <message kind="error" line="17" text="The annotation @ColorL is disallowed for this location"/>
-          <message kind="error" line="18" text="The annotation @ColorF is disallowed for this location"/>
-        </compile>
-    </ajc-test>
-    
-    
-    <ajc-test dir="java5/annotations/declare" title="declare @type - complex decp decAtType interactions - binary weaving">
-        <weave classesFiles="BaseTypes.java" aspectsFiles="DecaTypeBin7.aj" options="-1.9" xlintfile="ignoreTypeNotExposed.properties">
-        </weave>
-        <run class="BaseTypes">
-        	<stderr>
-        		<line text="Color identified on execution(void A.m())"/>
-        		<line text="Fruit identified on execution(void A.m())"/>
-        		<line text="Chocolate identified on execution(void A.m())"/>
-        		<line text="M1 at execution(void A.m())"/>
-        		<line text="M2 at execution(void A.m())"/>
-        		<line text="M3 at execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="Fruit identified on execution(void B.m())"/>
-        		<line text="Chocolate identified on execution(void B.m())"/>
-        		<line text="M1 at execution(void B.m())"/>
-        		<line text="M2 at execution(void B.m())"/>
-        		<line text="M3 at execution(void B.m())"/>
-        		<line text="B.m() running"/>
-        		<line text="Fruit identified on execution(void C.m())"/>
-        		<line text="Chocolate identified on execution(void C.m())"/>
-        		<line text="M1 at execution(void C.m())"/>
-        		<line text="M2 at execution(void C.m())"/>
-        		<line text="M3 at execution(void C.m())"/>
-        		<line text="C.m() running"/>
-        	</stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/declare" title="declare @type - complex decp decAtType interactions - source weaving">
-        <compile files="BaseTypes.java,DecaTypeBin7.aj" options="-1.9" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="BaseTypes">
-        	<stderr>
-        		<line text="Color identified on execution(void A.m())"/>
-        		<line text="Fruit identified on execution(void A.m())"/>
-        		<line text="Chocolate identified on execution(void A.m())"/>
-        		<line text="M1 at execution(void A.m())"/>
-        		<line text="M2 at execution(void A.m())"/>
-        		<line text="M3 at execution(void A.m())"/>
-        		<line text="A.m() running"/>
-        		<line text="Fruit identified on execution(void B.m())"/>
-        		<line text="Chocolate identified on execution(void B.m())"/>
-        		<line text="M1 at execution(void B.m())"/>
-        		<line text="M2 at execution(void B.m())"/>
-        		<line text="M3 at execution(void B.m())"/>
-        		<line text="B.m() running"/>
-        		<line text="Fruit identified on execution(void C.m())"/>
-        		<line text="Chocolate identified on execution(void C.m())"/>
-        		<line text="M1 at execution(void C.m())"/>
-        		<line text="M2 at execution(void C.m())"/>
-        		<line text="M3 at execution(void C.m())"/>
-        		<line text="C.m() running"/>
-        	</stderr>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/declare" title="declare @type - trying to put annotation targetting annos on normal types - source weaving">
-        <compile files="BaseTypes.java,DecaTypeBin8.aj" options="-1.9" xlintfile="ignoreTypeNotExposed.properties">
-          <message kind="error" line="8" text="A is not a valid target for annotation ColorA"/>        
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/declare" title="declare @type - trying to put annotation targetting annos on normal types - binary weaving">
-        <weave classesFiles="BaseTypes.java" aspectsFiles="DecaTypeBin8.aj" options="-1.9" xlintfile="ignoreTypeNotExposed.properties">
-          <message kind="error" line="8" text="A is not a valid target for annotation ColorA"/>        
-        </weave>
-    </ajc-test>   
-
-    <ajc-test dir="java5/annotations/declare" title="declare @type - trying to put annotation targetting annos on normal types (uses pattern) - source weaving">
-        <compile files="BaseTypes.java,DecaTypeBin9.aj" options="-1.9" xlintfile="ignoreTypeNotExposed.properties">
-          <message kind="warning" line="8" text="A is not a valid target for annotation ColorA"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/declare" title="declare @type - trying to put annotation targetting annos on normal types (uses pattern) - binary weaving">
-        <weave classesFiles="BaseTypes.java" aspectsFiles="DecaTypeBin9.aj" options="-1.9" xlintfile="ignoreTypeNotExposed.properties">
-          <message kind="warning" line="8" text="A is not a valid target for annotation ColorA"/>
-        </weave>
-    </ajc-test>   
-    
-    <ajc-test dir="java5/annotations/declare" title="declare @type - covering enum and class element values - source weaving">
-        <compile files="EnumAndClassValues.aj,FunkyAnnotations.java" options="-1.9" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="FunkyAnnotations">
-        	<stderr>
-               <line text="hello world"/>
-            </stderr>
-        </run>
-    </ajc-test>
-    
-     <ajc-test dir="java5/annotations/declare" title="declare @type - covering enum and class element values - binary weaving">
-        <weave aspectsFiles="EnumAndClassValues.aj" classesFiles="FunkyAnnotations.java" options="-1.9 -Xdev:Pinpoint" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="FunkyAnnotations">
-        	<stderr>
-               <line text="advice running: Red"/>
-               <line text="advice running: class java.lang.Integer"/>
-               <line text="method running"/>
-            </stderr>
-        </run>
-    </ajc-test>
-    
-    
-   <!-- ======================================================================================= -->
-   <!--               declare annotation (@field)                                               -->
-   <!-- ======================================================================================= -->
-
-   <ajc-test dir="java5/annotations/declare/atfield" title="declare @field - simple source weaving">
-        <compile files="Base.java,Colored.java,AtField1.aj" options="-1.9" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="Base">
-          <stderr>
-          <line text="Colored field access at set(int Base.publicIntField)"/>
-          </stderr>
-        </run>
-   </ajc-test>
-    
-   <ajc-test dir="java5/annotations/declare/atfield" title="declare @field - simple binary weaving">
-        <weave classesFiles="Base.java,Colored.java" aspectsFiles="AtField1.aj" options="-1.9" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="Base">
-          <stderr>
-          <line text="Colored field access at set(int Base.publicIntField)"/>
-          </stderr>
-        </run>
-   </ajc-test>   
-   
-   <ajc-test dir="java5/annotations/declare/atfield" title="declare @field - two the same on one - source weaving">
-        <compile files="Base.java,Colored.java,TwoOnOneField.aj" options="-1.9" xlintfile="ignoreTypeNotExposed.properties">
-          <message kind="warning" text="int Base.publicIntField - already has an annotation of type Colored"/>
-        </compile>
-        <run class="Base">
-          <stderr>
-          <line text="Colored field access at set(int Base.publicIntField)"/>
-          </stderr>
-        </run>
-   </ajc-test>
-    
-   <ajc-test dir="java5/annotations/declare/atfield" title="declare @field - two the same on one - binary weaving">
-        <weave classesFiles="Base.java,Colored.java" aspectsFiles="TwoOnOneField.aj" options="-1.9" xlintfile="ignoreTypeNotExposed.properties">
-          <message kind="warning" text="int Base.publicIntField - already has an annotation of type Colored"/>
-        </weave>
-        <run class="Base">
-          <stderr>
-          <line text="Colored field access at set(int Base.publicIntField)"/>
-          </stderr>
-        </run>
-   </ajc-test> 
-   
-   <ajc-test dir="java5/annotations/declare/atfield" title="declare @field - two different on one - source weaving">
-        <compile files="Base.java,Colored.java,Fruit.java,TwoOnOneField2.aj" options="-1.9" xlintfile="ignoreTypeNotExposed.properties">
-        </compile>
-        <run class="Base">
-          <stderr>
-          <line text="Colored field access at set(int Base.publicIntField)"/>
-          <line text="Fruit field access at set(int Base.publicIntField)"/>
-          </stderr>
-        </run>
-   </ajc-test>
-    
-   <ajc-test dir="java5/annotations/declare/atfield" title="declare @field - two different on one - binary weaving">
-        <weave classesFiles="Base.java,Colored.java,Fruit.java" aspectsFiles="TwoOnOneField2.aj" options="-1.9" xlintfile="ignoreTypeNotExposed.properties">
-        </weave>
-        <run class="Base">
-          <stderr>
-          <line text="Colored field access at set(int Base.publicIntField)"/>
-          <line text="Fruit field access at set(int Base.publicIntField)"/>
-          </stderr>
-        </run>
-   </ajc-test> 
-   
-   <ajc-test dir="java5/annotations/declare/atfield" title="declare @field - wrong target - source weaving">
-        <compile files="Base.java,Colored.java,WrongTarget.aj" options="-1.9" xlintfile="ignoreTypeNotExposed.properties">
-           <message kind="error" line="8" text="The annotation @MethodColoring is disallowed for this location"/>
-           <message kind="error" line="9" text="The annotation @TypeColoring is disallowed for this location"/>
-           <!-- xlint warnings that were put in as part of fix for pr115252 -->
-           <message kind="warning" line="13" text="does not match because annotation @MethodColoring has @Target{ElementType.METHOD} [Xlint:unmatchedTargetKind]"/>
-           <message kind="warning" line="16" text="does not match because annotation @TypeColoring has @Target{ElementType.TYPE} [Xlint:unmatchedTargetKind]"/>
-  </compile>
-   </ajc-test>
-    
-   <ajc-test dir="java5/annotations/declare/atfield" title="declare @field - right target - source weaving">
-        <compile files="Base.java,Colored.java,RightTarget.aj" options="-1.9" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="Base">
-          <stderr>
-          <line text="Colored field access at set(int Base.publicIntField)"/>
-          </stderr>
-        </run>
-   </ajc-test>
-    
-   <ajc-test dir="java5/annotations/declare/atfield" title="declare @field - right target - binary weaving">
-        <weave classesFiles="Base.java,Colored.java" aspectsFiles="RightTarget.aj" options="-1.9" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="Base">
-          <stderr>
-          <line text="Colored field access at set(int Base.publicIntField)"/>
-          </stderr>
-        </run>
-   </ajc-test> 
-   
-   <ajc-test dir="java5/annotations/declare/atfield" title="declare @field - recursive application - source weaving">
-        <compile files="Base.java,Colored.java,Fruit.java,RecursiveFields.aj" options="-1.9" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="Base">
-          <stderr>
-          <line text="Fruit field access at set(int Base.publicIntField)"/>
-          </stderr>
-        </run>
-   </ajc-test>
-    
-   <ajc-test dir="java5/annotations/declare/atfield" title="declare @field - recursive application - binary weaving">
-        <weave classesFiles="Base.java,Colored.java,Fruit.java" aspectsFiles="RecursiveFields.aj" options="-1.9" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="Base">
-          <stderr>
-          <line text="Fruit field access at set(int Base.publicIntField)"/>
-          </stderr>
-        </run>
-   </ajc-test>
-   
-   <ajc-test dir="java5/annotations/declare/atfield" title="declare @field - recursive application (other order) - source weaving">
-        <compile files="Base.java,Colored.java,Fruit.java,RecursiveFields2.aj" options="-1.9" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="Base">
-          <stderr>
-          <line text="Fruit field access at set(int Base.publicIntField)"/>
-          </stderr>
-        </run>
-   </ajc-test>
-    
-   <ajc-test dir="java5/annotations/declare/atfield" title="declare @field - recursive application (other order) - binary weaving">
-        <weave classesFiles="Base.java,Colored.java,Fruit.java" aspectsFiles="RecursiveFields2.aj" options="-1.9" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="Base">
-          <stderr>
-          <line text="Fruit field access at set(int Base.publicIntField)"/>
-          </stderr>
-        </run>
-   </ajc-test>   
-   <!-- incorrect target type for annotation on field -->
-   
-   <!-- incorrect target type for annotation on method -->
-   <!-- two annotations on one method -->
-   <!-- two of the same annotation on one method - error -->
-   <!-- two of the same on one using pattern spec  - lint -->
-   
-<!-- need some incorrect signatures in the declare @statements - e.g. declare @constructor: public Base(int): XXX; will blow things up as it uses Base rather than new -->
-   <!-- incorrect target type for annotation on ctor -->
-   <!-- two annotations on one ctor -->
-   <!-- two of the same annotation on one ctor - error -->
-   <!-- two of the same on one using pattern spec  - lint -->
-   
-   <ajc-test dir="java5/annotations/declare/atmethodctor" title="declare @method - simple source weaving">
-        <compile files="Base.java,Colored.java,AtMethod1.aj" options="-1.9" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="Base">
-          <stderr>
-          <line text="Colored method invocation at call(void Base.m1())"/>
-          <line text="m1() running"/>
-          <line text="m2() running"/>
-          <line text="m3() running"/>
-          </stderr>
-        </run>
-   </ajc-test>
-    
-   <ajc-test dir="java5/annotations/declare/atmethodctor" title="declare @method - simple binary weaving">
-        <weave classesFiles="Base.java,Colored.java" aspectsFiles="AtMethod1.aj" options="-1.9" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="Base">
-          <stderr>
-          <line text="Colored method invocation at call(void Base.m1())"/>
-          <line text="m1() running"/>
-          <line text="m2() running"/>
-          <line text="m3() running"/>
-          </stderr>
-        </run>
-   </ajc-test>   
-
-   <ajc-test dir="java5/annotations/declare/atmethodctor" title="declare @constructor - simple source weaving">
-        <compile files="Base.java,Colored.java,AtCtor1.aj" options="-1.9" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="Base">
-          <stderr>
-          <line text="Colored constructor invocation at call(Base(int))"/>
-          <line text="m1() running"/>
-          <line text="m2() running"/>
-          <line text="m3() running"/>
-          </stderr>
-        </run>
-   </ajc-test>
-    
-   <ajc-test dir="java5/annotations/declare/atmethodctor" title="declare @constructor - simple binary weaving">
-        <weave classesFiles="Base.java,Colored.java" aspectsFiles="AtCtor1.aj" options="-1.9" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="Base">
-          <stderr>
-          <line text="Colored constructor invocation at call(Base(int))"/>
-          <line text="m1() running"/>
-          <line text="m2() running"/>
-          <line text="m3() running"/>
-          </stderr>
-        </run>
-   </ajc-test>   
-   
-
-  <!-- These tests verify both @method and @ctor behavior - they are so similar it is OK to have them together... -->
-  
-  <ajc-test dir="java5/annotations/declare/atmethodctor" title="declare @method @ctor - wrong target - source weaving">
-        <compile files="Base.java,Colored.java,WrongTarget.aj" options="-1.9" xlintfile="ignoreTypeNotExposed.properties">
-           <message kind="error" line="8"  text="The annotation @MethodColoring is disallowed for this location"/>
-           <message kind="error" line="9"  text="The annotation @TypeColoring is disallowed for this location"/>
-           <message kind="error" line="10"  text="The annotation @MethodColoring is disallowed for this location"/>
-           <message kind="error" line="11" text="The annotation @TypeColoring is disallowed for this location"/>
-        </compile>
-   </ajc-test>
-    
-   <ajc-test dir="java5/annotations/declare/atmethodctor" title="declare @method @ctor - right target - source weaving">
-        <compile files="Base.java,Colored.java,RightTarget.aj" options="-1.9" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="Base">
-          <stderr>
-          <line text="Colored ctor call at call(Base(int))"/>
-          <line text="Colored method call at call(void Base.m1())"/>
-          <line text="m1() running"/>
-          <line text="m2() running"/>
-          <line text="m3() running"/>
-          </stderr>
-        </run>
-   </ajc-test>
-    
-   <ajc-test dir="java5/annotations/declare/atmethodctor" title="declare @method @ctor - right target - binary weaving">
-        <weave classesFiles="Base.java,Colored.java" aspectsFiles="RightTarget.aj" options="-1.9" xlintfile="ignoreTypeNotExposed.properties"/>
-        <run class="Base">
-          <stderr>
-          <line text="Colored ctor call at call(Base(int))"/>
-          <line text="Colored method call at call(void Base.m1())"/>
-          <line text="m1() running"/>
-          <line text="m2() running"/>
-          <line text="m3() running"/>
-          </stderr>
-        </run>
-   </ajc-test> 
-   
-<!-- check @method/@ctor/@field recursively applying, can only happen if a pattern for one of them includes an annotation -->
-   
-   
-   <ajc-test dir="java5/annotations/declare/atmethodctor" title="declare @method @ctor - two the same on one - source weaving">
-        <compile files="Base.java,Colored.java,TwoOnOneMember.aj" options="-1.9" xlintfile="ignoreTypeNotExposed.properties">
-          <message kind="warning" text="void Base.m1() - already has an annotation of type Colored"/>
-          <message kind="warning" text="void Base.&lt;init&gt;(int) - already has an annotation of type Colored"/>
-        </compile>
-   </ajc-test>
-    
-   <ajc-test dir="java5/annotations/declare/atmethodctor" title="declare @method @ctor - two the same on one - binary weaving">
-        <weave classesFiles="Base.java,Colored.java" aspectsFiles="TwoOnOneMember.aj" options="-1.9" xlintfile="ignoreTypeNotExposed.properties">
-          <message kind="warning" text="void Base.m1() - already has an annotation of type Colored"/>
-          <message kind="warning" text="void Base.&lt;init&gt;(int) - already has an annotation of type Colored"/>
-        </weave>
-   </ajc-test> 
-   
-   <ajc-test dir="java5/annotations/declare/atmethodctor" title="declare @method @ctor - two different on one - source weaving">
-        <compile files="Base.java,Colored.java,Fruit.java,TwoOnOneMember2.aj" options="-1.9" xlintfile="ignoreTypeNotExposed.properties">
-        </compile>
-        <run class="Base">
-          <stderr>
-          <line text="Colored ctor call at Base.java:11"/>
-          <line text="Fruit ctor call at Base.java:11"/>
-          <line text="Colored method call at Base.java:15"/>
-          <line text="Fruit method call at Base.java:15"/>
-          <line text="m1() running"/>
-          <line text="m2() running"/>
-          <line text="m3() running"/>
-          </stderr>
-        </run>
-   </ajc-test>
-    
-   <ajc-test dir="java5/annotations/declare/atmethodctor" title="declare @method @ctor - two different on one - binary weaving">
-        <weave classesFiles="Base.java,Colored.java,Fruit.java" aspectsFiles="TwoOnOneMember2.aj" options="-1.9" xlintfile="ignoreTypeNotExposed.properties">
-        </weave>
-        <run class="Base">
-          <stderr>
-          <line text="Colored ctor call at Base.java:11"/>
-          <line text="Fruit ctor call at Base.java:11"/>
-          <line text="Colored method call at Base.java:15"/>
-          <line text="Fruit method call at Base.java:15"/>
-          <line text="m1() running"/>
-          <line text="m2() running"/>
-          <line text="m3() running"/>
-          </stderr>
-        </run>
-   </ajc-test> 
-   
-   <ajc-test dir="java5/annotations/declare" title="declare all annotations on one class - source weaving">
-      <compile files="DeathByAnnotations.aj" options="-1.9,-emacssym" xlintfile="ignoreTypeNotExposed.properties"/>
-      <run class="p.q.DeathByAnnotations"/>
-   </ajc-test>
-   
-   <!-- ======================================================================================= -->
-   <!--               annotation binding with ITDs                                              -->
-   <!-- ======================================================================================= -->
-
-   <ajc-test dir="java5/annotations/binding" title="simple binding annotation values where itd method is annotated">
-      <compile files="BindingWithAnnotatedItds1.aj" options="-1.9"/>
-      <run class="BindingWithAnnotatedItds1">
-        <stderr>
-          <line text="Found apple at jp execution(int A.m()) (BindingWithAnnotatedItds1.aj:8)"/>
-        </stderr>
-      </run>
-   </ajc-test>
-   
-   <ajc-test dir="java5/annotations/binding" title="simple binding annotation values where itd field is annotated">
-      <compile files="BindingWithAnnotatedItds2.aj" options="-1.9"/>
-      <run class="BindingWithAnnotatedItds2">
-        <stderr>
-          <line text="Found banana at jp set(int A.i) (BindingWithAnnotatedItds2.aj:16)"/>
-          <line text="Found apple at jp set(String A.j) (BindingWithAnnotatedItds2.aj:17)"/>
-          <line text="Found orange at jp set(int[] A.k) (BindingWithAnnotatedItds2.aj:18)"/>
-        </stderr>
-      </run>
-   </ajc-test>
-
-   <ajc-test dir="java5/annotations/binding" title="simple binding annotation values where itd ctor is annotated">
-      <compile files="BindingWithAnnotatedItds3.aj" options="-1.9"/>
-      <run class="BindingWithAnnotatedItds3">
-        <stderr>
-          <line text="Found pear at jp execution(A(String)) (BindingWithAnnotatedItds3.aj:8)"/>
-          <line text="Found orange at jp execution(A(int)) (BindingWithAnnotatedItds3.aj:10)"/>
-          <line text="Found tomato at jp execution(A(boolean)) (BindingWithAnnotatedItds3.aj:12)"/>
-        </stderr>
-      </run>
-   </ajc-test>
-   
-   <!-- ======================================================================================= -->
-   <!--              declare annotation targetting ITDs                                         --> 
-   <!-- ======================================================================================= -->
-   
-   
-   <ajc-test dir="java5/annotations/binding" title="simple binding annotation values where itd method is annotated via declare">
-      <compile files="BindingWithDeclaredAnnotationItds1.aj" options="-1.9,-emacssym"/>
-      <run class="BindingWithDeclaredAnnotationItds1">
-        <stderr>
-          <line text="Found orange at jp call(int A.m()) (BindingWithDeclaredAnnotationItds1.aj:16)"/>
-          <line text="Found orange at jp execution(int A.m()) (BindingWithDeclaredAnnotationItds1.aj:8)"/>
-          <line text="Found banana at jp call(int A.n()) (BindingWithDeclaredAnnotationItds1.aj:17)"/>
-          <line text="Found banana at jp execution(int A.n()) (BindingWithDeclaredAnnotationItds1.aj:10)"/>
-          <line text="Found tomato at jp call(int A.o()) (BindingWithDeclaredAnnotationItds1.aj:18)"/>
-          <line text="Found tomato at jp execution(int A.o()) (BindingWithDeclaredAnnotationItds1.aj:12)"/>
-        </stderr>
-      </run>
-   </ajc-test>
-   
-   <ajc-test dir="java5/annotations/binding" title="simple binding annotation values where itd field is annotated via declare">
-      <compile files="BindingWithDeclaredAnnotationItds2.aj" options="-1.9,-emacssym"/>
-      <run class="BindingWithDeclaredAnnotationItds2">
-        <stderr>
-          <line text="Found orange at jp set(int A.i) (BindingWithDeclaredAnnotationItds2.aj:16)"/>
-		  <line text="Found banana at jp set(String A.j) (BindingWithDeclaredAnnotationItds2.aj:17)"/>
-		  <line text="Found apple at jp set(boolean[] A.k) (BindingWithDeclaredAnnotationItds2.aj:18)"/>
-        </stderr>
-      </run>
-   </ajc-test>
-   
-    <ajc-test dir="java5/annotations/binding" title="simple binding annotation values where itd field is annotated multiple times via declare">
-      <compile files="BindingWithDeclaredAnnotationItds3.aj" options="-1.9,-emacssym"/>
-      <run class="BindingWithDeclaredAnnotationItds3">
-        <stderr>
-			<line text="Found fruit orange at jp set(int A.i) (BindingWithDeclaredAnnotationItds3.aj:13)"/>
-			<line text="Found drink margarita at jp set(int A.i) (BindingWithDeclaredAnnotationItds3.aj:13)"/>
-        </stderr>
-      </run>
-   </ajc-test>
-   
-   <ajc-test dir="java5/annotations/binding" title="simple binding annotation values where itd ctor is annotated via declare">
-      <compile files="BindingWithDeclaredAnnotationItds4.aj" options="-1.9,-emacssym"/>
-      <run class="BindingWithDeclaredAnnotationItds4">
-        <stderr>
-          <line text="Found pear at jp execution(A(String)) (BindingWithDeclaredAnnotationItds4.aj:8)"/>
-		  <line text="Found orange at jp execution(A(int)) (BindingWithDeclaredAnnotationItds4.aj:10)"/>
-		  <line text="Found tomato at jp execution(A(boolean)) (BindingWithDeclaredAnnotationItds4.aj:12)"/>
-        </stderr>
-      </run>
-   </ajc-test>
-
-   <ajc-test dir="java5/suppressedWarnings" title="SuppressAjWarnings raised during matching">
-       <compile files="SuppressionDuringMatching.aj" options="-1.9">
-       </compile>
-   </ajc-test>
-
-   <!-- ============================================================== -->
-    
-    <ajc-test dir="options/aspectpath" title="dirs on aspectpath">
-        <compile files="MyAspect.aj" options="-d out"/>
-        <compile files="MyClass.java" options="-aspectpath out">
-            <message kind="warning" line="3" text="a method"/>
-        </compile>
-    </ajc-test>
-
-    <!-- ============================================================== -->
-    <!--   Start of generics tests                                      -->
-    <!-- ============================================================== -->
-
-    <ajc-test dir="java5/generics" title="ITD with parameterized type" vm="1.5">
-        <compile files="ITDReturningParameterizedType.aj" options="-1.9"/>
-        <run class="ITDReturningParameterizedType"/>
-    </ajc-test>
-    
-    <ajc-test dir="java5/annotations/binding/bugs" title="AtArgs causes a VerifyError: Unable to pop operand off an empty stack" vm="1.5">
-        <compile files="Test3.java" options="-1.9"/>
-        <run class="Test3"/>
-    </ajc-test>
-    
-    <ajc-test dir="java5/generics/bugs/pr91267" title="NPE using generic methods in aspects 1" vm="1.5">
-        <compile files="TestBug1.aj" options="-1.9"/>
-        <run class="TestBug1"/>
-    </ajc-test>
-    
-     <ajc-test dir="java5/generics/bugs/pr91267" title="NPE using generic methods in aspects 2" vm="1.5">
-        <compile files="TestBug2.aj" options="-1.9"/>
-        <run class="TestBug2"/>
-    </ajc-test>
-    
-    <ajc-test dir="java5/generics/bugs" title="Generics problem with Set" vm="1.5">
-      <compile files="PR91053.aj" options="-1.9"/>
-      <run class="PR91053"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/bugs" title="Compilation error on generic member introduction" vm="1.5">
-      <compile files="PR87282.aj" options="-1.9"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/bugs" title="Parameterized types on introduced fields not correctly recognized" vm="1.5">
-      <compile files="PR88606.aj" options="-1.9"/>
-   </ajc-test>
- 
-   <ajc-test dir="bugs150" title="enum called Enum, annotation called Annotation, etc">
-     <compile files="PR90827.aj" options="-1.9"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150" title="Internal compiler error">
-     <compile files="PR86832.aj" options="-1.9"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150" title="Exploding compile time with if() statements in pointcut">
-     <compile files="PR94086.aj" options="-1.9"/>
-   </ajc-test>
-   
-   <!-- generic abstract aspects... -->
-   
-   <ajc-test dir="java5/generics/genericaspects" title="static pointcut parameterization suite">
-     <compile files="GenericAspectPointcuts.aj" options="-1.9">
-     	<message kind="warning" line="62" text="kinded-returning-ok"/>
-     	<message kind="warning" line="52" text="kinded-declaring-ok"/>
-     	<message kind="warning" line="67" text="kinded-declaring-ok"/>
-     	<message kind="warning" line="50" text="kinded-params-ok"/>
-     	<message kind="warning" line="56" text="kinded-throws-ok"/>
-     	<message kind="warning" line="64" text="and-ok"/>
-     	<message kind="warning" line="60" text="or-ok"/>
-     	<message kind="warning" line="64" text="or-ok"/>
-     	<message kind="warning" line="67" text="or-ok"/>
-     	<message kind="warning" line="1" text="not-ok"/>
-     	<message kind="warning" line="42" text="not-ok"/>
-     	<message kind="warning" line="72" text="not-ok"/>
-     	<message kind="warning" line="59" text="within-ok"/>
-     	<message kind="warning" line="64" text="withincode-ok"/>
-     	<message kind="warning" line="53" text="handler-ok"/>
-     </compile>
-   </ajc-test>
- 
-    <ajc-test dir="java5/generics/genericaspects" title="dynamic pointcut parameterization suite">
-     <compile files="GenericAspectRuntimePointcuts.aj" options="-1.9">
-     </compile>
-     <run class="GenericAspectRuntimePointcuts">
-       <stdout>
-         <line text="target-ok an X execution(void X.foo())"/>
-         <line text="@this-ok @MyAnnotation(value=my-value) execution(void X.foo())"/>
-         <line text="@target-ok @MyAnnotation(value=my-value) execution(void X.foo())"/>
-         <line text="@within-ok @MyAnnotation(value=my-value) execution(void X.foo())"/>
-         <line text="cflow-ok an X a Y set(Y X.y)"/>
-         <line text="@annotation-ok-sub @MyAnnotation(value=bar) execution(void X.bar())"/>
-         <line text="@annotation-ok @MyAnnotation(value=bar) execution(void X.bar())"/>
-         <line text="target-ok an X execution(void X.bar())"/>
-         <line text="@this-ok @MyAnnotation(value=my-value) execution(void X.bar())"/>
-         <line text="@target-ok @MyAnnotation(value=my-value) execution(void X.bar())"/>
-         <line text="@within-ok @MyAnnotation(value=my-value) execution(void X.bar())"/>
-         <line text="@args-ok @MyAnnotation(value=my-value) execution(void Y.foo(X))"/>
-         <line text="args-ok an X execution(void Y.foo(X))"/>
-         <line text="this-ok a Y execution(void Y.foo(X))"/>
-         <line text="@this-ok @MyAnnotation(value=on Y) execution(void Y.foo(X))"/>
-         <line text="@target-ok @MyAnnotation(value=on Y) execution(void Y.foo(X))"/>
-         <line text="@within-ok @MyAnnotation(value=on Y) execution(void Y.foo(X))"/>
-         <line text="@annotation-ok-sub @MyAnnotation(value=my-value) execution(X Y.bar())"/>
-         <line text="@annotation-ok @MyAnnotation(value=my-value) execution(X Y.bar())"/>
-         <line text="this-ok a Y execution(X Y.bar())"/>
-         <line text="@this-ok @MyAnnotation(value=on Y) execution(X Y.bar())"/> 
-         <line text="@target-ok @MyAnnotation(value=on Y) execution(X Y.bar())"/>
-         <line text="@within-ok @MyAnnotation(value=on Y) execution(X Y.bar())"/>
-         <line text="@withincode-ok @MyAnnotation(value=my-value) get(X Y.x)"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-    <ajc-test dir="java5/generics/genericaspects" title="reference to pointcut in generic class">
-     <compile files="PointcutsInGenericClasses.aj" options="-1.9">
-         <message kind="warning" line="16" text="a match"/>
-     </compile>
-     </ajc-test>
-
-    <ajc-test dir="java5/generics/genericaspects" title="reference to non-parameterized pointcut in generic class">
-     <compile files="PointcutsInGenericClasses2.aj" options="-1.9">
-         <message kind="error" line="10" text="cannot use a raw type reference to refer to a pointcut in a generic type (use a parameterized reference instead)"/>
-     </compile>
-     </ajc-test>
-
-    <ajc-test dir="java5/generics/genericaspects" title="declare parents parameterized">
-     <compile files="DecPGenericTest.aj" options="-1.9">
-         <message kind="warning" line="16" text="success"/>
-     </compile>
-     </ajc-test>     
-     
-    <ajc-test dir="java5/generics/genericaspects" title="declare precedence parameterized">
-     <compile files="DecPrecedenceGenericTest.aj" options="-1.9 -Xdev:Pinpoint">
-     </compile>
-     <run class="DecPrecedenceGenericTest">
-         <stdout>
-             <line text="A1"/>
-             <line text="A2"/>
-         </stdout>
-     </run>
-     </ajc-test>     
-
-    <ajc-test dir="java5/generics/genericaspects" title="declare annotation parameterized">
-     <compile files="DecAnnGenericTest.aj" options="-1.9">
-         <message kind="warning" line="18" text="@type ok"/>
-         <message kind="warning" line="20" text="@field ok"/>
-         <message kind="warning" line="22" text="@constructor ok"/>
-         <message kind="warning" line="24" text="@method ok"/>
-     </compile>
-     </ajc-test>  
-
-    <ajc-test dir="java5/generics/genericaspects" title="multi-level generic abstract aspects">
-     <compile files="MultiLevelGenericTest.aj" options="-1.9">
-         <message kind="warning" line="23" text="base match"/>
-         <message kind="warning" line="23" text="middle match"/>
-         <message kind="warning" line="23" text="top match"/>
-     </compile>
-     </ajc-test> 
-   <!-- generic bugs -->
-   
-   <ajc-test dir="java5/generics/bugs" title="ITD method with generic arg">
-     <compile files="PR97763.aj" options="-1.9"/>
-     <run class="PR97763">
-       <stderr>
-         <line text="Number of entries=2"/>
-       </stderr>
-     </run>
-   </ajc-test>
-
-   <ajc-test dir="bugs150" title="NPE at ClassScope.java:660 when compiling generic class">
-     <compile files="PR95993.java" options="-1.9"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/bugs" title="Problems resolving type name inside generic class">
-     <compile files="PR95992.java" options="-1.9"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150" pr="100227" title="inner class with generic enclosing class">
-     <compile files="pr100227.aj" options="-1.9"/>
-     <run class="pr100227">
-	     <stderr>
-	    	 <line text="Outer.Inner.inner=2"/>
-	    	 <line text="Outer.Inner.p() executing"/>
-	    	 <line text="Generic_Outer.Inner.inner=4"/>
-	    	 <line text="Generic_Outer.Inner.p() executing"/>
-	     </stderr>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150" pr="100260" title="methods inherited from a generic parent">
-     <compile files="pr100260.aj" options="-1.9"/>
-     <run class="pr100260"/>
-   </ajc-test>
-   
-   <!-- end of generic bugs -->
-
-   <!-- generic aspects -->
-   
-   <ajc-test dir="java5/generics/genericaspects" title="generic aspects - 1">
-     <compile files="GenericAspect1.aj" options="-1.9">
-         <message kind="error" line="2" text="only abstract aspects can have type parameters"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/genericaspects" title="generic aspects - 2">
-     <compile files="GenericAspect2.aj" options="-1.9">
-       <message kind="error" line="9" text="a generic super-aspect must be fully parameterized in an extends clause"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/genericaspects" title="generic aspects - 3">
-     <compile files="GenericAspect3.aj" options="-1.9"/>
-     <run class="GenericAspect3">
-      <stderr>
-		<line text="A"/>
-		<line text="B"/>
-      </stderr>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/genericaspects" title="generic aspects - 4">
-     <compile files="ParentChildRelationship.aj" options="-1.9"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/genericaspects" title="generic aspect with declare warning using type vars">
-     <compile files="DeclareWarningInGenericAspect.aj" options="-1.9">
-         <message kind="warning" line="16" text="this method takes a T!"/>
-     </compile>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/genericaspects" title="generic aspect with execution advice using type vars">
-     <compile files="ExecutionAdviceInGenericAspect.aj" options="-1.9">
-     </compile>
-     <run class="ExecutionAdviceInGenericAspect">
-         <stdout>
-             <line text="I matched at execution(void C.foo(String))"/>
-         </stdout>
-     </run>
-   </ajc-test>
-
-  <ajc-test dir="java5/generics/genericaspects" title="generic aspect with anonymous pointcut">
-     <compile files="AnonymousPointcutInGenericAspect.aj" options="-1.9">
-     </compile>
-     <run class="AnonymousPointcutInGenericAspect">
-         <stdout>
-             <line text="I matched at execution(void C.foo(String))"/>
-         </stdout>
-     </run>
-   </ajc-test>
-            
-  <ajc-test dir="java5/generics/genericaspects" title="generic aspect declare parents">
-     <compile files="DeclareParentsWithTypeVars.aj" options="-1.9">
-     </compile>
-     <run class="DeclareParentsWithTypeVars">
-     </run>
-   </ajc-test>
-
-  <ajc-test dir="java5/generics/genericaspects" title="generic aspect declare soft">
-     <compile files="DeclareSoftWithTypeVars.aj" options="-1.9">
-     </compile>
-     <run class="DeclareSoftWithTypeVars">
-         <stderr>
-             <line text="handled exception: io, io, it's off to work we go..."/>
-             <line text="Successfully converted to domain exception"/>
-         </stderr>
-     </run>
-   </ajc-test>
-                  
-   <!-- ajdk example -->
-   <ajc-test dir="java5/generics/genericaspects" title="generic aspects - 5 (ajdk)">
-     <compile files="Blob.java,BlobContainment.aj,ParentChildRelationship.aj" options="-1.9"/>
-     <run class="BlobContainment"/>
-   </ajc-test>
-   
-   <!-- same as above but all types in one file -->
-   <ajc-test dir="java5/generics/genericaspects" title="generic aspects - 6 (ajdk)">
-     <compile files="TheBigOne.java" options="-1.9"/>
-     <run class="TheBigOne"/>
-   </ajc-test>
-   
-   <!-- end of generic aspects -->
-   
-   <!-- generic ITDs -->
-  
-   <ajc-test dir="java5/generics/itds" title="ITDs on generic type">
-     <compile files="Parse5.java" options="-1.9">
-        <message kind="error" line="9"/>
-        <message kind="error" line="11"/>
-        <message kind="error" line="13"/>
-        <message kind="error" line="15"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="itd of non static member">
-       <compile files="A.java" options="-1.9"/>
-       <run class="A">
-         <stderr>
-           <line text="min(2,4)=>2"/>
-           <line text="max(2,4)=>4"/>
-         </stderr>
-       </run>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="itd of static member">
-       <compile files="B.java" options="-1.9"/>
-       <run class="B">
-         <stderr>
-           <line text="min(2,4)=>2"/>
-           <line text="max(2,4)=>4"/>
-         </stderr>
-       </run>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="itd using type parameter">
-       <compile files="C.java" options="-1.9"/>
-       <run class="C">
-         <stderr>
-           <line text="fillthisin..."/>
-         </stderr>
-       </run>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds" title="itd incorrectly using type parameter">
-       <compile files="D.java" options="-1.9"/>
-       <run class="D">
-         <stderr>
-           <line text="fillthisin..."/>
-         </stderr>
-       </run>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="static generic method itd">
-     <compile files="StaticGenericMethodITD.aj" options="-1.9"/>
-     <run class="StaticGenericMethodITD">
-       <stderr>
-         <line text="First=10"/>
-       </stderr>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="generic ctor itd - 1">
-     <compile files="GenericCtorITD1.aj" options="-1.9"/>
-     <run class="GenericCtorITD1"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="generic ctor itd - 2">
-     <compile files="GenericCtorITD2.aj" options="-1.9"/>
-     <run class="GenericCtorITD2"/>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds" title="generic ctor itd - 3">
-     <compile files="GenericCtorITD3.aj" options="-1.9"/>
-     <run class="GenericCtorITD3"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="parameterized method itd - 1">
-     <compile files="ParameterizedMethodITD1.aj" options="-1.9"/>
-     <run class="ParameterizedMethodITD1"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="parameterized method itd - 2">
-     <compile files="ParameterizedMethodITD2.aj" options="-1.9">
-       <message kind="error" line="9" text="The method simple(List&lt;? extends Number&gt;) in the type Base is not applicable for the arguments (List&lt;A&gt;)"/>
-     </compile>
-   </ajc-test>
-
-
-   <ajc-test dir="java5/generics/itds" title="parameterized method itd - 3">
-     <compile files="ParameterizedMethodITD3.aj" options="-1.9">
-       <message kind="error" line="9" text="The method simple(List&lt;? super A&gt;) in the type Base is not applicable for the arguments (List&lt;B&gt;)"/>
-     </compile>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds" title="parameterized method itd - 4">
-     <compile files="ParameterizedMethodITD4.aj" options="-1.9"/>
-     <run class="ParameterizedMethodITD4"/>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds" title="generic method itd - 1">
-     <compile files="GenericMethodITD1.aj" options="-1.9"/>
-     <run class="GenericMethodITD1"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="generic method itd - 2">
-     <compile files="GenericMethodITD2.aj" options="-1.9">
-     <message kind="error" line="9" text="Bound mismatch: The generic method simple(List&lt;? extends E&gt;) of type Base is not applicable for the arguments (List&lt;A&gt;). The inferred type A is not a valid substitute for the bounded parameter &lt;E extends Number&gt;"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="generic method itd - 3">
-     <compile files="GenericMethodITD3.aj" options="-1.9"/>
-     <run class="GenericMethodITD3"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="generic method itd - 4">
-     <compile files="GenericMethodITD4.aj" options="-1.9"/>
-     <run class="GenericMethodITD4"/>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds" title="generic method itd - 5">
-     <compile files="GenericMethodITD5.aj" options="-1.9">
-     <message kind="error" line="10" text="The method simple(List&lt;E&gt;, List&lt;E&gt;) in the type Base is not applicable for the arguments (List&lt;A&gt;, List&lt;B&gt;)"/>
-     </compile>
-   </ajc-test>
- 
-   <ajc-test dir="java5/generics/itds" title="generic method itd - 6">
-     <compile files="GenericMethodITD6.aj" options="-1.9"/>
-     <run class="GenericMethodITD6"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="generic method itd - 7">
-     <compile files="GenericMethodITD7.aj" options="-1.9"/>
-     <run class="GenericMethodITD7"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="generic method itd - 8">
-     <compile files="GenericMethodITD8.aj" options="-1.9">
-     <message kind="error" line="10" text="The method simple(List&lt;E&gt;, List&lt;? extends E&gt;) in the type Base is not applicable for the arguments (List&lt;Number&gt;, List&lt;String&gt;)"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="generic method itd - 9">
-     <compile files="GenericMethodITD9.aj" options="-1.9"/>
-     <run class="GenericMethodITD9"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="generic method itd - 10">
-     <compile files="GenericMethodITD10.aj" options="-1.9">
-       <message kind="error" line="10" text="Bound mismatch: The generic method crazy(List&lt;R&gt;) of type Base is not applicable for the arguments (List&lt;A&gt;). The inferred type A is not a valid substitute for the bounded parameter &lt;R extends Comparable&lt;? super R&gt;&gt;"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="generic method itd - 11">
-     <compile files="GenericMethodITD11.aj" options="-1.9"/>
-     <run class="GenericMethodITD11"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="generic method itd - 12">
-     <compile files="GenericMethodITD12.aj" options="-1.9">
-       <message kind="error" line="10" text="Bound mismatch: The generic method crazy(List&lt;R&gt;) of type Base is not applicable for the arguments (List&lt;A&gt;). The inferred type A is not a valid substitute for the bounded parameter &lt;R extends Foo&lt;? extends R&gt;&gt;"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="generic method itd - 13">
-     <compile files="GenericMethodITD13.aj" options="-1.9"/>
-     <run class="GenericMethodITD13"/>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds" title="generic method itd - 14">
-     <compile files="GenericMethodITD14.aj" options="-1.9">
-       <message kind="error" line="10" text="Bound mismatch: The generic method crazy(List&lt;R&gt;) of type Base is not applicable for the arguments (List&lt;A&gt;). The inferred type A is not a valid substitute for the bounded parameter &lt;R extends Foo&lt;? super R&gt;&gt;"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="generic method itd - 15">
-     <compile files="GenericMethodITD15.aj" options="-1.9"/>
-     <run class="GenericMethodITD15"/>
-   </ajc-test>
-   
-   <!-- visibility -->
-   
-   <ajc-test dir="java5/generics/itds/visibility" title="public itds">
-     <compile files="PublicITDs.aj" options="-1.9"/>
-     <run class="PublicITDs"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/visibility" title="private itds">
-     <compile files="PrivateITDs.aj" options="-1.9"/>
-     <run class="PrivateITDs"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/visibility" title="package itds">
-     <compile files="PackageITDs.aj" options="-1.9"/>
-     <run class="PackageITDs"/>
-   </ajc-test>
-      
-   <ajc-test dir="java5/generics/itds/visibility" title="public itds with errors">
-     <compile files="PublicITDsErrors.aj" options="-1.9">
-       <message kind="error" line="13" text="The method publicMethod2(List&lt;R&gt;, List&lt;R&gt;) in the type Base is not applicable for the arguments (List&lt;Double&gt;, List&lt;Float&gt;)"/>
-       <message kind="error" line="15" text="The constructor Base(List&lt;Double&gt;, Map&lt;Integer,String&gt;) is undefined"/>
-     </compile>
-   </ajc-test>
-   
-   <!-- targetting different types -->
-   
-   <ajc-test dir="java5/generics/itds/differingTargets" title="targetting interface">
-     <compile files="TargettingInterface.aj" options="-1.9"/>
-     <run class="TargettingInterface"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/differingTargets" title="targetting aspect">
-     <compile files="TargettingAspect.aj" options="-1.9"/>
-     <run class="TargettingAspect"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/differingTargets" title="targetting class">
-     <compile files="TargettingClass.aj" options="-1.9"/>
-     <run class="TargettingClass"/>
-   </ajc-test>
-   
-   <!-- sharing type variables between the ITD and the generic type -->
-
-   <ajc-test dir="java5/generics/itds/sharing" title="field itd using type variable from target type - 1">
-     <compile files="FieldA.aj" options="-1.9"/>
-     <run class="FieldA"/>   
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="field itd using type variable from target type - 2">
-     <compile files="FieldB.aj" options="-1.9">
-       <message kind="error" line="16" text="Incorrect number of type parameters supplied.  The generic type Base&lt;N,M&gt; has 2 type parameters, not 1."/>
-     </compile>
-   </ajc-test>
-    
-   <ajc-test dir="java5/generics/itds/sharing" title="field itd using type variable from target type - 3">
-     <compile files="FieldC.aj" options="-1.9"/>
-     <run class="FieldC"/>   
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds/sharing" title="field itd using type variable from target type - 4">
-     <compile files="FieldD.aj" options="-1.9"/>
-     <run class="FieldD"/>   
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds/sharing" title="field itd using type variable from target type - 5">
-     <compile files="FieldE.aj" options="-1.9"/>
-     <run class="FieldE"/>   
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds/sharing" title="field itd using type variable from target type - 6">
-     <compile files="FieldF.aj" options="-1.9"/>
-     <run class="FieldF"/>   
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds/sharing" title="field itd using type variable from target type - 7">
-     <compile files="FieldG.aj" options="-1.9"/>
-     <run class="FieldG"/>   
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds/sharing" title="field itd using type variable from target type - 8">
-     <compile files="FieldH.aj" options="-1.9"/>
-     <run class="FieldH"/>   
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds/sharing" title="field itd using type variable from target type - 9">
-     <compile files="FieldI.aj" options="-1.9">
-     	<message kind="error" line="7" text="Type mismatch: cannot convert from List&lt;String&gt; to List&lt;Integer&gt;"/>
-     </compile>
-   </ajc-test>
-  
-   <ajc-test dir="java5/generics/itds/sharing" title="field itd using type variable from target type -10">
-     <compile files="FieldJ.aj" options="-1.9"/>
-     <run class="FieldJ"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="field itd using type variable from target type -11">
-     <compile files="FieldK.aj" options="-1.9"/>
-     <run class="FieldK"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="field itd using type variable from target type -12">
-     <compile files="FieldL.aj" options="-1.9"/>
-     <run class="FieldL"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="field itd using type variable from target type -13">
-     <compile files="FieldM.aj" options="-1.9"/>
-     <run class="FieldM"/>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds/sharing" title="field itd using type variable from target type -14">
-     <compile files="FieldN.aj" options="-1.9">
-       <message kind="error" line="11" text="Type parameters can not be specified in the ITD target type - the target type I is not generic."/>
-     </compile>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds/sharing" title="field itd using type variable from target type -15">
-     <compile files="FieldO.aj" options="-1.9">
-       <message kind="error" line="11" text="Intertype declarations can only be made on the generic type, not on a parameterized type. The name 'String' cannot be used as a type parameter, since it refers to a real type."/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="field itd using type variable from target type -16">
-     <compile files="FieldP.aj" options="-1.9">
-       <message kind="error" line="10" text="static intertype field declarations cannot refer to type variables from the target generic type"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="field itd using type variable from target type -17">
-     <compile files="FieldQ.aj" options="-1.9"/>
-     <run class="FieldQ"/>
-   </ajc-test>
-   
-   <!-- Now intertype declared methods on generic types that use the target types type vars -->
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - A1">
-     <compile files="MethodA.aj" options="-1.9"/>
-     <run class="MethodA"/>   
-   </ajc-test>
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - A2">
-     <compile files="MethodA2.aj" options="-1.9"/>
-     <run class="MethodA2"/>   
-   </ajc-test>
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - A3">
-     <compile files="MethodA3.aj" options="-1.9"/>
-     <run class="MethodA3"/>   
-   </ajc-test>
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - A4">
-     <compile files="MethodA4.aj" options="-1.9"/>
-     <run class="MethodA4"/>   
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - B1">
-     <compile files="MethodB.aj" options="-1.9">
-       <message kind="error" line="16" text="Incorrect number of type parameters supplied.  The generic type Base&lt;N,M&gt; has 2 type parameters, not 1."/>
-     </compile>
-   </ajc-test>
-    
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - C1">
-     <compile files="MethodC.aj" options="-1.9"/>
-     <run class="MethodC"/>   
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - D1">
-     <compile files="MethodD.aj" options="-1.9"/>
-     <run class="MethodD"/>   
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - E1">
-     <compile files="MethodE.aj" options="-1.9"/>
-     <run class="MethodE"/>   
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - F1">
-     <compile files="MethodF.aj" options="-1.9"/>
-     <run class="MethodF"/>   
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - G1">
-     <compile files="MethodG.aj" options="-1.9"/>
-     <run class="MethodG"/>   
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - H1">
-     <compile files="MethodH.aj" options="-1.9"/>
-     <run class="MethodH"/>   
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - I1">
-     <compile files="MethodI.aj" options="-1.9">
-       <message kind="error" line="6" text="Type mismatch: cannot convert from List&lt;Integer&gt; to List&lt;String&gt;"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - I2">
-     <compile files="MethodI2.aj" options="-1.9">
-       <message kind="error" line="7" text="The method m(List&lt;Integer&gt;) in the type Base&lt;Integer&gt; is not applicable for the arguments (List&lt;String&gt;)"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - J1">
-     <compile files="MethodJ.aj" options="-1.9"/>
-     <run class="MethodJ"/>   
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - K1">
-     <compile files="MethodK.aj" options="-1.9"/>
-     <run class="MethodK"/>   
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - L1">
-     <compile files="MethodL.aj" options="-1.9"/>
-     <run class="MethodL"/>   
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - M1">
-     <compile files="MethodM.aj" options="-1.9"/>
-     <run class="MethodM"/>   
-   </ajc-test>
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - M2">
-     <compile files="MethodM2.aj" options="-1.9"/>
-     <run class="MethodM2"/>   
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - N1">
-     <compile files="MethodN.aj" options="-1.9">
-            <message kind="error" line="11" text="Type parameters can not be specified in the ITD target type - the target type I is not generic."/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - O1">
-     <compile files="MethodO.aj" options="-1.9">
-       <message kind="error" line="11" text="Intertype declarations can only be made on the generic type, not on a parameterized type. The name 'String' cannot be used as a type parameter, since it refers to a real type."/>
-     </compile>   
-   </ajc-test>
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - O2">
-     <compile files="MethodO2.aj" options="-1.9">
-       <message kind="error" line="11" text="Intertype declarations can only be made on the generic type, not on a parameterized type. The name 'String' cannot be used as a type parameter, since it refers to a real type."/>
-     </compile>   
-   </ajc-test>  
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - P1">
-     <compile files="MethodP.aj" options="-1.9"/>
-     <run class="MethodP"/>   
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd using type variable from target type - Q1">
-     <compile files="MethodQ.aj" options="-1.9"/>
-     <run class="MethodQ"/>   
-   </ajc-test> 
-   
-   <!-- Now intertype declared constructors on generic types that use the target types type vars -->
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="ctor itd using type variable from target type - A1">
-     <compile files="CtorA.aj" options="-1.9"/>
-     <run class="CtorA"/>   
-   </ajc-test> 
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="ctor itd using type variable from target type - B1">
-     <compile files="CtorB.aj" options="-1.9">
-        <message kind="error" line="15" text="Incorrect number of type parameters supplied.  The generic type Base&lt;N,M&gt; has 2 type parameters, not 1."/>
-     </compile>
-   </ajc-test> 
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="ctor itd using type variable from target type - C1">
-     <compile files="CtorC.aj" options="-1.9"/>
-     <run class="CtorC"/>   
-   </ajc-test> 
-     
-   <ajc-test dir="java5/generics/itds/sharing" title="ctor itd using type variable from target type - D1">
-     <compile files="CtorD.aj" options="-1.9"/>
-     <run class="CtorD"/>   
-   </ajc-test> 
-     
-   <ajc-test dir="java5/generics/itds/sharing" title="ctor itd using type variable from target type - E1">
-     <compile files="CtorE.aj" options="-1.9"/>
-     <run class="CtorE"/>   
-   </ajc-test> 
-     
-   <ajc-test dir="java5/generics/itds/sharing" title="ctor itd using type variable from target type - F1">
-     <compile files="CtorF.aj" options="-1.9"/>
-     <run class="CtorF"/>   
-   </ajc-test> 
-     
-   <ajc-test dir="java5/generics/itds/sharing" title="ctor itd using type variable from target type - G1">
-     <compile files="CtorG.aj" options="-1.9"/>
-     <run class="CtorG"/>   
-   </ajc-test> 
-     
-   <ajc-test dir="java5/generics/itds/sharing" title="ctor itd using type variable from target type - H1">
-     <compile files="CtorH.aj" options="-1.9"/>
-     <run class="CtorH"/>   
-   </ajc-test> 
-     
-   <ajc-test dir="java5/generics/itds/sharing" title="ctor itd using type variable from target type - I1">
-     <compile files="CtorI.aj" options="-1.9"/>
-     <run class="CtorI"/>   
-   </ajc-test> 
- 
-   <!-- putting it all together, fields/methods/ctors and decps -->    
-  
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - A">
-     <compile files="GenericAspectA.aj" options="-1.9"/>
-     <run class="GenericAspectA"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - B">
-     <compile files="GenericAspectB.aj" options="-1.9"/>
-     <run class="GenericAspectB"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - C">
-     <compile files="GenericAspectC.aj" options="-1.9"/>
-     <run class="GenericAspectC"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - D">
-     <compile files="GenericAspectD.aj" options="-1.9"/>
-     <run class="GenericAspectD"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - E">
-     <compile files="GenericAspectE.aj" options="-1.9"/>
-     <run class="GenericAspectE"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - F">
-     <compile files="GenericAspectF.aj" options="-1.9"/>
-     <run class="GenericAspectF"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - G">
-     <compile files="GenericAspectG.aj" options="-1.9"/>
-     <run class="GenericAspectG"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - H">
-     <compile files="GenericAspectH.aj" options="-1.9">
-       <message kind="error" line="7" text="Type java.lang.String does not meet the specification for type parameter 1 (N extends java.lang.Number) in generic type GenericAspect$SimpleI"/>
-	   <!-- see pr133307, shame about this -->
-       <!--message kind="error" line="16" text="The method m4(String) is undefined for the type Base"/-->
-     </compile>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - I">
-     <compile files="GenericAspectI.aj" options="-1.9"/>
-     <run class="GenericAspectI"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - J">
-     <compile files="GenericAspectJ.aj" options="-1.9"/>
-     <run class="GenericAspectJ"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - K">
-     <compile files="GenericAspectK.aj" options="-1.9">
-       <message kind="error" line="7" text="B does not meet the specification for type parameter 1 (L extends java.lang.Number) in generic type GenericAspect$SimpleI"/>
-       <message kind="error" line="16" text="The method m4(String) is undefined for the type Base"/>
-     </compile>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - K2">
-     <compile files="GenericAspectK2.aj" options="-1.9">
-       <message kind="error" line="13" text="The type String is not a valid substitute"/>
-     </compile>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - L">
-     <compile files="GenericAspectL.aj" options="-1.9"/>
-     <run class="GenericAspectL"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - M">
-     <compile files="GenericAspectM.aj" options="-1.9">
-	   <message kind="error" line="23" text="The method m0(Integer) in the type GenericAspect.SimpleI&lt;Integer&gt; is not applicable for the arguments (String)"/>
-	   <message kind="error" line="24" text="The method m1(List&lt;Integer&gt;) in the type GenericAspect.SimpleI&lt;Integer&gt; is not applicable for the arguments (List&lt;String&gt;)"/>
-       <message kind="error" line="25" text="Type mismatch: cannot convert from String to Integer"/>
-       <message kind="error" line="26" text="Type mismatch: cannot convert from List&lt;String&gt; to List&lt;Integer&gt;"/>
-     </compile>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - N">
-     <compile files="GenericAspectN.aj" options="-1.9"/>
-     <run class="GenericAspectN"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - O">
-     <compile files="GenericAspectO.aj" options="-1.9">
-       <message kind="error" line="24" text="Cannot make a static reference to the non-static field Bottom.parent"/>
-       <message kind="error" line="26" text="The method add(Bottom) in the type List&lt;Bottom&gt; is not applicable for the arguments (Top)"/>
-       <message kind="error" line="27" text="Cannot make a static reference to the non-static field Top.children"/>
-     </compile>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - P">
-     <compile files="GenericAspectP.aj" options="-1.9"/>
-     <run class="GenericAspectP"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - Q">
-     <compile files="GenericAspectQ.aj" options="-1.9"/>
-     <run class="GenericAspectQ"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - R">
-     <compile files="GenericAspectR.aj" options="-1.9"/>
-     <run class="GenericAspectR"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - S">
-     <compile files="GenericAspectS.aj" options="-1.9"/>
-     <run class="GenericAspectS"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - T">
-     <compile files="GenericAspectT.aj" options="-1.9"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - U">
-     <compile files="GenericAspectU.aj" options="-1.9"/>
-     <run class="GenericAspectU"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - V">
-     <compile files="GenericAspectV.aj" options="-1.9"/>
-     <run class="GenericAspectV"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - W">
-     <compile files="GenericAspectW.aj" options="-1.9"/>
-     <run class="GenericAspectW"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - X">
-     <compile files="GenericAspectX.aj" options="-1.9"/>
-     <run class="GenericAspectX"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - Y">
-     <compile files="GenericAspectY.aj" options="-1.9 -showWeaveInfo">
-        <message kind="weave" text="Join point 'method-execution(void ParentChildRelationship$ParentHasChildren.addChild(C))' in Type 'ParentChildRelationship' (GenericAspectY.aj:53) advised by before advice from 'GenericAspectY' (GenericAspectY.aj:101) [with runtime test]"/>
-		<message kind="weave" text="Extending interface set for type 'Top' (GenericAspectY.aj) to include 'ParentChildRelationship$ParentHasChildren&lt;Bottom&gt;' (GenericAspectY.aj)"/>
-		<message kind="weave" text="Type 'Top' (GenericAspectY.aj) has intertyped field from 'ParentChildRelationship' (GenericAspectY.aj:'java.util.List&lt;Bottom&gt; ParentChildRelationship$ParentHasChildren.children')"/>
-		<message kind="weave" text="Type 'Top' (GenericAspectY.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectY.aj:'java.util.List&lt;Bottom&gt; ParentChildRelationship$ParentHasChildren.getChildren()')"/>
-		<message kind="weave" text="Type 'Top' (GenericAspectY.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectY.aj:'void ParentChildRelationship$ParentHasChildren.addChild(Bottom)')"/>
-		<message kind="weave" text="Type 'Top' (GenericAspectY.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectY.aj:'void ParentChildRelationship$ParentHasChildren.removeChild(Bottom)')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ParentHasChildren' (GenericAspectY.aj) has intertyped field from 'ParentChildRelationship' (GenericAspectY.aj:'java.util.List&lt;C&gt; ParentChildRelationship$ParentHasChildren.children')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ParentHasChildren' (GenericAspectY.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectY.aj:'java.util.List&lt;C&gt; ParentChildRelationship$ParentHasChildren.getChildren()')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ParentHasChildren' (GenericAspectY.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectY.aj:'void ParentChildRelationship$ParentHasChildren.addChild(C)')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ParentHasChildren' (GenericAspectY.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectY.aj:'void ParentChildRelationship$ParentHasChildren.removeChild(C)')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ChildHasParent' (GenericAspectY.aj) has intertyped field from 'ParentChildRelationship' (GenericAspectY.aj:'P ParentChildRelationship$ChildHasParent.parent')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ChildHasParent' (GenericAspectY.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectY.aj:'P ParentChildRelationship$ChildHasParent.getParent()')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ChildHasParent' (GenericAspectY.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectY.aj:'void ParentChildRelationship$ChildHasParent.setParent(P)')"/>
-		<message kind="weave" text="Extending interface set for type 'Bottom' (GenericAspectY.aj) to include 'ParentChildRelationship$ChildHasParent&lt;Top&gt;' (GenericAspectY.aj)"/>
-		<message kind="weave" text="Type 'Bottom' (GenericAspectY.aj) has intertyped field from 'ParentChildRelationship' (GenericAspectY.aj:'Top ParentChildRelationship$ChildHasParent.parent')"/>
-		<message kind="weave" text="Type 'Bottom' (GenericAspectY.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectY.aj:'Top ParentChildRelationship$ChildHasParent.getParent()')"/>
-		<message kind="weave" text="Type 'Bottom' (GenericAspectY.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectY.aj:'void ParentChildRelationship$ChildHasParent.setParent(Top)')"/>
-     </compile>
-     <run class="GenericAspectY"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - Z">
-     <compile files="GenericAspectZ.aj" options="-1.9 -showWeaveInfo">
-        <message kind="weave" text="Join point 'method-execution(void ParentChildRelationship$ParentHasChildren.addChild(C))' in Type 'ParentChildRelationship' (GenericAspectZ.aj:53) advised by before advice from 'GenericAspectZ' (GenericAspectZ.aj:95) [with runtime test]"/>
-	    <message kind="weave" text="Join point 'method-execution(void ParentChildRelationship$ParentHasChildren.removeChild(C))' in Type 'ParentChildRelationship' (GenericAspectZ.aj:65) advised by before advice from 'GenericAspectZ' (GenericAspectZ.aj:96) [with runtime test]"/>
-
-		<message kind="weave" text="Extending interface set for type 'Top' (GenericAspectZ.aj) to include 'ParentChildRelationship$ParentHasChildren&lt;Bottom&gt;' (GenericAspectZ.aj)"/>
-		<message kind="weave" text="Type 'Top' (GenericAspectZ.aj) has intertyped field from 'ParentChildRelationship' (GenericAspectZ.aj:'java.util.List&lt;Bottom&gt; ParentChildRelationship$ParentHasChildren.children')"/>
-		<message kind="weave" text="Type 'Top' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'java.util.List&lt;Bottom&gt; ParentChildRelationship$ParentHasChildren.getChildren()')"/>
-		<message kind="weave" text="Type 'Top' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'void ParentChildRelationship$ParentHasChildren.addChild(Bottom)')"/>
-		<message kind="weave" text="Type 'Top' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'void ParentChildRelationship$ParentHasChildren.removeChild(Bottom)')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ParentHasChildren' (GenericAspectZ.aj) has intertyped field from 'ParentChildRelationship' (GenericAspectZ.aj:'java.util.List&lt;C&gt; ParentChildRelationship$ParentHasChildren.children')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ParentHasChildren' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'java.util.List&lt;C&gt; ParentChildRelationship$ParentHasChildren.getChildren()')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ParentHasChildren' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'void ParentChildRelationship$ParentHasChildren.addChild(C)')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ParentHasChildren' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'void ParentChildRelationship$ParentHasChildren.removeChild(C)')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ChildHasParent' (GenericAspectZ.aj) has intertyped field from 'ParentChildRelationship' (GenericAspectZ.aj:'P ParentChildRelationship$ChildHasParent.parent')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ChildHasParent' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'P ParentChildRelationship$ChildHasParent.getParent()')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ChildHasParent' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'void ParentChildRelationship$ChildHasParent.setParent(P)')"/>
-		<message kind="weave" text="Extending interface set for type 'Bottom' (GenericAspectZ.aj) to include 'ParentChildRelationship$ChildHasParent&lt;Top&gt;' (GenericAspectZ.aj)"/>
-		<message kind="weave" text="Type 'Bottom' (GenericAspectZ.aj) has intertyped field from 'ParentChildRelationship' (GenericAspectZ.aj:'Top ParentChildRelationship$ChildHasParent.parent')"/>
-		<message kind="weave" text="Type 'Bottom' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'Top ParentChildRelationship$ChildHasParent.getParent()')"/>
-		<message kind="weave" text="Type 'Bottom' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'void ParentChildRelationship$ChildHasParent.setParent(Top)')"/>
-
-		<!--message kind="weave" text="Extending interface set for type 'Top' (GenericAspectZ.aj) to include 'ParentChildRelationship$ParentHasChildren&lt;Bottom&gt;' (GenericAspectZ.aj)"/>
-		<message kind="weave" text="Type 'Top' (GenericAspectZ.aj) has intertyped field from 'ParentChildRelationship' (GenericAspectZ.aj:'java.util.List&lt;C&gt; ParentChildRelationship$ParentHasChildren.children')"/>
-		<message kind="weave" text="Type 'Top' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'java.util.List&lt;C&gt; ParentChildRelationship$ParentHasChildren.getChildren()')"/>
-		<message kind="weave" text="Type 'Top' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'void ParentChildRelationship$ParentHasChildren.addChild(C)')"/>
-		<message kind="weave" text="Type 'Top' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'void ParentChildRelationship$ParentHasChildren.removeChild(C)')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ParentHasChildren' (GenericAspectZ.aj) has intertyped field from 'ParentChildRelationship' (GenericAspectZ.aj:'java.util.List&lt;C&gt; ParentChildRelationship$ParentHasChildren.children')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ParentHasChildren' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'java.util.List&lt;C&gt; ParentChildRelationship$ParentHasChildren.getChildren()')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ParentHasChildren' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'void ParentChildRelationship$ParentHasChildren.addChild(C)')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ParentHasChildren' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'void ParentChildRelationship$ParentHasChildren.removeChild(C)')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ChildHasParent' (GenericAspectZ.aj) has intertyped field from 'ParentChildRelationship' (GenericAspectZ.aj:'ParentChildRelationship$ParentHasChildren ParentChildRelationship$ChildHasParent.parent')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ChildHasParent' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'ParentChildRelationship$ParentHasChildren ParentChildRelationship$ChildHasParent.getParent()')"/>
-		<message kind="weave" text="Type 'ParentChildRelationship$ChildHasParent' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'void ParentChildRelationship$ChildHasParent.setParent(P)')"/>
-		<message kind="weave" text="Extending interface set for type 'Bottom' (GenericAspectZ.aj) to include 'ParentChildRelationship$ChildHasParent&lt;Top&gt;' (GenericAspectZ.aj)"/>
-		<message kind="weave" text="Type 'Bottom' (GenericAspectZ.aj) has intertyped field from 'ParentChildRelationship' (GenericAspectZ.aj:'ParentChildRelationship$ParentHasChildren ParentChildRelationship$ChildHasParent.parent')"/>
-		<message kind="weave" text="Type 'Bottom' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'ParentChildRelationship$ParentHasChildren ParentChildRelationship$ChildHasParent.getParent()')"/>
-		<message kind="weave" text="Type 'Bottom' (GenericAspectZ.aj) has intertyped method from 'ParentChildRelationship' (GenericAspectZ.aj:'void ParentChildRelationship$ChildHasParent.setParent(P)')"/-->       
-     </compile>
-     <run class="GenericAspectZ"/>
-   </ajc-test>
-      
-   <ajc-test dir="java5/generics/binaryBridging" title="binary bridge methods - two">
-     <compile files="TwoA.java" outjar="twoa.jar" options="-1.9"/>
-     <compile files="TwoB.java" outjar="twob.jar" options="-1.9"/>
-     <compile files="TwoX.java" inpath="twoa.jar;twob.jar" options="-1.9"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/sharing" title="method itd sharing type variable with generic type">
-     <compile files="Simple.aj" options="-1.9"/>
-     <run class="Simple"/>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds/sharing" title="field itd sharing type variable with generic type">
-     <compile files="Simple2.aj" options="-1.9"/>
-     <run class="Simple2"/>
-   </ajc-test>
-   
-   
-   <ajc-test dir="java5/generics/itds" title="non static generic method itd - 2">
-     <compile files="NonstaticGenericCtorITD2.aj" options="-1.9"/>
-     <run class="NonstaticGenericCtorITD2"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="reusing type variable letters">
-     <compile files="ReusingLetters.aj" options="-1.9"/>
-     <run class="ReusingLetters"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="multiple generic itds in one file">
-     <compile files="BizarroSignatures.aj" options="-1.9"/>
-     <run class="BizarroSignatures"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="generic intertype field declaration, sharing type variable">
-     <compile files="FieldITDOnGenericType.aj" options="-1.9"/>
-     <run class="FieldITDOnGenericType">
-       <stderr>
-         <line text=">42"/>
-       </stderr>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="Parsing generic ITDs - 1">
-     <compile files="Parse1.java" options="-1.9"/>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds" title="Parsing generic ITDs - 2">
-     <compile files="Parse2.java" options="-1.9"/>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds" title="Parsing generic ITDs - 3">
-     <compile files="Parse3.java" options="-1.9"/>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds" title="Parsing generic ITDs - 4">
-     <compile files="Parse4.java" options="-1.9"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="Parsing generic ITDs - 5">
-     <compile files="Parse5.java" options="-1.9">
-       <message kind="error" line="11" text="Incorrect number of type parameters supplied.  The generic type Parse5&lt;T,S&gt; has 2 type parameters, not 3."/>
-       <message kind="error" line="13" text="Incorrect number of type parameters supplied.  The generic type Parse5&lt;T,S&gt; has 2 type parameters, not 1."/>
-       <message kind="error" line="15" text="Intertype declarations can only be made on the generic type, not on a parameterized type. The name 'String' cannot be used as a type parameter, since it refers to a real type."/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds" title="Parsing generic ITDs - 6">
-     <compile files="Parse6.java" options="-1.9"/>
-   </ajc-test>
-   
-   <!-- end of generic ITDs -->
-   
-   <!-- generic decps -->
-   
-   <ajc-test dir="java5/generics/decp" title="generic decp - simple">
-     <compile files="Basic.aj" options="-1.9"/>
-     <run class="Basic"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/decp" title="generic decp - implementing two variants #1">
-     <compile files="Basic2.aj" options="-1.9">
-        <message kind="error" line="11" text="Cannot declare parent I&lt;java.lang.Integer&gt; onto type Basic2 since it already has I&lt;java.lang.String&gt; in its hierarchy"/>
-     </compile>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/decp" title="generic decp - implementing two variants #2">
-     <compile files="Basic2b.aj" options="-1.9">
-        <message kind="error" line="10" text="Cannot declare parent I&lt;java.lang.Integer&gt; onto type Basic2b since it already has I in its hierarchy"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/decp" title="generic decp - implementing two variants #3">
-     <compile files="Basic2c.aj" options="-1.9">
-        <message kind="error" line="10" text="Cannot declare parent I onto type Basic2c since it already has I&lt;java.lang.Double&gt; in its hierarchy"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/decp" title="generic decp - implementing two variants #4">
-     <compile files="Basic2d.aj" options="-1.9"/>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/decp/binary" title="generic decp binary - implementing two variants #1">
-     <weave classesFiles="Base1.java" aspectsFiles="Asp1.aj" options="-1.9,-showWeaveInfo">
-        <message kind="error" line="2" text="Cannot declare parent I&lt;java.lang.Integer&gt; onto type Base1 since it already has I&lt;java.lang.String&gt; in its hierarchy"/>
-     </weave>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/decp/binary" title="generic decp binary - implementing two variants #2">
-     <weave classesFiles="Base2.java" aspectsFiles="Asp2.aj" options="-1.9,-showWeaveInfo">
-        <message kind="error" line="2" text="Cannot declare parent I&lt;java.lang.Integer&gt; onto type Base2 since it already has I in its hierarchy"/>
-     </weave>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/decp/binary" title="generic decp binary - implementing two variants #3">
-     <weave classesFiles="Base3.java" aspectsFiles="Asp3.aj" options="-1.9,-showWeaveInfo">
-        <message kind="error" line="2" text="Cannot declare parent I onto type Base3 since it already has I&lt;java.lang.Double&gt; in its hierarchy"/>
-     </weave>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/decp/binary" title="generic decp binary - implementing two variants #4">
-     <weave classesFiles="Base4.java" aspectsFiles="Asp4.aj" options="-1.9,-showWeaveInfo"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/decp" title="generic decp - incorrect number of type parameters">
-     <compile files="Basic3.aj" options="-1.9">
-       <message kind="error" line="10" text="Type pattern does not match because the wrong number of type parameters are specified: Type I requires 1 parameter(s)"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/decp" title="generic decp - specifying bounds">
-     <compile files="Basic4.aj" options="-1.9"/>
-     <run class="Basic4"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/decp" title="generic decp - specifying bounds but breaking them">
-     <compile files="Basic5.aj" options="-1.9">
-       <message kind="error" line="7" text="Type java.lang.String does not meet the specification for type parameter 1 (T extends java.lang.Number) in generic type I"/>
-     </compile>
-   </ajc-test>
-     
-   <ajc-test dir="java5/generics/decp" title="generic decp - with parameterized on the target">
-     <compile files="Basic6.aj" options="-1.9,-showWeaveInfo">
-       <message kind="weave" text="Extending interface set for type 'Basic6' (Basic6.aj) to include 'K&lt;java.lang.Integer&gt;' (Basic6.aj)"/>
-     </compile>
-     <run class="Basic6"/>
-   </ajc-test>
-
-   <!-- end of generic decps -->
-   
-   <!-- generics/itds and binary weaving -->
-   
-   <ajc-test dir="java5/generics/itds/binaryweaving" vm="1.5" title="binary weaving ITDs - A">
-   	   <compile files="TestA_generictype.java" outjar="code.jar" options="-1.9"/>
-       <compile files="TestA_aspect.aj,TestA_class.java" inpath="code.jar" options="-1.9"/>
-       <run class="TestA_class"/>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds/binaryweaving" vm="1.5" title="binary weaving ITDs - B">
-   	   <compile files="TestB_generictype.java" outjar="code.jar" options="-1.9"/>
-       <compile files="TestB_aspect1.aj,TestB_aspect2.aj,TestB_class.java" inpath="code.jar" options="-1.9"/>
-       <run class="TestB_class"/>
-   </ajc-test>
-    
-   <ajc-test dir="java5/generics/itds/binaryweaving" vm="1.5" title="binary weaving ITDs - 1">
-   	   <compile files="BaseClass.java" outjar="code.jar" options="-1.9"/>
-       <compile files="A1.aj" inpath="code.jar" options="-1.9"/>
-        <run class="BaseClass">
-        <stderr>
-            <line text="Advice count=1"/>
-        </stderr>
-        </run>
-    </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/binaryweaving" vm="1.5" title="binary weaving ITDs - 2">
-   	   <compile files="BaseClass.java,A1.aj" outjar="code.jar" options="-1.9,-showWeaveInfo">
-   	     <message kind="weave" text="Type 'BaseClass' (BaseClass.java) has intertyped field from 'A1' (A1.aj:'java.util.List&lt;java.lang.String&gt; BaseClass.list1')"/>
-   	     <message kind="weave" text="Type 'BaseClass' (BaseClass.java:12) advised by after advice from 'A1' (A1.aj:7)"/>
-   	   </compile>
-       <compile files="A2.aj" inpath="code.jar" options="-1.9,-showWeaveInfo">
-         <message kind="weave" text="Type 'BaseClass' (BaseClass.java) has intertyped field from 'A1' (A1.aj:'java.util.List&lt;java.lang.String&gt; BaseClass.list1')"/>
-   	     <message kind="weave" text="Type 'BaseClass' (BaseClass.java:12) advised by after advice from 'A1' (code.jar!A1.class:7(from A1.aj))"/>
-	     <message kind="weave" text="Type 'BaseClass' (BaseClass.java) has intertyped field from 'A2' (A2.aj:'java.util.List&lt;N&gt; BaseClass.list2')"/>
-         <message kind="weave" text="Type 'BaseClass' (BaseClass.java:13) advised by after advice from 'A2' (A2.aj:8)"/>
-       </compile>
-        <run class="BaseClass">
-        <stderr>
-             <line text="Advice count=2"/>
-        </stderr>
-        </run>
-    </ajc-test>
-
-   <ajc-test dir="java5/generics/itds/binaryweaving" vm="1.5" title="binary weaving ITDs - 3">
-   	   <compile files="BaseClass.java,A1.aj,A2.aj" outjar="code.jar" options="-1.9"/>
-       <compile files="A3.aj" inpath="code.jar" options="-1.9"/>
-        <run class="BaseClass">
-        <stderr>
-             <line text="Advice count=3"/>
-        </stderr>
-        </run>
-    </ajc-test>
-
-   <!-- end of generics/itds and binary weaving -->
-   
-   <!-- generics/itds and bridge methods -->
-   
-   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="bridge methods - 1">
-   	   <compile files="Sub1.java,Super1.java,X1.aj" options="-1.9"/>
-       <run class="X1"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="bridge methods - 1 - binary">
-   	 <compile files="Sub1.java,Super1.java" outjar="code.jar" options="-1.9"/>
-   	 <compile files="X1.aj" inpath="code.jar" options ="-1.9"/>
-     <run class="X1"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="bridge methods - 2">
-   	   <compile files="Sub2.java,Super2.java,X2.aj" options="-1.9"/>
-       <run class="X2"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="bridge methods - 2 - binary">
-   	 <compile files="Sub2.java,Super2.java" outjar="code.jar" options="-1.9"/>
-   	 <compile files="X2.aj,Util.java" inpath="code.jar" options ="-1.9"/>
-     <run class="X2"/>
-   </ajc-test>
-      
-   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="bridge methods - 3">
-   	 <compile files="Sub3.java,Super3.java,X3.aj" options="-1.9"/>
-     <run class="X3"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="bridge methods - 3 - binary">
-   	 <compile files="Sub3.java,Super3.java" outjar="code.jar" options="-1.9"/>
-   	 <compile files="X3.aj" inpath="code.jar" options ="-1.9"/>
-     <run class="X3"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="bridge methods - 4">
-   	 <compile files="Sub4.java,Super4.java,X4.aj" options="-1.9"/>
-     <run class="X4"/>
-   </ajc-test>
-   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="bridge methods - 4 - binary">
-   	 <compile files="Sub4.java,Super4.java" outjar="code.jar" options="-1.9"/>
-   	 <compile files="X4.aj" inpath="code.jar" options ="-1.9"/>
-     <run class="X4"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/binaryBridging" title="binary bridge methods - one">
-     <compile files="OneA.java" outjar="onea.jar" options="-1.9"/>
-     <compile files="OneB.java" outjar="oneb.jar" options="-1.9"/>
-     <compile files="OneX.java" inpath="onea.jar;oneb.jar" options="-1.9"/>
-   </ajc-test>
-      
-   <ajc-test dir="java5/generics/binaryBridging" title="binary bridge methods - two">
-     <compile files="TwoA.java" outjar="twoa.jar" options="-1.9"/>
-     <compile files="TwoB.java" outjar="twob.jar" options="-1.9"/>
-     <compile files="TwoX.java" inpath="twoa.jar;twob.jar" options="-1.9"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/binaryBridging" title="binary bridge methods - three">
-     <compile files="ThreeA.java" outjar="threea.jar" options="-1.9"/>
-     <compile files="ThreeB.java" outjar="threeb.jar" options="-1.9"/>
-     <compile files="ThreeX.java" inpath="threea.jar;threeb.jar" options="-1.9"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="abstract intertype methods and covariant returns">
-   	   <compile files="pr91381.aj" options="-1.9"/>
-       <run class="pr91381"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/bridgeMethods" title="abstract intertype methods and covariant returns - error">
-   	   <compile files="pr91381_2.aj">
-   	     <message kind="error" line="15" text="The return type is incompatible with A.foo()"/>
-   	   </compile>
-   </ajc-test>
-   
-
-   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="bridging with covariance 1 - normal">
-     <compile files="Bridging1.aj,Util.java" options="-1.9"/>
-     <run class="Bridging1">
-       <stderr>
-         <line text="Number of methods defined for D is 2"/>
-         <line text="C D.method1() [BridgeMethod]"/>
-         <line text="D D.method1()"/>
-       </stderr>
-     </run>
-   </ajc-test>  
-    
-   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="bridging with covariance 1 - itd">
-     <compile files="BridgingITD1.aj,Util.java" options="-1.9"/>
-     <run class="BridgingITD1">
-       <stderr>
-         <line text="Number of methods defined for D is 2"/>
-         <line text="C D.method1() [BridgeMethod]"/>
-         <line text="D D.method1()"/>
-       </stderr>
-     </run>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="basic bridging with type vars - 1 - normal">
-     <compile files="Bridging2.aj,Util.java" options="-1.9"/>
-     <run class="Bridging2"> 
-	     <stderr>
-	       <line text="Number of methods defined for D is 2"/>
-	       <line text="java.lang.Object D.next() [BridgeMethod]"/>
-	       <line text="java.lang.String D.next()"/>
-	     </stderr>
-     </run>
-   </ajc-test>
-   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="basic bridging with type vars - 1 - itd">
-     <compile files="BridgingITD2.aj,Util.java" options="-1.9"/>
-     <run class="BridgingITD2"> 
-	     <stderr>
-	       <line text="Number of methods defined for D is 2"/>
-	       <line text="java.lang.Object D.next() [BridgeMethod]"/>
-	       <line text="java.lang.String D.next()"/>
-	     </stderr>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="basic bridging with type vars - 2 - normal">
-     <compile files="Bridging3.aj,Util.java" options="-1.9"/>
-     <run class="Bridging3"> 
-	     <stderr>
-	       <line text="Number of methods defined for D is 2"/>
-	       <line text="java.lang.Object D.id(java.lang.Object) [BridgeMethod]"/>
-	       <line text="java.lang.String D.id(java.lang.String)"/>
-	     </stderr>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="basic bridging with type vars - 2 - itd">
-     <compile files="BridgingITD3.aj,Util.java" options="-1.9"/>
-     <run class="BridgingITD3"> 
-	     <stderr>
-	       <line text="Number of methods defined for D is 2"/>
-	       <line text="java.lang.Object D.id(java.lang.Object) [BridgeMethod]"/>
-	       <line text="java.lang.String D.id(java.lang.String)"/>
-	     </stderr>
-     </run>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="Abstract intertype method and covariant returns" pr="91381">
-     <compile files="pr91381.aj" options="-1.9,-showWeaveInfo">
-       <message kind="weave" text="Type 'A' (pr91381.aj) has intertyped method from 'pr91381' (pr91381.aj:'java.lang.Object A.foo()')"/>
-     </compile>
-     <run class="pr91381"/>
-   </ajc-test>
-   <!-- end of generics/itds and bridge methods -->
-   
-   
-   <!-- generics and  pointcuts -->
-
-   <ajc-test dir="java5/generics/pointcuts" title="handler pcd and generics / type vars">
-     <compile files="GenericInterface.java,HandlerPointcutTests.aj" options="-1.9">
-         <message kind="error" line="4" text="Syntax error on token"/>
-         <message kind="error" line="8" text="a parameterized type pattern may not be used in a handler pointcut expression"/>
-         <message kind="warning" line="8" text="no match for this type name: T"/>
-         <message kind="error" line="11" text="a parameterized type pattern may not be used in a handler pointcut expression"/>
-     </compile>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/pointcuts" title="pointcuts that dont allow type vars">
-     <compile files="PointcutsThatDontAllowTypeVars.aj" options="-1.9">
-         <message kind="error" line="3" text="Syntax error on token"/>
-         <message kind="error" line="5" text="Syntax error on token"/>
-         <message kind="error" line="7" text="Syntax error on token"/>
-         <message kind="error" line="9" text="Syntax error on token"/>
-         <message kind="error" line="11" text="Syntax error on token"/>
-         <message kind="error" line="13" text="Syntax error on token"/>
-         <message kind="error" line="15" text="Syntax error on token"/>
-         <message kind="error" line="17" text="Syntax error on token"/>
-         <message kind="error" line="19" text="Syntax error on token"/>
-         <message kind="error" line="21" text="Syntax error on token"/>
-         <message kind="error" line="23" text="Syntax error on token"/>
-         <message kind="error" line="25" text="Syntax error on token"/>
-         <message kind="error" line="27" text="Syntax error on token"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/pointcuts" title="annotation pcds with parameterized types">
-     <compile files="ParameterizedTypesInAtPCDs.aj" options="-1.9">
-         <message kind="error" line="3" text="Syntax error on token"/>
-         <message kind="error" line="5" text="Syntax error on token"/>
-         <message kind="error" line="7" text="Syntax error on token"/>
-         <message kind="error" line="9" text="Syntax error on token"/>
-         <message kind="error" line="11" text="Syntax error on token"/>
-         <message kind="error" line="13" text="Syntax error on token"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/pointcuts" title="annotation patterns with parameterized types">
-     <compile files="ParameterizedTypesInAnnotationPatterns.aj" options="-1.9">
-         <message kind="error" line="5" text="is not an annotation type"/>
-     </compile>
-   </ajc-test>
-   
-    <ajc-test dir="java5/generics/pointcuts" title="staticinitialization and parameterized types">
-     <compile files="GenericInterface.java,GenericImplementingClass.java,StaticInitializationWithParameterizedTypes.aj" options="-1.9">
-         <message kind="error" line="4" text="no static initialization join points for parameterized types, use raw type instead"/>
-         <message kind="error" line="6" text="no static initialization join points for parameterized types, use raw type instead"/>
-         <message kind="error" line="9" text="no static initialization join points for parameterized types, use raw type instead"/>
-         <message kind="error" line="11" text="no static initialization join points for parameterized types, use raw type instead"/>
-         <message kind="error" line="14" text="no static initialization join points for parameterized types, use raw type instead"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/pointcuts" title="staticinitialization and parameterized type matching">
-     <compile files="GenericInterface.java,GenericImplementingClass.java,ConcreteImplementingClass.java,ConcreteExtendingClass.java,StaticInitializationWithParameterizedTypesMatching.aj" options="-1.9">
-         <message kind="warning" line="1" text="clinit(GenericInterface&lt;Double&gt;+)"/>
-         <message kind="warning" line="3" text="clinit(GenericInterface&lt;Double&gt;+)"/>
-         <message kind="warning" line="3" text="clinit(GenericImplementingClass&lt;Double&gt;+)"/>
-         <message kind="warning" line="15" text="Type java.lang.String does not meet the specification for type parameter 1 (N extends java.lang.Number) in generic type GenericInterface"/>
-         <message kind="warning" line="19" text="Type pattern does not match because the wrong number of type parameters are specified: Type GenericInterface requires 1 parameter(s)"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/pointcuts" title="staticinitialization with generic types">
-     <compile files="GenericInterface.java,GenericImplementingClass.java,StaticInitializationWithGenericTypes.aj" options="-1.9">
-         <message kind="warning" line="1" text="one generic param, correct bounds"/>
-         <message kind="warning" line="1" text="doesn't matter what type variable name you use"/>
-         <message kind="warning" line="1" text="works with classes too"/>
-         <message kind="warning" line="4" text="Type T does not meet the specification for type parameter 1 (N extends java.lang.Number) in generic type GenericInterface"/>
-         <message kind="warning" line="20" text="Type pattern does not match because the wrong number of type parameters are specified: Type GenericImplementingClass requires 1 parameter(s)"/>
-         <message kind="warning" line="24" text="Type N extends java.lang.Number &amp; java.lang.Comparable does not meet the specification for type parameter 1 (N extends java.lang.Number) in generic type GenericImplementingClass"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/pointcuts" title="staticinitialization with generic types - advanced">
-     <compile files="StaticInitializationWithGenericTypesAdvanced.aj" options="-1.9">
-         <message kind="warning" line="76" text="simple match"/>
-         <message kind="warning" line="76" text="matches since R and R extends Object are equivalent"/>
-         <message kind="warning" line="63" text="raw type should match"/>
-         <message kind="warning" line="63" text="matches all bounds"/>
-         <message kind="warning" line="63" text="still matches with interfaces specified in a different order"/>
-         <message kind="warning" line="69" text="matches with type variable inter-dependencies"/>
-         <message kind="warning" line="76" text="matches any generic type with one unbound type var"/>
-         <message kind="warning" line="82" text="any generic type with one type var bound to Number or subtype"/>
-         <message kind="warning" line="63" text="matches a generic type with any upper bound and i/f bounds"/>
-         <message kind="warning" line="76" text="matches a generic type with any upper bound and i/f bounds"/>
-         <message kind="warning" line="82" text="matches a generic type with any upper bound and i/f bounds"/>
-         <message kind="warning" line="19" text="Type X does not meet the specification for type parameter 1 (T extends java.lang.Number &amp; java.lang.Comparable &amp; java.io.Serializable) in generic type ClassWithInterfaceBounds"/>
-         <message kind="warning" line="23" text="Type Y extends java.lang.Number does not meet the specification for type parameter 1 (T extends java.lang.Number &amp; java.lang.Comparable &amp; java.io.Serializable) in generic type ClassWithInterfaceBounds"/>
-         <message kind="warning" line="27" text="Type Z extends java.lang.Number &amp; java.lang.Comparable does not meet the specification for type parameter 1 (T extends java.lang.Number &amp; java.lang.Comparable &amp; java.io.Serializable) in generic type ClassWithInterfaceBounds"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/pointcuts" title="within pcd with various parameterizations and generic types - errors">
-     <compile files="WithinPointcutMatching.aj" options="-1.9">
-         <message kind="warning" line="4" text="no match for this type name: T"/>
-         <message kind="error" line="4" text="parameterized type pattern not supported by 'within', use a raw type pattern instead"/>
-         <message kind="error" line="5" text="parameterized type pattern not supported by 'within', use a raw type pattern instead"/>
-         <message kind="error" line="6" text="parameterized type pattern not supported by 'within', use a raw type pattern instead"/>
-      </compile>
-   </ajc-test>
-
-  <ajc-test dir="java5/generics/pointcuts" title="within pcd with various parameterizations and generic types - warnings">
-     <compile files="WithinPointcutMatchingWarnings.aj" options="-1.9">
-         <message kind="warning" line="16" text="matched set correctly"/>
-         <message kind="warning" line="18" text="matched execution correctly"/>
-         <message kind="warning" line="24" text="init matched correctly"/>
-         <message kind="warning" line="32" text="matched parameterization ok"/>
-      </compile>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/pointcuts" title="this and target with various parameterizations and generic types - errors">
-     <compile files="ThisAndTargetPointcutMatching.aj" options="-1.9">
-         <message kind="warning" line="4" text="no match for this type name: T"/>
-         <message kind="warning" line="5" text="no match for this type name: T"/>
-         <message kind="error" line="4" text="parameterized types not supported for this and target pointcuts (erasure limitation)"/>
-         <message kind="error" line="5" text="parameterized types not supported for this and target pointcuts (erasure limitation)"/>
-         <message kind="error" line="6" text="parameterized types not supported for this and target pointcuts (erasure limitation)"/>
-         <message kind="error" line="7" text="parameterized types not supported for this and target pointcuts (erasure limitation)"/>
-      </compile>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/pointcuts" title="this and target with various parameterizations and generic types - runtime">
-     <compile files="ThisAndTargetPointcutMatchingRuntime.aj" options="-1.9">
-      </compile>
-      <run class="ThisAndTargetPointcutMatchingRuntime">
-          <stdout>
-              <line text="set and this matched ok"/>
-              <line text="set and target matched ok"/>
-              <line text="call and target matched ok"/>
-              <line text="execution and this matched ok"/>
-              <line text="execution and target matched ok"/>
-              <line text="parameterized call and target matched ok"/>
-              <line text="parameterized call and this matched ok"/>
-              <line text="parameterized call and target matched ok"/>
-          </stdout>
-      </run>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/pointcuts" title="get and set with various parameterizations and generic types - errors">
-     <compile files="GetAndSetPointcutMatching.aj" options="-1.9">
-         <message kind="warning" line="4" text="no match for this type name: T"/>
-         <message kind="warning" line="5" text="no match for this type name: T"/>
-         <message kind="error" line="4" text="can't use parameterized type patterns for the declaring type of a get or set pointcut expression (use the raw type instead)"/>
-         <message kind="error" line="5" text="can't use parameterized type patterns for the declaring type of a get or set pointcut expression (use the raw type instead)"/>
-         <message kind="error" line="6" text="can't use parameterized type patterns for the declaring type of a get or set pointcut expression (use the raw type instead)"/>
-         <message kind="error" line="7" text="can't use parameterized type patterns for the declaring type of a get or set pointcut expression (use the raw type instead)"/>
-         <message kind="error" line="8" text="can't use parameterized type patterns for the declaring type of a get or set pointcut expression (use the raw type instead)"/>
-      </compile>
-   </ajc-test>
-
-  <ajc-test dir="java5/generics/pointcuts" title="get and set with various parameterizations and generic declaring types">
-     <compile files="GetAndSetPointcutMatchingDeclaringType.aj" options="-1.9">
-         <message kind="warning" line="15" text="generic/param get matching ok"/>
-         <message kind="warning" line="33" text="generic/param get matching ok"/>
-         <message kind="warning" line="12" text="generic/param set matching ok"/>
-         <message kind="warning" line="32" text="generic/param set matching ok"/>
-      </compile>
-   </ajc-test>
-
-  <ajc-test dir="java5/generics/pointcuts" title="get and set with various parameterizations and generic field types">
-     <compile files="GetAndSetPointcutMatchingFieldType.aj" options="-1.9">
-         <message kind="warning" line="13" text="raw field type matching in get ok"/>
-         <message kind="warning" line="14" text="raw field type matching in set ok"/>
-         <message kind="warning" line="49" text="erasure matching in get ok"/>
-         <message kind="warning" line="45" text="erasure matching in set ok"/>
-         <message kind="warning" line="53" text="erasure matching in get with params ok"/>
-         <message kind="warning" line="46" text="erasure matching in set with params ok"/>
-         <message kind="warning" line="72" text="parameterized type matching in set ok"/>
-         <message kind="warning" line="73" text="parameterized type matching in get ok"/>
-         <message kind="warning" line="74" text="parameterized type matching in set ok x2"/>
-         <message kind="warning" line="75" text="parameterized type matching in get ok x2"/>
-         <message kind="warning" line="83" text="wildcard set matching ok"/>
-         <message kind="warning" line="84" text="wildcard get matching ok"/>
-         <message kind="warning" line="85" text="wildcard extends set matching ok"/>
-         <message kind="warning" line="86" text="wildcard extends get matching ok"/>
-         <message kind="warning" line="87" text="wildcard super set matching ok"/>
-         <message kind="warning" line="88" text="wildcard super get matching ok"/>
-         <message kind="warning" line="73" text="the really wild show"/>
-         <message kind="warning" line="84" text="the really wild show"/>
-         <message kind="warning" line="86" text="the really wild show"/>
-         <message kind="warning" line="88" text="the really wild show"/>
-         <message kind="warning" line="53" text="the really wild show"/>
-      </compile>
-   </ajc-test>
-
-  <ajc-test dir="java5/generics/pointcuts" title="init and preinit with parameterized declaring types">
-     <compile files="InitializationPointcutMatching.aj" options="-1.9">
-         <message kind="warning" line="4" text="no match for this type name: T"/>
-         <message kind="warning" line="5" text="no match for this type name: T"/>
-         <message kind="error" line="4" text="no [pre]initialization join points for parameterized types, use raw type instead"/>
-         <message kind="error" line="5" text="no [pre]initialization join points for parameterized types, use raw type instead"/>
-         <message kind="error" line="6" text="no [pre]initialization join points for parameterized types, use raw type instead"/>
-         <message kind="error" line="7" text="no [pre]initialization join points for parameterized types, use raw type instead"/>
-         <message kind="error" line="8" text="no [pre]initialization join points for parameterized types, use raw type instead"/>
-         <message kind="error" line="9" text="invalid throws pattern: a generic class may not be a direct or indirect subclass of Throwable"/>
-      </compile>
-   </ajc-test>
-                     
-    <ajc-test dir="java5/generics/pointcuts" title="init and preinit with raw declaring type pattern">
-     <compile files="InitializationPointcutMatchingDeclaringType.aj" options="-1.9">
-         <message kind="warning" line="10" text="generic/param init matching ok"/>
-         <message kind="warning" line="10" text="generic/param preinit matching ok"/>
-      </compile>
-   </ajc-test>                     
-
-   <ajc-test dir="java5/generics/pointcuts" title="init and preinit with parameterized parameter types">
-     <compile files="InitializationPointcutMatchingParamTypes.aj" options="-1.9">
-         <message kind="warning" line="36" text="raw param type matching in init ok"/>
-         <message kind="warning" line="36" text="raw param type matching in preinit ok"/>
-         <message kind="warning" line="37" text="erasure matching in init ok"/>
-         <message kind="warning" line="37" text="erasure matching in preinit ok"/>
-         <message kind="warning" line="38" text="erasure matching in init with params ok"/>
-         <message kind="warning" line="38" text="erasure matching in preinit with params ok"/>
-         <message kind="warning" line="48" text="parameterized type matching in init ok"/>
-         <message kind="warning" line="48" text="parameterized type matching in preinit ok"/>
-         <message kind="warning" line="49" text="parameterized type matching in init ok x2"/>
-         <message kind="warning" line="49" text="parameterized type matching in preinit ok x2"/>
-         <message kind="warning" line="50" text="wildcard init matching ok"/>
-         <message kind="warning" line="50" text="wildcard preinit matching ok"/>
-         <message kind="warning" line="51" text="wildcard extends init matching ok"/>
-         <message kind="warning" line="51" text="wildcard extends preinit matching ok"/>
-         <message kind="warning" line="52" text="wildcard super init matching ok"/>
-         <message kind="warning" line="52" text="wildcard super preinit matching ok"/>
-         <message kind="warning" line="48" text="the really wild show"/>
-         <message kind="warning" line="50" text="the really wild show"/>
-         <message kind="warning" line="51" text="the really wild show"/>
-         <message kind="warning" line="52" text="the really wild show"/>
-      </compile>
-   </ajc-test>      
-
- <ajc-test dir="java5/generics/pointcuts" title="withincode with various parameterizations and generic types - errors">
-     <compile files="WithincodePointcutMatching.aj" options="-1.9">
-         <message kind="warning" line="4" text="no match for this type name: T"/>
-         <message kind="error" line="4" text="can't use parameterized type patterns for the declaring type of a withincode pointcut expression (use the raw type instead)"/>
-         <message kind="error" line="5" text="can't use parameterized type patterns for the declaring type of a withincode pointcut expression (use the raw type instead)"/>
-         <message kind="error" line="6" text="invalid throws pattern: a generic class may not be a direct or indirect subclass of Throwable"/>
-      </compile>
-   </ajc-test>
-
-    <ajc-test dir="java5/generics/pointcuts" title="withincode with various parameterizations and generic types - matching">
-     <compile files="WithinCodePointcutMatchingParamAndReturnTypes.aj" options="-1.9">
-        <message kind="warning" line="35" text="raw param type matching in withincode ok"/>
-        <message kind="warning" line="36" text="raw param type matching in withincode ok"/>
-        <message kind="warning" line="67" text="raw return type matching in withincode ok"/>
-        <message kind="warning" line="38" text="erasure type matching in withincode ok"/>
-        <message kind="warning" line="39" text="erasure type matching in withincode ok"/>
-        <message kind="warning" line="42" text="erasure type matching in withincode ok"/>
-        <message kind="warning" line="62" text="withincode and parameterized method ok"/>
-        <message kind="warning" line="62" text="withincode and generic interface ok"/>
-        <message kind="warning" line="65" text="withincode and interface control test"/>
-        <message kind="warning" line="35" text="match on parameterized args"/>
-        <message kind="warning" line="36" text="match on parameterized args"/>
-        <message kind="warning" line="67" text="match on parameterized return type"/>
-      </compile>
-   </ajc-test>
-
-    <ajc-test dir="java5/generics/pointcuts" title="withincode with overriding of inherited generic members">
-     <compile files="WithinCodeOverriding.aj" options="-1.9">
-        <message kind="warning" line="37" text="wildcard declaring type match on erasure"/>
-        <message kind="warning" line="50" text="wildcard declaring type match on erasure"/>
-        <message kind="warning" line="63" text="wildcard declaring type match on erasure"/>
-        <message kind="warning" line="37" text="base declaring type match on erasure"/>
-        <message kind="warning" line="50" text="base declaring type match on erasure"/>
-        <message kind="warning" line="63" text="base declaring type match on erasure"/>
-        <message kind="warning" line="50" text="sub type match on erasure"/>
-        <message kind="warning" line="63" text="parameterized match on erasure"/>
-        <message kind="warning" line="80" text="erasure match on base interface"/>
-        <message kind="warning" line="80" text="wildcard match on erasure"/>
-        <message kind="warning" line="80" text="parameterized match"/>
-     </compile>
-    </ajc-test>
-                                                                           
-   <ajc-test dir="java5/generics/pointcuts" title="execution pcd with raw type matching">
-     <compile files="GenericInterface.java,ConcreteImplementingClass.java,GenericImplementingClass.java,RawTypeMatching.aj" options="-1.9">
-         <message kind="warning" line="4" text="execution(* GenericInterface.*(..))"/>
-         <message kind="warning" line="5" text="execution(* GenericInterface.*(..))"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/pointcuts" title="execution pcd with raw signature matching">
-     <compile files="GenericInterface.java,ConcreteImplementingClass.java,GenericImplementingClass.java,RawSignatureMatching.aj" options="-1.9">
-         <message kind="warning" line="4" text="execution(* GenericInterface.asInt(Number))"/>
-         <message kind="warning" line="5" text="execution(* GenericInterface.asInt(Number))"/>
-     </compile>
-   </ajc-test>
-
-  <ajc-test dir="java5/generics/pointcuts" title="execution with various parameterizations and generic types - errors">
-     <compile files="ExecutionPointcutMatchingErrorCases.aj" options="-1.9">
-         <message kind="warning" line="4" text="no match for this type name: T"/>
-         <message kind="error" line="4" text="can't use parameterized type patterns for the declaring type of an execution pointcut expression (use the raw type instead)"/>
-         <message kind="error" line="5" text="can't use parameterized type patterns for the declaring type of an execution pointcut expression (use the raw type instead)"/>
-         <message kind="error" line="6" text="invalid throws pattern: a generic class may not be a direct or indirect subclass of Throwable"/>
-      </compile>
-   </ajc-test>
-
-    <ajc-test dir="java5/generics/pointcuts" title="execution with various parameterizations and generic types - matching">
-     <compile files="ExecutionPointcutMatchingParamAndReturnTypes.aj" options="-1.9">
-        <message kind="warning" line="35" text="raw param type matching in execution ok"/>
-        <message kind="warning" line="67" text="raw return type matching in execution ok"/>
-        <message kind="warning" line="38" text="erasure type matching in execution ok"/>
-        <message kind="warning" line="42" text="erasure type matching in execution ok"/>
-        <message kind="warning" line="61" text="execution and parameterized method ok"/>
-        <message kind="warning" line="61" text="execution and generic interface ok"/>
-        <message kind="warning" line="65" text="execution and interface control test"/>
-        <message kind="warning" line="35" text="match on parameterized args"/>
-        <message kind="warning" line="67" text="match on parameterized return type"/>
-      </compile>
-   </ajc-test>
-
-    <ajc-test dir="java5/generics/pointcuts" title="execution with overriding of inherited generic members">
-     <compile files="ExecutionOverriding.aj" options="-1.9">
-        <message kind="warning" line="36" text="wildcard declaring type match on erasure"/>
-        <message kind="warning" line="49" text="wildcard declaring type match on erasure"/>
-        <message kind="warning" line="62" text="wildcard declaring type match on erasure"/>
-        <message kind="warning" line="36" text="base declaring type match on erasure"/>
-        <message kind="warning" line="49" text="base declaring type match on erasure"/>
-        <message kind="warning" line="62" text="base declaring type match on erasure"/>
-        <message kind="warning" line="49" text="sub type match on erasure"/>
-        <message kind="warning" line="62" text="parameterized match on erasure"/>
-        <message kind="warning" line="79" text="erasure match on base interface"/>
-        <message kind="warning" line="79" text="wildcard match on erasure"/>
-        <message kind="warning" line="79" text="parameterized match"/>
-     </compile>
-    </ajc-test>
-
-   <ajc-test dir="java5/generics/pointcuts" title="execution pcd with generic declaring type and erased parameter types">
-     <compile files="GenericInterface.java,ConcreteImplementingClass.java,GenericImplementingClass.java,GenericDeclaringTypeWithParameterErasure.aj" options="-1.9">
-     </compile>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/pointcuts" title="execution pcd with generic signature matching">
-     <compile files="GenericInterface.java,ConcreteImplementingClass.java,GenericImplementingClass.java,GenericSignatureMatching.aj" options="-1.9">
-         <message kind="warning" line="4" text="execution&lt;T&gt;(* GenericInterface&lt;T extends Number&gt;.asInt(T))"/>
-         <message kind="warning" line="5" text="execution&lt;T&gt;(* GenericInterface&lt;T extends Number&gt;.asInt(T))"/>
-     </compile>
-   </ajc-test>
- 
-  <ajc-test dir="java5/generics/pointcuts" title="call with various parameterizations and generic types - errors">
-     <compile files="CallPointcutMatchingErrorCases.aj" options="-1.9">
-         <message kind="warning" line="4" text="no match for this type name: T"/>
-         <message kind="error" line="4" text="can't use parameterized type patterns for the declaring type of a call pointcut expression (use the raw type instead)"/>
-         <message kind="error" line="5" text="can't use parameterized type patterns for the declaring type of a call pointcut expression (use the raw type instead)"/>
-         <message kind="error" line="6" text="invalid throws pattern: a generic class may not be a direct or indirect subclass of Throwable"/>
-      </compile>
-   </ajc-test>
- 
-    <ajc-test dir="java5/generics/pointcuts" title="call with various parameterizations and generic types - matching">
-     <compile files="CallPointcutMatchingParamAndReturnTypes.aj" options="-1.9">
-        <message kind="warning" line="7" text="raw param type matching in call ok"/>
-        <message kind="warning" line="8" text="raw return type matching in call ok"/>
-        <message kind="warning" line="9" text="erasure type matching in call ok"/>
-        <message kind="warning" line="10" text="erasure type matching in call ok"/>
-        <message kind="warning" line="11" text="call and parameterized method ok"/>
-        <message kind="warning" line="11" text="call and generic interface ok"/>
-        <message kind="warning" line="12" text="call and interface control test"/>
-        <message kind="warning" line="7" text="match on parameterized args"/>
-        <message kind="warning" line="8" text="match on parameterized return type"/>
-      </compile>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/pointcuts" title="call with overriding of inherited generic members">
-     <compile files="CallOverriding.aj" options="-1.9">
-        <message kind="warning" line="8" text="wildcard declaring type match on erasure"/>
-        <message kind="warning" line="9" text="wildcard declaring type match on erasure"/>
-        <message kind="warning" line="10" text="wildcard declaring type match on erasure"/>
-        <message kind="warning" line="8" text="base declaring type match on erasure"/>
-        <message kind="warning" line="9" text="base declaring type match on erasure"/>
-        <message kind="warning" line="10" text="base declaring type match on erasure"/>
-        <message kind="warning" line="9" text="sub type match on erasure"/>
-        <message kind="warning" line="10" text="parameterized match on erasure"/>
-        <message kind="warning" line="87" text="erasure match on base interface"/>
-        <message kind="warning" line="87" text="wildcard match on erasure"/>
-        <message kind="warning" line="87" text="parameterized match"/>
-     </compile>
-    </ajc-test>
-    
-   <ajc-test dir="java5/generics/pointcuts" title="call with bridge methods">
-     <compile files="CallWithBridgeMethods.aj" options="-1.9">
-     <!-- see testcode
-         <message kind="warning" line="23" text="should match call to bridge method on L23, this is a real call!"/>
-         -->
-     </compile>
-   </ajc-test>
-    
-    
-   <ajc-test dir="java5/generics/pointcuts" title="args with raw type and generic / parameterized sigs">
-     <compile files="RawArgs.aj" options="-1.9">
-     </compile>
-     <run class="RawArgs">
-         <stdout>
-             <line text="args(List) match at call(void Generic.foo(List))"/>
-             <line text="args(List) match at call(void Generic.bar(List))"/>
-             <line text="args(List) match at call(void Generic.tada(List))"/>
-             <line text="args(List) match at call(void Generic.tada(List))"/>
-             <line text="args(List) match at call(void Generic.tada(List))"/>
-         </stdout>
-     </run>
-   </ajc-test>
-
-  <ajc-test dir="java5/generics/pointcuts" title="args with parameterized type and generic / parameterized sigs">
-     <compile files="ArgsParameterized.aj" options="-1.9">
-        <message kind="warning" line="28" text="unchecked match of List&lt;String&gt; with List"/>
-     </compile>
-     <run class="ArgsParameterized">
-         <stdout>
-            <line text="args(List&lt;String&gt; matched at call(void Generic.foo(List))"/>
-            <line text="args(List&lt;String&gt; matched at call(void Generic.bar(List))"/>
-            <line text="args(List&lt;String&gt; matched at call(void Generic.tada(List))"/>
-            <line text="args(List&lt;String&gt; matched at call(void Generic.something(List))"/>
-            <line text="args(List&lt;String&gt; matched at call(void MustBeString.listit(List))"/>
-         </stdout>
-     </run>
-   </ajc-test>
-
-  <ajc-test dir="java5/generics/pointcuts" title="args with parameterized type and wildcards">
-     <compile files="ArgsParameterizedWithWildcards.aj" options="-1.9">
-        <message kind="warning" line="10" text="unchecked match of List&lt;Double&gt; with List when argument is an instance of List"/>
-        <message kind="warning" line="10" text="unchecked match of List&lt;Double&gt; with List&lt;? extends Double&gt; when argument is an instance of List"/>
-        <message kind="warning" line="10" text="unchecked match of List&lt;Double&gt; with List&lt;? extends Number&gt; when argument is an instance of List"/>
-        <message kind="warning" line="10" text="unchecked match of List&lt;Double&gt; with List&lt;?&gt; when argument is an instance of List"/>
-     </compile>
-     <run class="ArgsParameterizedWithWildcards">
-         <stdout>
-            <line text="List&lt;Double&gt; matched at execution(void C.rawList(List))"/>
-            <line text="List&lt;Double&gt; matched at execution(void C.listOfSomething(List))"/>
-            <line text="List&lt;Double&gt; matched at execution(void C.listOfSomeNumber(List))"/>
-            <line text="List&lt;Double&gt; matched at execution(void C.listOfDouble(List))"/>
-            <line text="List&lt;Double&gt; matched at execution(void C.listOfSomeDouble(List))"/>
-         </stdout>
-     </run>
-   </ajc-test>
-
-  <ajc-test dir="java5/generics/pointcuts" title="args with generic wildcard">
-     <compile files="ArgsListOfSomething.aj" options="-1.9 -Xlint:ignore">
-     </compile>
-     <run class="ArgsListOfSomething">
-         <stdout>
-            <line text="List&lt;?&gt; matches execution(void ArgsListOfSomething.rawList(List))"/>
-            <line text="List&lt;?&gt; matches execution(void ArgsListOfSomething.listOfString(List))"/>
-            <line text="List&lt;?&gt; matches execution(void ArgsListOfSomething.listOfSomething(List))"/>
-            <line text="List&lt;?&gt; matches execution(void ArgsListOfSomething.listOfSomethingExtends(List))"/>
-            <line text="List&lt;?&gt; matches execution(void ArgsListOfSomething.listOfSomethingSuper(List))"/>
-            <line text="wild map matches execution(void ArgsListOfSomething.mapit(Map))"/>
-            <line text="exact wild map matches execution(void ArgsListOfSomething.mapit(Map))"/>
-            <line text="super type exact matches execution(void ArgsListOfSomething.setOf(HashSet))"/>
-            <line text="super wild type matches execution(void ArgsListOfSomething.setOf(HashSet))"/>
-         </stdout>
-     </run>
-   </ajc-test>
-
-  <ajc-test dir="java5/generics/pointcuts" title="args with generic wildcard extends">
-     <compile files="ArgsListOfSomethingExtends.aj" options="-1.9">
-         <message kind="warning" line="27" text="unchecked match of List&lt;? extends Number&gt; with List"/>
-         <message kind="warning" line="27" text="unchecked match of List&lt;? extends Number&gt; with List&lt;?&gt;"/>
-     </compile>
-     <run class="ArgsListOfSomethingExtends">
-         <stdout>
-            <line text="List&lt;? extends Number&gt; matches execution(void ArgsListOfSomethingExtends.rawList(List))"/>
-            <line text="List&lt;? extends Number&gt; matches execution(void ArgsListOfSomethingExtends.listOfNumber(List))"/>
-            <line text="List&lt;? extends Number&gt; matches execution(void ArgsListOfSomethingExtends.listOfDouble(List))"/>
-            <line text="List&lt;? extends Number&gt; matches execution(void ArgsListOfSomethingExtends.listOfSomething(List))"/>
-            <line text="List&lt;? extends Number&gt; matches execution(void ArgsListOfSomethingExtends.listOfSomethingExtends(List))"/>
-         </stdout>
-     </run>
-   </ajc-test>
-   
-  <ajc-test dir="java5/generics/pointcuts" title="args with generic wildcard super">
-     <compile files="ArgsListOfSomethingSuper.aj" options="-1.9">
-         <message kind="warning" line="32" text="unchecked match of List&lt;? super Number&gt; with List"/>
-         <message kind="warning" line="32" text="unchecked match of List&lt;? super Number&gt; with List&lt;?&gt;"/>
-         <message kind="warning" line="32" text="unchecked match of List&lt;? super Number&gt; with List&lt;? extends Number&gt;"/>
-     </compile>
-     <run class="ArgsListOfSomethingSuper">
-         <stdout>
-            <line text="List&lt;? super Number&gt; matches execution(void ArgsListOfSomethingSuper.rawList(List))"/>
-            <line text="List&lt;? super Number&gt; matches execution(void ArgsListOfSomethingSuper.listOfObject(List))"/>
-            <line text="List&lt;? super Number&gt; matches execution(void ArgsListOfSomethingSuper.listOfNumber(List))"/>
-            <line text="List&lt;? super Number&gt; matches execution(void ArgsListOfSomethingSuper.listOfSomething(List))"/>
-            <line text="List&lt;? super Number&gt; matches execution(void ArgsListOfSomethingSuper.listOfSomethingSuper(List))"/>
-            <line text="List&lt;? super Number&gt; matches execution(void ArgsListOfSomethingSuper.listOfSomethingExtendsNumber(List))"/>
-          </stdout>
-     </run>
-   </ajc-test>
-      
-   <ajc-test dir="java5/generics/pointcuts" title="generic method matching">
-     <compile files="GenericMethods.aj" options="-1.9">
-         <message kind="warning" line="19" text="static generic method match"/>
-         <message kind="warning" line="34" text="static generic method match"/>
-         <message kind="warning" line="24" text="instance generic method match"/>         
-         <message kind="warning" line="39" text="instance generic method match"/>         
-     </compile>
-   </ajc-test>
-    
-   <ajc-test dir="java5/generics/pointcuts" title="generic wildcards in signature matching">
-     <compile files="GenericWildcardsInSignatureMatching.aj" options="-1.9">
-         <message kind="warning" line="5" text="set of a list"/>
-         <message kind="warning" line="7" text="exact nested wildcard match"/>
-         <message kind="warning" line="7" text="wildcard nested wildcard match"/>
-         <message kind="warning" line="11" text="super"/>
-         <message kind="warning" line="15" text="super wild match"/>
-     </compile>
-   </ajc-test>
-    
-   <!-- end of generics and pointcuts tests -->
-
-    <ajc-test dir="java5/generics/afterAdvice" title="after throwing with parameterized throw type">
-        <compile files="AfterThrowing.aj" options="-1.9">
-            <message kind="error" line="6" text="cannot convert from List&lt;String&gt; to Throwable"/>
-        </compile>
-    </ajc-test>
-
-
-   <ajc-test dir="java5/generics/afterAdvice" title="after returning with raw type and generic / parameterized sigs">
-     <compile files="AfterReturningRawType.aj" options="-1.9">
-     </compile>
-     <run class="AfterReturningRawType">
-         <stdout>
-             <line text="returning(List) match at call(List Generic.foo(List))"/>
-             <line text="returning(List) match at call(List Generic.bar(List))"/>
-             <line text="returning(List) match at call(List Generic.tada(List))"/>
-             <line text="returning(List) match at call(List Generic.tada(List))"/>
-             <line text="returning(List) match at call(List Generic.tada(List))"/>
-         </stdout>
-     </run>
-   </ajc-test>
-
- <ajc-test dir="java5/generics/afterAdvice" title="after returning with parameterized type and generic / parameterized sigs">
-     <compile files="AfterReturningParameterized.aj" options="-1.9">
-        <message kind="warning" line="28" text="unchecked match of List&lt;String&gt; with List"/>
-     </compile>
-     <run class="AfterReturningParameterized">
-         <stdout>
-            <line text="returning(List&lt;String&gt; matched at call(List Generic.foo(List))"/>
-            <line text="returning(List&lt;String&gt; matched at call(List Generic.bar(List))"/>
-            <line text="returning(List&lt;String&gt; matched at call(List Generic.tada(List))"/>
-            <line text="returning(List&lt;String&gt; matched at call(List Generic.something(List))"/>
-            <line text="returning(List&lt;String&gt; matched at call(List MustBeString.listit(List))"/>
-         </stdout>
-     </run>
-   </ajc-test>   
-   
-   <ajc-test dir="java5/generics/afterAdvice" title="after returning with parameterized type and wildcards">
-     <compile files="AfterReturningParameterizedWithWildcards.aj" options="-1.9">
-        <message kind="warning" line="10" text="unchecked match of List&lt;Double&gt; with List when argument is an instance of List"/>
-        <message kind="warning" line="10" text="unchecked match of List&lt;Double&gt; with List&lt;? extends Double&gt; when argument is an instance of List"/>
-        <message kind="warning" line="10" text="unchecked match of List&lt;Double&gt; with List&lt;? extends Number&gt; when argument is an instance of List"/>
-        <message kind="warning" line="10" text="unchecked match of List&lt;Double&gt; with List&lt;?&gt; when argument is an instance of List"/>
-     </compile>
-     <run class="AfterReturningParameterizedWithWildcards">
-         <stdout>
-            <line text="List&lt;Double&gt; matched at call(List C.rawList(List))"/>
-            <line text="List&lt;Double&gt; matched at call(List C.listOfSomething(List))"/>
-            <line text="List&lt;Double&gt; matched at call(List C.listOfSomeNumber(List))"/>
-            <line text="List&lt;Double&gt; matched at call(List C.listOfDouble(List))"/>
-            <line text="List&lt;Double&gt; matched at call(List C.listOfSomeDouble(List))"/>
-         </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/afterAdvice" title="after returning with generic wildcard">
-     <compile files="AfterReturningListOfSomething.aj" options="-1.9">
-       <!-- warning is unchecked match of List<?> from line 28 onto line 15. -->
-       <!-- some sets may be lists unless the set is final, so as a cast is allowed, the match is allowed -->
-       <message kind="warning" line="28"/>
-       <message kind="warning" line="44"/>
-       <message kind="warning" line="48"/>
-     </compile>
-     <run class="AfterReturningListOfSomething">
-         <stdout>
-            <line text="List&lt;?&gt; matches execution(List AfterReturningListOfSomething.rawList(List))"/>
-            <line text="List&lt;?&gt; matches execution(List AfterReturningListOfSomething.listOfString(List))"/>
-            <line text="List&lt;?&gt; matches execution(List AfterReturningListOfSomething.listOfSomething(List))"/>
-            <line text="List&lt;?&gt; matches execution(List AfterReturningListOfSomething.listOfSomethingExtends(List))"/>
-            <line text="List&lt;?&gt; matches execution(List AfterReturningListOfSomething.listOfSomethingSuper(List))"/>
-            <line text="wild map matches execution(Map AfterReturningListOfSomething.mapit(Map))"/>
-            <line text="exact wild map matches execution(Map AfterReturningListOfSomething.mapit(Map))"/>
-            <line text="super type exact matches execution(HashSet AfterReturningListOfSomething.setOf(HashSet))"/>
-            <line text="super wild type matches execution(HashSet AfterReturningListOfSomething.setOf(HashSet))"/>
-         </stdout>
-     </run>
-   </ajc-test>   
-
-   <ajc-test dir="java5/generics/afterAdvice" title="after returning with generic wildcard extends">
-     <compile files="AfterReturningListOfSomethingExtends.aj" options="-1.9">
-         <message kind="warning" line="27" text="unchecked match of List&lt;? extends Number&gt; with List"/>
-         <message kind="warning" line="27" text="unchecked match of List&lt;? extends Number&gt; with List&lt;?&gt;"/>
-     </compile>
-     <run class="AfterReturningListOfSomethingExtends">
-         <stdout>
-            <line text="List&lt;? extends Number&gt; matches execution(List AfterReturningListOfSomethingExtends.rawList(List))"/>
-            <line text="List&lt;? extends Number&gt; matches execution(List AfterReturningListOfSomethingExtends.listOfNumber(List))"/>
-            <line text="List&lt;? extends Number&gt; matches execution(List AfterReturningListOfSomethingExtends.listOfDouble(List))"/>
-            <line text="List&lt;? extends Number&gt; matches execution(List AfterReturningListOfSomethingExtends.listOfSomething(List))"/>
-            <line text="List&lt;? extends Number&gt; matches execution(List AfterReturningListOfSomethingExtends.listOfSomethingExtends(List))"/>
-         </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/afterAdvice" title="after returning with generic wildcard super">
-     <compile files="AfterReturningListOfSomethingSuper.aj" options="-1.9">
-         <message kind="warning" line="32" text="unchecked match of List&lt;? super Number&gt; with List"/>
-         <message kind="warning" line="32" text="unchecked match of List&lt;? super Number&gt; with List&lt;?&gt;"/>
-         <message kind="warning" line="32" text="unchecked match of List&lt;? super Number&gt; with List&lt;? extends Number&gt;"/>
-     </compile>
-     <run class="AfterReturningListOfSomethingSuper">
-         <stdout>
-            <line text="List&lt;? super Number&gt; matches execution(List AfterReturningListOfSomethingSuper.rawList(List))"/>
-            <line text="List&lt;? super Number&gt; matches execution(List AfterReturningListOfSomethingSuper.listOfObject(List))"/>
-            <line text="List&lt;? super Number&gt; matches execution(List AfterReturningListOfSomethingSuper.listOfNumber(List))"/>
-            <line text="List&lt;? super Number&gt; matches execution(List AfterReturningListOfSomethingSuper.listOfSomething(List))"/>
-            <line text="List&lt;? super Number&gt; matches execution(List AfterReturningListOfSomethingSuper.listOfSomethingSuper(List))"/>
-            <line text="List&lt;? super Number&gt; matches execution(List AfterReturningListOfSomethingSuper.listOfSomethingExtendsNumber(List))"/>
-          </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test title="ajdk notebook: erasure matching examples" dir="java5/generics/ajdk">
-       <compile files="ErasureMatching.aj" options="-1.9">
-           <message kind="warning" line="18" text="static generic method match"/>
-           <message kind="warning" line="21" text="instance generic method match"/>
-           <message kind="warning" line="31" text="method in generic type match"/>
-           <message kind="warning" line="28" text="field in generic type match"/>
-       </compile>
-   </ajc-test>
-   
-   <ajc-test title="ajdk notebook: simple parameterized type matching examples" dir="java5/generics/ajdk">
-       <compile files="SimpleParameterizedTypeExamples.aj" options="-1.9">
-           <message kind="warning" line="34" text="get myStrings 1"/>           
-           <message kind="warning" line="34" text="get myStrings 2"/>           
-           <message kind="warning" line="38" text="get myStrings 1"/>           
-           <message kind="warning" line="38" text="get myStrings 2"/>           
-           <message kind="warning" line="35" text="get myFloats 1"/>           
-           <message kind="warning" line="35" text="get myFloats 2"/>           
-           <message kind="warning" line="35" text="get myFloats 3"/>           
-           <message kind="warning" line="34" text="getter 1"/>           
-           <message kind="warning" line="35" text="getter 1"/>           
-           <message kind="warning" line="34" text="getter 2"/>           
-           <message kind="warning" line="35" text="getter 2"/>           
-           <message kind="warning" line="34" text="getter 3"/>           
-           <message kind="warning" line="35" text="getter 4"/>           
-           <message kind="warning" line="25" text="call 1"/>           
-           <message kind="warning" line="25" text="call 2"/>           
-        </compile>
-   </ajc-test>
-   
-   <ajc-test title="ajdk notebook: mixed parameterized types and generic methods" dir="java5/generics/ajdk">
-       <compile files="MixedParameterizedAndTypeVariables.aj" options="-1.9">
-           <message kind="warning" line="13" text="erasure match"/>
-           <message kind="warning" line="13" text="mixed match"/>
-           <message kind="warning" line="13" text="params only match"/>
-       </compile>
-   </ajc-test>
-
-   <ajc-test title="ajdk notebook: signature matching with generic wildcards" dir="java5/generics/ajdk">
-       <compile files="SignatureWildcards.aj" options="-1.9">
-           <message kind="warning" line="13" text="any list"/>
-           <message kind="warning" line="15" text="any list"/>
-           <message kind="warning" line="17" text="any list"/>
-           <message kind="warning" line="13" text="only foo"/>
-           <message kind="warning" line="15" text="some list"/>
-           <message kind="warning" line="13" text="any list with upper bound"/>
-           <message kind="warning" line="15" text="any list with upper bound"/>
-       </compile>
-   </ajc-test>
-
-   <ajc-test title="ajdk notebook: bridge method examples" dir="java5/generics/ajdk">
-       <compile files="BridgeMethodExamples.aj" options="-1.9">
-           <message kind="warning" line="17" text="double match"/>
-           <message kind="warning" line="25" text="double match"/>
-           <message kind="warning" line="9" text="match"/>
-           <message kind="warning" line="11" text="match"/>
-       </compile>
-   </ajc-test>
-   
-   <ajc-test title="ajdk notebook: args examples" dir="java5/generics/ajdk">
-       <compile files="ArgsExamples.aj" options="-1.9">
-           <message kind="warning" line="15" text="unchecked match of List&lt;Double&gt; with List&lt;? extends Number&gt; when argument is an instance of List at join point method-execution(void C.goo(List&lt;? extends Number&gt;)) [Xlint:uncheckedArgument]"/>
-           <message kind="warning" line="53" text="unchecked match"/>
-       </compile>
-       <run class="ArgsExamples">
-           <stdout>
-               <line text="args(List)"/>
-               <line text="args List of String"/>
-               <line text="args(List)"/>
-               <line text="args List of Double"/>
-               <line text="args(List)"/>
-               <line text="args List of Double"/>
-           </stdout>
-       </run>
-   </ajc-test>   
-   
-   <ajc-test title="ajdk notebook: after returning examples" dir="java5/generics/ajdk">
-       <compile files="AfterReturningExamples.aj" options="-1.9">
-           <message kind="warning" line="20" text="unchecked match of List&lt;Double&gt; with List&lt;? extends Number&gt;"/>
-       </compile>
-       <run class="AfterReturningExamples">
-           <stdout>
-               <line text="execution(List C.foo(List))"/>
-               <line text="raw s1"/>
-               <line text="raw s2"/>
-               <line text="execution(List C.bar(List))"/>
-               <line text="raw 5.0"/>
-               <line text="raw 10.0"/>
-               <line text="a1 5.0"/>
-               <line text="a1 10.0"/>
-               <line text="a2 5.0"/>
-               <line text="a2 10.0"/>
-               <line text="a3 5.0"/>
-               <line text="a3 10.0"/>
-               <line text="execution(List C.goo(List))"/>
-               <line text="raw 5.0"/>
-               <line text="raw 10.0"/>
-               <line text="a1 5.0"/>
-               <line text="a1 10.0"/>
-               <line text="a3 5.0"/>
-               <line text="a3 10.0"/>          
-            </stdout>
-       </run>
-   </ajc-test>   
- 
-   <ajc-test title="ajdk notebook: args and wildcards examples" dir="java5/generics/ajdk">
-       <compile files="WildcardArgsExamples.aj" options="-1.9">
-           <message kind="warning" line="6" text="unchecked match of List&lt;? extends Number&gt; with List"/>
-       </compile>
-       <run class="WildcardArgsExamples">
-           <stdout>
-               <line text="advice match at call(void C.foo(Object))"/>
-               <line text="advice match at call(void C.foo(Object))"/>
-               <line text="advice match 2 at call(void C.goo1(List))"/>
-               <line text="advice match 2 at call(void C.goo2(List))"/>
-               <line text="advice match 2 at call(void C.goo4(List))"/>
-           </stdout>
-       </run>
-   </ajc-test>  
-
-   <ajc-test title="ajdk notebook: pointcut in generic class example" dir="java5/generics/ajdk">
-       <compile files="PointcutInGenericClassExample.aj" options="-1.9">
-           <message kind="warning" line="23" text="parameterized with C"/>
-           <message kind="warning" line="29" text="parameterized with D"/>
-       </compile>
-   </ajc-test>  
-
-   <!-- ============================================================== -->
-   <!--     End of generics tests                                      -->
-   <!-- ============================================================== -->
-   
-   <ajc-test dir="bugs150/pr98901" title="public method with declare @method">
-     <compile files="Case01.aj" options="-1.9 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B01">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150" title="Compiler error due to a wrong exception check in try blocks">
-     <compile files="pr82989.aj" options="-1.9"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr98901" title="public method on the aspect that declares @method on it">
-     <compile files="Case02.aj" options="-1.9 -Xlint:error"/>
-     <run class="B02">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr98901" title="public annotated method">
-     <compile files="Case03.aj" options="-1.9 -Xlint:error"/>
-     <run class="B03">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-<ajc-test dir="bugs150/pr98901" title="public ITD method with declare @method">
-     <compile files="Case04.aj" options="-1.9 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B04">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-
-<ajc-test dir="bugs150/pr98901" title="public annotated ITD method">
-     <compile files="Case05.aj" options="-1.9 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B05">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-<ajc-test dir="bugs150/pr98901" title="public ITD-on-itself method with declare @method">
-     <compile files="Case06.aj" options="-1.9 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B06">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-<ajc-test dir="bugs150/pr98901" title="public annotated ITD-on-itself method">
-     <compile files="Case07.aj" options="-1.9 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B07">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-<ajc-test dir="bugs150/pr98901" title="public method on an Interface with declare @method">
-     <compile files="Case08.aj" options="-1.9 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B08">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-
-<ajc-test dir="bugs150/pr98901" title="public annotated method on an Interface">
-     <compile files="Case09.aj" options="-1.9 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B09">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-<ajc-test dir="bugs150/pr98901" title="public ITD method onto an Interface with declare @method">
-     <compile files="Case10.aj" options="-1.9 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B10">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-<ajc-test dir="bugs150/pr98901" title="public annotated ITD method onto an Interface">
-     <compile files="Case11.aj" options="-1.9 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B11">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-<ajc-test dir="bugs150/pr98901" title="public abstract method with declare @method">
-     <compile files="Case12.aj" options="-1.9 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B12">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-
-<ajc-test dir="bugs150/pr98901" title="public abstract method on the aspect that declares @method on it">
-     <compile files="Case13.aj" options="-1.9 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B13">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-<ajc-test dir="bugs150/pr98901" title="public abstract annotated method">
-     <compile files="Case14.aj" options="-1.9 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B14">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-<ajc-test dir="bugs150/pr98901" title="public abstract ITD method with declare @method">
-     <compile files="Case15.aj" options="-1.9 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B15">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-
-<ajc-test dir="bugs150/pr98901" title="public abstract annotated ITD method">
-     <compile files="Case16.aj" options="-1.9 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B16">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-<ajc-test dir="bugs150/pr98901" title="public abstract ITD-on-itself method with declare @method">
-     <compile files="Case17.aj" options="-1.9 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B17">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-<ajc-test dir="bugs150/pr98901" title="public abstract annotated ITD-on-itself method">
-     <compile files="Case18.aj" options="-1.9 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B18">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-<ajc-test dir="bugs150/pr98901" title="public abstract method on an Interface with declare @method">
-     <compile files="Case19.aj" options="-1.9 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B19">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-
-<ajc-test dir="bugs150/pr98901" title="public abstract annotated method on an Interface">
-     <compile files="Case20.aj" options="-1.9 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B20">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-<ajc-test dir="bugs150/pr98901" title="public abstract ITD method onto an Interface with declare @method">
-     <compile files="Case21.aj" options="-1.9 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B21">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-<ajc-test dir="bugs150/pr98901" title="public abstract annotated ITD method onto an Interface">
-     <compile files="Case22.aj" options="-1.9 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B22">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-<ajc-test dir="bugs150/pr98901" title="public field with declare @field">
-     <compile files="Case23.aj" options="-1.9 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B23">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-  
-
-<ajc-test dir="bugs150/pr98901" title="public field on the aspect that declares @field on it">
-     <compile files="Case24.aj" options="-1.9 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B24">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-<ajc-test dir="bugs150/pr98901" title="public annotated field">
-     <compile files="Case25.aj" options="-1.9 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B25">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-    <ajc-test dir="bugs150/pr98901" title="public ITD field with declare @field">
-     <compile files="Case26.aj" options="-1.9 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B26">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-
-    <ajc-test dir="bugs150/pr98901" title="public annotated ITD field">
-     <compile files="Case27.aj" options="-1.9 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B27">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-    <ajc-test dir="bugs150/pr98901" title="public ITD-on-itself field with declare @field">
-     <compile files="Case28.aj" options="-1.9 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B28">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-    <ajc-test dir="bugs150/pr98901" title="public annotated ITD-on-itself field">
-     <compile files="Case29.aj" options="-1.9 -Xlint:error -Xdev:NoAtAspectJProcessing"/>
-     <run class="B29">
-         <stdout>
-           <line text="@anInterface()"/>
-         </stdout>
-       </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150" title="Unable to build shadows">
-     <compile files="pr109728.java" options="-1.9"/>
-   </ajc-test>
-
-   <ajc-test dir="bugs150/pr110788" title="bad generic decp - 1">
-     <compile files="Case1.java" options="-1.9">
-       <message kind="error" line="10" text="Cannot declare parent B&lt;java.lang.Number&gt; onto type C since it already has A&lt;java.lang.String&gt; in its hierarchy"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr110788" title="bad generic decp - 2">
-     <compile files="Case2.java" options="-1.9">
-       <message kind="error" line="8" text="Cannot declare parent A&lt;java.lang.Number&gt; onto type C since it already has A&lt;java.lang.String&gt; in its hierarchy"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr110788" title="bad generic decp - 3">
-     <compile files="Case3.java" options="-1.9"/>
-   </ajc-test>
-
-   <ajc-test dir="bugs150/pr110788" title="bad generic decp - 4">
-     <compile files="Case4.java" options="-1.9"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr110927" title="cant create signature attribute">
-     <compile files="Case1.java" options="-1.9"/>
-   </ajc-test>   
-
-   <ajc-test dir="bugs150/pr72834" title="broken dispatch">
-     <compile files="Trouble.java">
-       <message kind="error" line="7" text="package visible abstract inter-type declarations are not allowed"/>
-       <message kind="error" line="9" text="The method getName() is undefined for the type A"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr73856" title="missing accessor">
-     <compile files="MissingAccessor.java"/>
-     <run class="MissingAccessor"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr90143" title="cant call super methods">
-     <compile files="A.aj"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150" title="cunning declare parents">
-     <compile files="pr92311.aj"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150" title="ITD varargs problem">
-     <compile files="pr110906.aj" options="-1.9"/>
-     <run class="pr110906">
-       <stdout>
-           <line text="a"/>
-           <line text="a"/>
-           <line text="a"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150" title="generic itds and abstract method error">
-     <compile files="pr102357.aj"/>
-     <run class="pr102357"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150" title="unexpected error unboundFormalInPC">
-     <compile files="pr112027.aj"/>
-   </ajc-test>
-
-   <ajc-test dir="bugs150" title="ITD varargs in constructor">
-     <compile files="pr111481.aj" options="-1.9"/>
-	 <run class="pr111481">
-       <stdout>
-           <line text="a"/>
-           <line text="a"/>
-       </stdout>
-      </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr112602" title="ClassCastException with generic wildcard">
-     <compile files="GenericInterface.java,Implementation.java" options="-1.9,-emacssym"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr110307" title="Cant provide default implementation via ITD - 1">
-     <compile files="Case1.java" options="-1.9">
-       <message kind="warning" line="27" text="no match for this type name: Branch [Xlint:invalidAbsoluteTypeName]"/>
-       <message kind="error" line="26" text="can't bind type name 'Branch'"/>
-       <message kind="error" line="27" text="can't bind type name 'Revision'"/>
-       <message kind="error" line="33" text="List cannot be resolved to a type"/>
-       <message kind="error" line="38" text="List cannot be resolved to a type"/>
-       <message kind="error" line="39" text="List cannot be resolved to a type"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr110307" title="Cant provide default implementation via ITD - 2">
-     <compile files="Case2.java" options="-1.9"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr110307" title="Cant provide default implementation via ITD - 3">
-     <compile files="Case3.java" options="-1.9"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr110307" title="Cant provide default implementation via ITD - 4">
-     <compile files="Case4.java" options="-1.9"/>
-   </ajc-test>
-
-   <ajc-test dir="bugs150/pr110307" title="Cant provide default implementation via ITD - 5">
-     <compile files="Case5.java" options="-1.9">
-       <!-- might possibly need more diagnostics in this case to explain what has happened -->
-       <message kind="error" line="10" text="can't override java.util.List&lt;java.lang.String&gt; I.foo() with java.util.List&lt;java.lang.Integer&gt; A.foo() return types don't match"/>
-       <message kind="error" line="15" text="can't override java.util.List&lt;java.lang.String&gt; I.foo() with java.util.List&lt;java.lang.Integer&gt; A.foo() return types don't match"/>
-     </compile>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr110307" title="Cant provide default implementation via ITD - 6">
-     <compile files="Case6.java" options="-1.9">
-       <message kind="error" line="8" text="N cannot be resolved to a type"/>
-       <!--message kind="error" line="7" text="T cannot be resolved to a type"/-->
-     </compile>
-   </ajc-test>
-
-   <ajc-test dir="bugs150/pr110307" title="Cant provide default implementation via ITD - 7">
-     <compile files="Case7.java" options="-1.9"/>
-     <run class="Case7">
-       <stderr> 
-         <line text="in=hello out=hello"/>
-         <line text="in=35 out=35"/>
-         <line text="in=[] out=[]"/>
-       </stderr>
-     </run>
-   </ajc-test>  
-   
-   <!-- generic ITDs -->
-   
-   <ajc-test dir="java5/generics/itds/design" title="generic itds - design A">
-     <compile files="DesignA.java" options="-1.9"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/design" title="generic itds - design B">
-     <compile files="DesignB.java" options="-1.9"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/design" title="generic itds - design C">
-     <compile files="DesignC.java" options="-1.9"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/design" title="generic itds - design D">
-     <compile files="DesignD.java" options="-1.9"/>
-   </ajc-test>
-
-   <ajc-test dir="java5/generics/itds/design" title="generic itds - design E">
-     <compile files="DesignE.java" options="-1.9"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/design" title="generic itds - design F">
-     <compile files="DesignF.java" options="-1.9"/>
-   </ajc-test>
-   
-   <ajc-test dir="java5/generics/itds/design" title="generic itds - design G">
-     <compile files="DesignG.java" options="-1.9"/>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr116626" title="NPE in WeavingAdaptor">
-     <compile files="com/foo/bar/Test.java, TestAspect.aj" options="-1.9"/>
-     <run class="com.foo.bar.Test" ltw="aop.xml"
-     >
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr119657" title="IllegalAccessError with around advice on interface method call">
-     <compile files="services/account/StockQuoteServiceTest.java, services/accountdata/StockAccount.java, services/stockquote/StockQuoteService.java, services/stockquote/StockQuoteServiceImpl.java, services/account/AccountReport.java, accounts/recovery/Recovery.aj"/>
-     <run class="services.account.StockQuoteServiceTest">
-       <stdout>
-           <line text="Recovery.around() call(float services.stockquote.StockQuoteService.getQuote(String))"/>
-       </stdout>
-     </run>
-     <run class="services.account.StockQuoteServiceTest" ltw="aop.xml">
-       <stdout>
-           <line text="Recovery.around() call(float services.stockquote.StockQuoteService.getQuote(String))"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr119657" title="IllegalAccessError with around advice on interface method call not self">
-     <compile files="services/account/StockQuoteServiceTest.java, services/accountdata/StockAccount.java, services/stockquote/StockQuoteService.java, services/stockquote/StockQuoteServiceImpl.java, services/account/AccountReport.java, accounts/recovery/RecoveryNotSelf.aj"/>
-     <run class="services.account.StockQuoteServiceTest">
-       <stdout>
-           <line text="RecoveryNotSelf.around() call(float services.stockquote.StockQuoteService.getQuote(String))"/>
-       </stdout>
-     </run>
-     <run class="services.account.StockQuoteServiceTest" ltw="aop-notself.xml">
-       <stdout>
-           <line text="RecoveryNotSelf.around() call(float services.stockquote.StockQuoteService.getQuote(String))"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr119657" title="IllegalAccessError with around advice on interface method call using -XterminateAfterCompilation and LTW">
-     <compile files="services/account/StockQuoteServiceTest.java, services/accountdata/StockAccount.java, services/stockquote/StockQuoteService.java, services/stockquote/StockQuoteServiceImpl.java, services/account/AccountReport.java"/>
-     <compile files="accounts/recovery/Recovery.aj" options="-XterminateAfterCompilation"/>
-     <run class="services.account.StockQuoteServiceTest" ltw="aop.xml">
-       <stdout>
-           <line text="Recovery.around() call(float services.stockquote.StockQuoteService.getQuote(String))"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr119657" title="IllegalAccessError with around advice on interface method call using LTW">
-     <compile files="services/account/StockQuoteServiceTest.java, services/accountdata/StockAccount.java, services/stockquote/StockQuoteService.java, services/stockquote/StockQuoteServiceImpl.java, services/account/AccountReport.java"/>
-     <compile files="accounts/recovery/Recovery.aj"/>
-     <run class="services.account.StockQuoteServiceTest" ltw="aop.xml">
-       <stdout>
-           <line text="Recovery.around() call(float services.stockquote.StockQuoteService.getQuote(String))"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr119657" title="IllegalAccessError with around advice on interface method call not self using LTW">
-     <compile files="services/account/StockQuoteServiceTest.java, services/accountdata/StockAccount.java, services/stockquote/StockQuoteService.java, services/stockquote/StockQuoteServiceImpl.java, services/account/AccountReport.java"/>
-     <compile files="accounts/recovery/RecoveryNotSelf.aj"/>
-     <run class="services.account.StockQuoteServiceTest" ltw="aop-notself.xml">
-       <stdout>
-           <line text="RecoveryNotSelf.around() call(float services.stockquote.StockQuoteService.getQuote(String))"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr119657" title="IllegalAccessError with around advice on interface method call self and not self using LTW">
-     <compile files="services/account/StockQuoteServiceTest.java, services/accountdata/StockAccount.java, services/stockquote/StockQuoteService.java, services/stockquote/StockQuoteServiceImpl.java, services/account/AccountReport.java"/>
-     <compile files="accounts/recovery/Recovery.aj, accounts/recovery/RecoveryNotSelf.aj"/>
-     <run class="services.account.StockQuoteServiceTest" ltw="aop-selfandnotself.xml">
-       <stdout>
-           <line text="Recovery.around() call(float services.stockquote.StockQuoteService.getQuote(String))"/>
-           <line text="RecoveryNotSelf.around() call(float services.stockquote.StockQuoteService.getQuote(String))"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr119657" title="IllegalAccessError with around advice on interface method call using LTW and -XnoInline">
-     <compile files="services/account/StockQuoteServiceTest.java, services/accountdata/StockAccount.java, services/stockquote/StockQuoteService.java, services/stockquote/StockQuoteServiceImpl.java, services/account/AccountReport.java"/>
-     <compile files="accounts/recovery/Recovery.aj"/>
-     <run class="services.account.StockQuoteServiceTest" ltw="aop-noinline.xml">
-       <stdout>
-           <line text="Recovery.around() call(float services.stockquote.StockQuoteService.getQuote(String))"/>
-       </stdout>
-     </run>
-   </ajc-test>
-   
-   <ajc-test dir="bugs150/pr121385" title="override protected pointcut in aop.xml concrete aspect">
-     <compile files="Hello.java"/>
-     <compile files="World.aj, ConcreteWorld.aj"/>
-     <run class="Hello" ltw="aop.xml">
-       <stdout>
-           <line text="around start!"/>
-           <line text="Hello"/>
-           <line text="around start!"/>
-           <line text="World"/>
-           <line text="around end!"/>
-           <line text="around end!"/>
-       </stdout>
-     </run>
-   </ajc-test>
-
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc190/features190.xml b/tests/src/test/java/org/aspectj/systemtest/ajc190/features190.xml
deleted file mode 100644
index 1fb931e97..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc190/features190.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-
-  <ajc-test dir="features190/efficientTJP" title="tjp 1">
-    <compile files="One.java" options="-1.8"/>
-    <run class="One">
-    <stdout>
-    <line text="void One.main(String[])"/>
-    <line text="One running"/>
-    </stdout>
-    </run>
-  </ajc-test>
-
-  <ajc-test dir="features190/efficientTJP" title="tjp 2">
-    <compile files="Two.java" options="-Xajruntimetarget:1.9 -1.8"/>
-    <run class="Two">
-    <stdout>
-    <line text="void Two.main(String[])"/>
-    <line text="Two running"/>
-    </stdout>
-    </run>
-  </ajc-test>
-  
-  <ajc-test dir="features190/efficientTJP" title="tjp 3">
-    <compile files="Three.java" options="-Xajruntimetarget:1.9 -1.8"/>
-    <run class="Three">
-    <stdout>
-    <line text="Three running"/>
-    <line text="Three()"/>
-    <line text="Three(String)"/>
-    <line text="Three(int, String)"/>
-    </stdout>
-    </run>
-  </ajc-test>
-  
-  <ajc-test dir="features190/efficientTJP" title="tjp 3a">
-    <compile files="ThreeA.java" options="-Xajruntimetarget:1.9 -1.8"/>
-    <run class="ThreeA">
-    <stdout>
-    <line text="ThreeA running"/>
-    <line text="ThreeA()"/>
-    <line text="ThreeA(String)"/>
-    <line text="ThreeA(int, String)"/>
-    </stdout>
-    </run>
-  </ajc-test>
-  
-  <ajc-test dir="features190/efficientTJP" title="tjp 4">
-    <compile files="Four.java" options="-Xajruntimetarget:1.9 -1.8"/>
-    <run class="Four">
-    <stdout>
-    <line text="run() running"/>
-    <line text="catch(Throwable)"/>
-    <line text="caught something"/>
-    </stdout>
-    </run>
-  </ajc-test>
-  
-  <ajc-test dir="features190/efficientTJP" title="tjp 4a">
-    <compile files="FourA.java" options="-Xajruntimetarget:1.9 -1.8"/>
-    <run class="FourA">
-    <stdout>
-    <line text="run() running"/>
-    <line text="void FourA.run()"/>
-    <line text="caught something"/>
-    </stdout>
-    </run>
-  </ajc-test>
-  
-  <ajc-test dir="features190/efficientTJP" title="tjp get fields">
-    <compile files="Fields.java" options="-Xajruntimetarget:1.9 -1.8"/>
-    <run class="Fields">
-    <stdout>
-    <line text="int Fields.a"/>
-    <line text="String Fields.s"/>
-    <line text="double Fields.d"/>
-    <line text="Fields.Inner Fields.obj"/>
-    <line text="short Fields.ps"/>
-    <line text="float Fields.fs"/>
-    <line text="long Fields.ls"/>
-    <line text="byte Fields.bs"/>
-    <line text="char Fields.cs"/>   
-    <line text="int Fields.as"/>
-    <line text="String Fields.ss"/>
-    <line text="double Fields.ds"/>
-    <line text="Fields.Inner Fields.objs"/>
-    </stdout>
-    </run>
-  </ajc-test>
-  
-  <ajc-test dir="features190/efficientTJP" title="tjp get fieldsE">
-    <compile files="FieldsE.java" options="-Xajruntimetarget:1.9 -1.8"/>
-    <run class="FieldsE">
-    <stdout>
-    <line text="void FieldsE.main(String[])"/>
-    <line text="void FieldsE.main(String[])"/>
-    <line text="void FieldsE.main(String[])"/>
-    <line text="void FieldsE.main(String[])"/>
-    <line text="void FieldsE.main(String[])"/>
-    <line text="void FieldsE.main(String[])"/>
-    <line text="void FieldsE.main(String[])"/>
-    <line text="void FieldsE.main(String[])"/>
-    <line text="void FieldsE.main(String[])"/>
-    <line text="void FieldsE.main(String[])"/>
-    <line text="void FieldsE.main(String[])"/>
-    <line text="void FieldsE.main(String[])"/>
-    <line text="void FieldsE.main(String[])"/>
-    </stdout>
-    </run>
-  </ajc-test>
-  
-  <ajc-test dir="features190/efficientTJP" title="tjp set fields">
-    <compile files="Fields2.java" options="-Xajruntimetarget:1.9 -1.8"/>
-    <run class="Fields2">
-    <stdout>
-    <line text="int Fields2.a"/>
-    <line text="short Fields2.ps"/>
-    <line text="double Fields2.d"/>
-    <line text="Fields2.Inner Fields2.obj"/>
-    <line text="String Fields2.s"/>
-    <line text="float Fields2.fs"/>
-    <line text="long Fields2.ls"/>
-    <line text="byte Fields2.bs"/>
-    <line text="char Fields2.cs"/>   
-    </stdout>
-    </run>
-  </ajc-test>
-  
-  <ajc-test dir="features190/efficientTJP" title="tjp clinit">
-    <compile files="Clinit.java" options="-Xajruntimetarget:1.9 -1.8"/>
-    <run class="Clinit">
-    <stdout>
-    <line text="Clinit.&lt;clinit&gt;"/>
-    <line text="Clinit.Inner.&lt;clinit&gt;"/>
-    </stdout>
-    </run>
-  </ajc-test>
-  
-  <ajc-test dir="features190/efficientTJP" title="tejp clinit">
-    <compile files="ClinitE.java" options="-Xajruntimetarget:1.9 -1.8"/>
-    <run class="ClinitE">
-    <stdout>
-    <line text="ClinitE.&lt;clinit&gt;"/>
-    <line text="ClinitE.Inner.&lt;clinit&gt;"/>
-    </stdout>
-    </run>
-  </ajc-test>
-  
-  <ajc-test dir="features190/efficientTJP" title="tjp advice">
-    <compile files="Advice.java" options="-Xajruntimetarget:1.9 -1.8"/>
-    <run class="Advice">
-    <stdout>
-    <line text="tjp:void X.before()"/>
-    <line text="tejp:void X.before()"/>
-    </stdout>
-    </run>
-  </ajc-test>
-  
-  <ajc-test dir="features190/efficientTJP" title="tjp init">
-    <compile files="Init.java" options="-Xajruntimetarget:1.9 -1.8"/>
-    <run class="Init">
-    <stdout>
-    <line text="A()"/>
-    <line text="A()"/>
-    <line text="B()"/>
-    <line text="B()"/>
-    </stdout>
-    </run>
-  </ajc-test>
-  
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc190/sanity-tests-19.xml b/tests/src/test/java/org/aspectj/systemtest/ajc190/sanity-tests-19.xml
deleted file mode 100644
index 4965b448a..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc190/sanity-tests-19.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<!-- AspectJ v1.6.0 Tests -->
-<suite>
-
-    <!-- empty class -->
-    <ajc-test dir="bugs160/simplejava" title="simple - a">
-      <compile files="SimpleA.java" options="-1.9"/>
-    </ajc-test>
-
-    <!-- class with one method -->
-    <ajc-test dir="bugs160/simplejava" title="simple - b">
-      <compile files="SimpleB.java" options="-1.9"/>
-      <run class="SimpleB"/>
-    </ajc-test>
-    
-    <!-- empty aspect -->
-    <ajc-test dir="bugs160/simplejava" title="simple - c">
-      <compile files="SimpleC.java" options="-1.9"/>
-    </ajc-test>
-    
-    <!-- simple before -->
-    <ajc-test dir="bugs160/simplejava" title="simple - d">
-      <compile files="SimpleD.java" options="-1.9"/>
-    </ajc-test>
-    
-    <!-- simple itd field -->
-    <ajc-test dir="bugs160/simplejava" title="simple - e">
-      <compile files="SimpleE.java" options="-1.9"/>
-    </ajc-test>
-    
-    <!-- aspect with main calling a static method -->
-    <ajc-test dir="bugs160/simplejava" title="simple - f">
-      <compile files="SimpleF.java" options="-1.9"/>
-    </ajc-test>
-    
-    <!-- pertarget -->
-    <ajc-test dir="bugs160/simplejava" title="simple - g">
-      <compile files="SimpleG.java" options="-1.9"/>
-    </ajc-test>
-    
-    <!-- generic ctor itds -->
-    <ajc-test dir="bugs160/simplejava" title="simple - h">
-      <compile files="SimpleH.java" options="-1.9"/>
-    </ajc-test>
-    
-    <!-- overriding generic itd methods -->
-    <ajc-test dir="bugs160/simplejava" title="simple - i">
-      <compile files="SimpleI.java" options="-1.9"/>
-    </ajc-test>
-    
-    <!-- check class file version is 53.0 -->
-    <ajc-test dir="bugs160/simplejava" title="simple - j">
-      <compile files="SimpleJ.java" options="-1.9"/>
-    </ajc-test>
-
-    <!-- check class file version is 53.0 -->
-    <ajc-test dir="bugs160/simplejava" title="simple - k">
-      <compile files="SimpleJ.java" options="-source 1.9"/>
-    </ajc-test>
-
-    <!-- check class file version is 49.0 -->
-    <ajc-test dir="bugs160/simplejava" title="simple - m">
-      <compile files="SimpleJ.java" options="-1.5"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs160/simplejava" title="simple - n">
-      <compile files="SimpleN.java" options="-1.9"/>
-    </ajc-test>
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc191/ajc191.xml b/tests/src/test/java/org/aspectj/systemtest/ajc191/ajc191.xml
deleted file mode 100644
index 3a87375e9..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc191/ajc191.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-
-  <ajc-test dir="bugs191/var" title="var 1">
-    <compile files="Code1.java" options="-10">
-	</compile>
-	<run class="Code1">
-	<stdout>
-	<line text="class java.lang.String"/>
-	</stdout>
-	</run>
-  </ajc-test>
-  
-  <ajc-test dir="bugs191/var" title="var 2">
-    <compile files="Code2.java" options="-10">
-	</compile>
-	<run class="Code2">
-	<stdout>
-	<line text="class java.util.ArrayList"/>
-	</stdout>
-	</run>
-  </ajc-test>
-  
-  <ajc-test dir="bugs191/var" title="var 3">
-    <compile files="Code3.java" options="-10">
-	</compile>
-	<run class="Code3">
-	<stdout>
-	<line text="call(Class java.lang.Object.getClass())"/>
-	<line text="class java.lang.String"/>
-	</stdout>
-	</run>
-  </ajc-test>
-
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc191/sanity-tests-10.xml b/tests/src/test/java/org/aspectj/systemtest/ajc191/sanity-tests-10.xml
deleted file mode 100644
index a6bdbd938..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc191/sanity-tests-10.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<!-- AspectJ v1.6.0 Tests -->
-<suite>
-
-    <!-- empty class -->
-    <ajc-test dir="bugs160/simplejava" title="simple - a">
-      <compile files="SimpleA.java" options="-10"/>
-    </ajc-test>
-
-    <!-- class with one method -->
-    <ajc-test dir="bugs160/simplejava" title="simple - b">
-      <compile files="SimpleB.java" options="-10"/>
-      <run class="SimpleB"/>
-    </ajc-test>
-    
-    <!-- empty aspect -->
-    <ajc-test dir="bugs160/simplejava" title="simple - c">
-      <compile files="SimpleC.java" options="-10"/>
-    </ajc-test>
-    
-    <!-- simple before -->
-    <ajc-test dir="bugs160/simplejava" title="simple - d">
-      <compile files="SimpleD.java" options="-10"/>
-    </ajc-test>
-    
-    <!-- simple itd field -->
-    <ajc-test dir="bugs160/simplejava" title="simple - e">
-      <compile files="SimpleE.java" options="-10"/>
-    </ajc-test>
-    
-    <!-- aspect with main calling a static method -->
-    <ajc-test dir="bugs160/simplejava" title="simple - f">
-      <compile files="SimpleF.java" options="-10"/>
-    </ajc-test>
-    
-    <!-- pertarget -->
-    <ajc-test dir="bugs160/simplejava" title="simple - g">
-      <compile files="SimpleG.java" options="-10"/>
-    </ajc-test>
-    
-    <!-- generic ctor itds -->
-    <ajc-test dir="bugs160/simplejava" title="simple - h">
-      <compile files="SimpleH.java" options="-10"/>
-    </ajc-test>
-    
-    <!-- overriding generic itd methods -->
-    <ajc-test dir="bugs160/simplejava" title="simple - i">
-      <compile files="SimpleI.java" options="-10"/>
-    </ajc-test>
-    
-    <!-- check class file version is 54.0 -->
-    <ajc-test dir="bugs160/simplejava" title="simple - j">
-      <compile files="SimpleJ.java" options="-10"/>
-    </ajc-test>
-
-    <!-- check class file version is 54.0 -->
-    <ajc-test dir="bugs160/simplejava" title="simple - k">
-      <compile files="SimpleJ.java" options="-source 10"/>
-    </ajc-test>
-
-    <!-- check class file version is 49.0 -->
-    <ajc-test dir="bugs160/simplejava" title="simple - m">
-      <compile files="SimpleJ.java" options="-1.5"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs160/simplejava" title="simple - n">
-      <compile files="SimpleN.java" options="-10"/>
-    </ajc-test>
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc192/ajc192.xml b/tests/src/test/java/org/aspectj/systemtest/ajc192/ajc192.xml
deleted file mode 100644
index 095c3978a..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc192/ajc192.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-
-  <ajc-test dir="bugs192/513528" title="itd lambdas">
-    <compile files="Apple.java AppleController.java AppleControllerITDAspect.java" options="-11">
-	</compile>
-	<run class="de.scrum_master.app.AppleController">
-	</run>
-  </ajc-test>
-  
-  <ajc-test dir="bugs192/11flags" title="11flags">
-    <compile files="A.java" options="-11 -showWeaveInfo">
-    <message kind="weave" text="Join point 'method-execution(void A.foo())' in Type 'A' (A.java:8) advised by before advice from 'X' (A.java:12)"/>
-	</compile>
-  </ajc-test>
-  
-  <ajc-test dir="bugs192/nestmates" title="nestmates">
-    <compile files="Outer.java" options="-11">
-	</compile>
-  </ajc-test>
-  
-  <ajc-test dir="bugs192/nestmates" title="nestmates 2">
-    <compile files="Outer2.java" options="-11">
-	</compile>
-	<run class="Outer2">
-	<stdout>
-	<line text="Before main()"/>
-	<line text="Before i"/>
-	<line text="0"/>
-	</stdout></run>
-  </ajc-test>
-  
-  <ajc-test dir="bugs192/537825" title="no final on cflow elements">
-    <compile files="Code.java" options="-9">
-    </compile>
-    <run class="Code">
-    <stdout>
-    <line text="call(void B.methodB())"/>
-    <line text="staticinitialization(B.&lt;clinit&gt;)"/>
-    <line text="execution(void B.methodB())"/>
-    <line text="call(void C.methodC())"/>
-    <line text="staticinitialization(C.&lt;clinit&gt;)"/>
-    <line text="execution(void C.methodC())"/>
-    <line text="call(void D.methodD())"/>
-    <line text="staticinitialization(D.&lt;clinit&gt;)"/>
-    <line text="execution(void D.methodD())"/>
-    <line text="get(PrintStream java.lang.System.out)"/>
-    <line text="call(void java.io.PrintStream.println(int))"/>
-    <line text="3"/>
-    </stdout>
-    </run>
-  </ajc-test>
-  
-  <ajc-test dir="bugs192/535156" title="around advice">
-    <compile files="DemoApp.java" options="-8 -showWeaveInfo">
-    <message kind="weave" text="Join point 'method-call(void DemoApp.say())' in Type 'DemoApp' (DemoApp.java:6) advised by around advice from 'X' (DemoApp.java:14)"/>
-	</compile>
-	<run class="DemoApp">
-	</run>
-  </ajc-test>
-  
-  <ajc-test dir="bugs192/535156" title="around advice - 2">
-    <compile files="DemoApp2.java" options="-8 -showWeaveInfo">
-    <message kind="weave" text="Join point 'method-call(void DemoApp2.say())' in Type 'DemoApp2' (DemoApp2.java:6) advised by around advice from 'X' (DemoApp2.java:13)"/>
-	</compile>
-	<run class="DemoApp2">
-	</run>
-  </ajc-test>
-  
-  <ajc-test dir="bugs192/ptw" title="ptw">
-    <compile files="a/b/c/Code.java a/b/d/Foo.java" options="-8">
-	</compile>
-	<run class="a.b.c.Code">
-	<stdout>
-	<line text="staticinitialization(a.b.c.Code.PublicInner.&lt;clinit&gt;) getWithinTypeName() = a.b.c.Code$PublicInner"/>
-	<line text="staticinitialization(a.b.c.Code.PublicInner.&lt;clinit&gt;) aspectOf(a.b.c.Code$PublicInner) = a.b.d.Foo"/>
-	<line text="PublicInner.run()"/>
-	<line text="DefaultInner.run()"/>
-	<line text="PrivateInner.run()"/>
-	</stdout>
-	</run>
-  </ajc-test>
-  
-  <ajc-test dir="bugs192/ptw" title="ptw - same package">
-    <compile files="a/b/c/Code.java a/b/c/Foo.java" options="-8">
-	</compile>
-	<run class="a.b.c.Code">
-	<stdout>
-	<line text="staticinitialization(a.b.c.Code.PublicInner.&lt;clinit&gt;) getWithinTypeName() = a.b.c.Code$PublicInner"/>
-	<line text="staticinitialization(a.b.c.Code.PublicInner.&lt;clinit&gt;) aspectOf(a.b.c.Code$PublicInner) = a.b.c.Foo"/>
-	<line text="PublicInner.run()"/>
-	<line text="staticinitialization(a.b.c.Code.DefaultInner.&lt;clinit&gt;) getWithinTypeName() = a.b.c.Code$DefaultInner"/>
-	<line text="staticinitialization(a.b.c.Code.DefaultInner.&lt;clinit&gt;) aspectOf(a.b.c.Code$DefaultInner) = a.b.c.Foo"/>
-	<line text="DefaultInner.run()"/>
-	<line text="staticinitialization(a.b.c.Code.PrivateInner.&lt;clinit&gt;) getWithinTypeName() = a.b.c.Code$PrivateInner"/>
-	<line text="staticinitialization(a.b.c.Code.PrivateInner.&lt;clinit&gt;) aspectOf(a.b.c.Code$PrivateInner) = a.b.c.Foo"/>
-	<line text="PrivateInner.run()"/>
-	</stdout>
-	</run>
-  </ajc-test>
-  
-
-  <ajc-test dir="bugs192/ptw" title="ptw - privileged">
-    <compile files="a/b/c/Code.java a/b/d/FooPrivileged.java" options="-8">
-	</compile>
-	<run class="a.b.c.Code">
-	<stdout>
-	<line text="getWithinTypeName() = a.b.c.Code$PublicInner"/>
-	<line text="Aspect instance = a.b.d.Foo"/>
-	<line text="PublicInner.run()"/>
-	<line text="getWithinTypeName() = a.b.c.Code$DefaultInner"/>
-	<line text="Aspect instance = a.b.d.Foo"/>
-	<line text="DefaultInner.run()"/>
-	<line text="getWithinTypeName() = a.b.c.Code$PrivateInner"/>
-	<line text="Aspect instance = a.b.d.Foo"/>
-	<line text="PrivateInner.run()"/>
-	</stdout>
-	</run>
-  </ajc-test>
-  
-  <ajc-test dir="bugs192/ptw" title="ptw - privileged same package">
-    <compile files="a/b/c/Code.java a/b/c/FooPrivileged.java" options="-8">
-	</compile>
-	<run class="a.b.c.Code">
-	<stdout>
-	<line text="staticinitialization(a.b.c.Code.PublicInner.&lt;clinit&gt;) getWithinTypeName() = a.b.c.Code$PublicInner"/>
-	<line text="staticinitialization(a.b.c.Code.PublicInner.&lt;clinit&gt;) aspectOf(a.b.c.Code$PublicInner) = a.b.c.Foo"/>
-	<line text="PublicInner.run()"/>
-	<line text="staticinitialization(a.b.c.Code.DefaultInner.&lt;clinit&gt;) getWithinTypeName() = a.b.c.Code$DefaultInner"/>
-	<line text="staticinitialization(a.b.c.Code.DefaultInner.&lt;clinit&gt;) aspectOf(a.b.c.Code$DefaultInner) = a.b.c.Foo"/>
-	<line text="DefaultInner.run()"/>
-	<line text="staticinitialization(a.b.c.Code.PrivateInner.&lt;clinit&gt;) getWithinTypeName() = a.b.c.Code$PrivateInner"/>
-	<line text="staticinitialization(a.b.c.Code.PrivateInner.&lt;clinit&gt;) aspectOf(a.b.c.Code$PrivateInner) = a.b.c.Foo"/>
-	<line text="PrivateInner.run()"/>
-	</stdout>
-	</run>
-  </ajc-test>
-
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc192/sanity-tests-11.xml b/tests/src/test/java/org/aspectj/systemtest/ajc192/sanity-tests-11.xml
deleted file mode 100644
index cdce29082..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc192/sanity-tests-11.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-
-    <!-- empty class -->
-    <ajc-test dir="bugs160/simplejava" title="simple - a">
-      <compile files="SimpleA.java" options="-11"/>
-    </ajc-test>
-
-    <!-- class with one method -->
-    <ajc-test dir="bugs160/simplejava" title="simple - b">
-      <compile files="SimpleB.java" options="-11"/>
-      <run class="SimpleB"/>
-    </ajc-test>
-    
-    <!-- empty aspect -->
-    <ajc-test dir="bugs160/simplejava" title="simple - c">
-      <compile files="SimpleC.java" options="-11"/>
-    </ajc-test>
-    
-    <!-- simple before -->
-    <ajc-test dir="bugs160/simplejava" title="simple - d">
-      <compile files="SimpleD.java" options="-11"/>
-    </ajc-test>
-    
-    <!-- simple itd field -->
-    <ajc-test dir="bugs160/simplejava" title="simple - e">
-      <compile files="SimpleE.java" options="-11"/>
-    </ajc-test>
-    
-    <!-- aspect with main calling a static method -->
-    <ajc-test dir="bugs160/simplejava" title="simple - f">
-      <compile files="SimpleF.java" options="-11"/>
-    </ajc-test>
-    
-    <!-- pertarget -->
-    <ajc-test dir="bugs160/simplejava" title="simple - g">
-      <compile files="SimpleG.java" options="-11"/>
-    </ajc-test>
-    
-    <!-- generic ctor itds -->
-    <ajc-test dir="bugs160/simplejava" title="simple - h">
-      <compile files="SimpleH.java" options="-11"/>
-    </ajc-test>
-    
-    <!-- overriding generic itd methods -->
-    <ajc-test dir="bugs160/simplejava" title="simple - i">
-      <compile files="SimpleI.java" options="-11"/>
-    </ajc-test>
-    
-    <!-- check class file version is 54.0 -->
-    <ajc-test dir="bugs160/simplejava" title="simple - j">
-      <compile files="SimpleJ.java" options="-11"/>
-    </ajc-test>
-
-    <!-- check class file version is 54.0 -->
-    <ajc-test dir="bugs160/simplejava" title="simple - k">
-      <compile files="SimpleJ.java" options="-source 11"/>
-    </ajc-test>
-
-    <!-- check class file version is 49.0 -->
-    <ajc-test dir="bugs160/simplejava" title="simple - m">
-      <compile files="SimpleJ.java" options="-1.5"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs160/simplejava" title="simple - n">
-      <compile files="SimpleN.java" options="-11"/>
-    </ajc-test>
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc193/ajc193.xml b/tests/src/test/java/org/aspectj/systemtest/ajc193/ajc193.xml
deleted file mode 100644
index 7d64d493e..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/ajc193/ajc193.xml
+++ /dev/null
@@ -1,326 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-
-    <ajc-test dir="bugs193/543657" vm="1.8" title="overweaving decm - control">
-        <compile files="MoodIndicator.java,Code1.java" options="-showWeaveInfo -1.8">
-	        <message kind="weave" text="Mixing interface 'MoodIndicator$Moody' (MoodIndicator.java) into type 'Code1' (Code1.java)"/>
-	        <message kind="weave" text="Type 'Code1' (Code1.java) has intertyped method from 'MoodIndicator' (MoodIndicator.java:'Mood MoodIndicator$Moody.getMood()')"/>
-	        <message kind="weave" text="Join point 'method-execution(void Code1.run())' in Type 'Code1' (Code1.java:2) advised by before advice from 'MoodIndicator' (MoodIndicator.java:21)"/>
-        </compile>
-        <run class="Code1">
-	        <stdout>
-	        <line text="I'm feeling HAPPY"/>
-	        </stdout>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs193/543657" vm="1.8" title="overweaving decm - reweaving">
-        <compile files="MoodIndicator.java,Code1.java" options="-showWeaveInfo -1.8" outjar="one.jar">
-	        <message kind="weave" text="Mixing interface 'MoodIndicator$Moody' (MoodIndicator.java) into type 'Code1' (Code1.java)"/>
-	        <message kind="weave" text="Type 'Code1' (Code1.java) has intertyped method from 'MoodIndicator' (MoodIndicator.java:'Mood MoodIndicator$Moody.getMood()')"/>
-	        <message kind="weave" text="Join point 'method-execution(void Code1.run())' in Type 'Code1' (Code1.java:2) advised by before advice from 'MoodIndicator' (MoodIndicator.java:21)"/>
-        </compile>
-        <compile inpath="one.jar" options="-showWeaveInfo -1.8">
-	        <message kind="weave" text="Mixing interface 'MoodIndicator$Moody' (MoodIndicator.java) into type 'Code1' (Code1.java)"/>
-	        <message kind="weave" text="Type 'Code1' (Code1.java) has intertyped method from 'MoodIndicator' (MoodIndicator.java:'Mood MoodIndicator$Moody.getMood()')"/>
-	        <message kind="weave" text="Join point 'method-execution(void Code1.run())' in Type 'Code1' (Code1.java:2) advised by before advice from 'MoodIndicator' (one.jar!MoodIndicator.class(from MoodIndicator.java))"/>
-        </compile>
-        <run class="Code1">
-	        <stdout>
-	        <line text="I'm feeling HAPPY"/>
-	        </stdout>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs193/543657" vm="1.8" title="overweaving decm - 1">
-        <compile files="MoodIndicator.java,Code1.java" options="-showWeaveInfo -1.8" outjar="one.jar">
-	        <message kind="weave" text="Mixing interface 'MoodIndicator$Moody' (MoodIndicator.java) into type 'Code1' (Code1.java)"/>
-	        <message kind="weave" text="Type 'Code1' (Code1.java) has intertyped method from 'MoodIndicator' (MoodIndicator.java:'Mood MoodIndicator$Moody.getMood()')"/>
-	        <message kind="weave" text="Join point 'method-execution(void Code1.run())' in Type 'Code1' (Code1.java:2) advised by before advice from 'MoodIndicator' (MoodIndicator.java:21)"/>
-        </compile>
-        <compile files="MoodIndicator2.java" inpath="one.jar" options="-showWeaveInfo -1.8 -Xset:overWeaving=true">
-        	<message kind="warning" text="advice defined in MoodIndicator has not been applied [Xlint:adviceDidNotMatch]"/>
-	        <message kind="weave" text="Mixing interface 'MoodIndicator2$Moody2' (MoodIndicator2.java) into type 'Code1' (Code1.java)"/>
-	        <message kind="weave" text="Type 'Code1' (Code1.java) has intertyped method from 'MoodIndicator2' (MoodIndicator2.java:'Mood MoodIndicator2$Moody2.getMood2()')"/>
-	        <message kind="weave" text="Join point 'method-execution(void Code1.run())' in Type 'Code1' (Code1.java:2) advised by before advice from 'MoodIndicator2' (MoodIndicator2.java:20)"/>
-        </compile>
-        <run class="Code1">
-	        <stdout>
-	        <line text="I'm feeling SAD"/>
-	        <line text="I'm feeling HAPPY"/>
-	        </stdout>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs193/543657" vm="1.8" title="overweaving decm - 2">
-        <compile files="MoodIndicator.java,Code1.java" options="-showWeaveInfo -1.8" outjar="one.jar">
-	        <message kind="weave" text="Mixing interface 'MoodIndicator$Moody' (MoodIndicator.java) into type 'Code1' (Code1.java)"/>
-	        <message kind="weave" text="Type 'Code1' (Code1.java) has intertyped method from 'MoodIndicator' (MoodIndicator.java:'Mood MoodIndicator$Moody.getMood()')"/>
-	        <message kind="weave" text="Join point 'method-execution(void Code1.run())' in Type 'Code1' (Code1.java:2) advised by before advice from 'MoodIndicator' (MoodIndicator.java:21)"/>
-        </compile>
-        <compile files="MoodIndicator3.java" inpath="one.jar" options="-showWeaveInfo -1.8 -Xset:overWeaving=true">
-        	<message kind="warning" text="advice defined in MoodIndicator has not been applied [Xlint:adviceDidNotMatch]"/>
-	        <message kind="weave" text="Mixing interface 'MoodIndicator2$Moody2' (MoodIndicator2.java) into type 'Code1' (Code1.java)"/>
-	        <message kind="weave" text="Type 'Code1' (Code1.java) has intertyped method from 'MoodIndicator2' (MoodIndicator2.java:'Mood MoodIndicator2$Moody2.getMood2()')"/>
-	        <message kind="weave" text="Join point 'method-execution(void Code1.run())' in Type 'Code1' (Code1.java:2) advised by before advice from 'MoodIndicator2' (MoodIndicator2.java:20)"/>
-        </compile>
-        <run class="Code1">
-	        <stdout>
-	        <line text="I'm feeling SAD"/>
-	        <line text="I'm feeling HAPPY"/>
-	        </stdout>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs193/543657" vm="1.8" title="mood indicator 4">
-        <compile files="MoodIndicator4.java" options="-1.8" outjar="one.jar">
-        </compile>
-        <compile inpath="one.jar" options="-1.8 -Xset:overWeaving=true">
-        </compile>
-        <run class="Code1">
-	        <stdout>
-	        <line text="I'm feeling SAD"/>
-	        <line text="I'm feeling HAPPY"/>
-	        </stdout>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="bugs193/543657" vm="1.8" title="overweaving atdecp - control">
-        <compile files="Basic3b.java" options="-showWeaveInfo -1.8" outjar="ow1.jar">
-	        <message kind="weave" text="Extending interface set for type 'Basic3b' (Basic3b.java) to include 'X$I' (Basic3b.java)"/>
-	        <message kind="weave" text="Type 'Basic3b' (Basic3b.java) has intertyped method from 'X' (Basic3b.java:'void X$I.m2()')"/>
-	        <message kind="weave" text="Type 'Basic3b' (Basic3b.java) has intertyped method from 'X' (Basic3b.java:'void X$I.m3()')"/>
-	        <message kind="weave" text="Type 'Basic3b' (Basic3b.java) has intertyped method from 'X' (Basic3b.java:'void X$I.m4()')"/>
-	        <message kind="weave" text="Join point 'method-call(void X$I.m2())' in Type 'Basic3b' (Basic3b.java:7) advised by before advice from 'X' (Basic3b.java:33)"/>
-	        <message kind="weave" text="Join point 'method-call(void X$I.m3())' in Type 'Basic3b' (Basic3b.java:8) advised by before advice from 'X' (Basic3b.java:33)"/>
-	        <message kind="weave" text="Join point 'method-call(void X$I.m2())' in Type 'Basic3b' (Basic3b.java:9) advised by before advice from 'X' (Basic3b.java:33)"/>
-	        <message kind="weave" text="Join point 'method-call(void X$I.m4())' in Type 'Basic3b' (Basic3b.java:10) advised by before advice from 'X' (Basic3b.java:33)"/>
-	        <message kind="weave" text="Join point 'method-call(void java.io.PrintStream.println(java.lang.String))' in Type 'X$IIimpl' (Basic3b.java:23) advised by before advice from 'X' (Basic3b.java:33)"/>
-	        <message kind="weave" text="Join point 'method-call(void java.io.PrintStream.println(java.lang.String))' in Type 'Basic3b' (Basic3b.java:11) advised by before advice from 'X' (Basic3b.java:33)"/>
-        </compile>
-        <compile files="Y.java" inpath="ow1.jar" options=" -1.8">
-        </compile>
-        <run class="Basic3b">
-	        <stdout>
-	        <!-- BUG: one of these should be YImpl -->
-	        <line text="X.IImpl.m2() ran"/>
-	        <line text="X.IImpl.m2() ran"/>
-	        <line text="Basic3b.main ran"/>
-	        </stdout>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs193/543657" vm="1.8" title="overweaving atdecp">
-        <compile files="Basic3b.java" options="-showWeaveInfo -1.8" outjar="ow1.jar">
-	        <message kind="weave" text="Extending interface set for type 'Basic3b' (Basic3b.java) to include 'X$I' (Basic3b.java)"/>
-	        <message kind="weave" text="Type 'Basic3b' (Basic3b.java) has intertyped method from 'X' (Basic3b.java:'void X$I.m2()')"/>
-	        <message kind="weave" text="Type 'Basic3b' (Basic3b.java) has intertyped method from 'X' (Basic3b.java:'void X$I.m3()')"/>
-	        <message kind="weave" text="Type 'Basic3b' (Basic3b.java) has intertyped method from 'X' (Basic3b.java:'void X$I.m4()')"/>
-	        <message kind="weave" text="Join point 'method-call(void X$I.m2())' in Type 'Basic3b' (Basic3b.java:7) advised by before advice from 'X' (Basic3b.java:33)"/>
-	        <message kind="weave" text="Join point 'method-call(void X$I.m3())' in Type 'Basic3b' (Basic3b.java:8) advised by before advice from 'X' (Basic3b.java:33)"/>
-	        <message kind="weave" text="Join point 'method-call(void X$I.m2())' in Type 'Basic3b' (Basic3b.java:9) advised by before advice from 'X' (Basic3b.java:33)"/>
-	        <message kind="weave" text="Join point 'method-call(void X$I.m4())' in Type 'Basic3b' (Basic3b.java:10) advised by before advice from 'X' (Basic3b.java:33)"/>
-	        <message kind="weave" text="Join point 'method-call(void java.io.PrintStream.println(java.lang.String))' in Type 'X$IIimpl' (Basic3b.java:23) advised by before advice from 'X' (Basic3b.java:33)"/>
-	        <message kind="weave" text="Join point 'method-call(void java.io.PrintStream.println(java.lang.String))' in Type 'Basic3b' (Basic3b.java:11) advised by before advice from 'X' (Basic3b.java:33)"/>
-        </compile>
-        <compile files="Y.java" inpath="ow1.jar" options="-showWeaveInfo -1.8 -Xset:overWeaving=true">
-        
-	        <message kind="weave" text="Join point 'method-call(void java.io.PrintStream.println(java.lang.String))' in Type 'Y$IIimpl' (Y.java:10) advised by before advice from 'Y' (Y.java:17)"/>
-	        <message kind="weave" text="Join point 'method-call(void java.io.PrintStream.println(java.lang.String))' in Type 'Y$IIimpl' (Y.java:10) advised by before advice from 'X' (ow1.jar!X.class(from Basic3b.java))"/>
-	        <message kind="weave" text="Join point 'method-call(void X.advice1())' in Type 'X$IIimpl' (Basic3b.java:23) advised by before advice from 'Y' (Y.java:17)"/>
-	        <message kind="weave" text="Join point 'method-call(void java.io.PrintStream.println(java.lang.String))' in Type 'X$IIimpl' (Basic3b.java:23) advised by before advice from 'Y' (Y.java:17)"/>
-	        <message kind="weave" text="Extending interface set for type 'Basic3b' (Basic3b.java) to include 'Y$I' (Y.java)"/>
-	        <message kind="weave" text="Join point 'method-call(void X.advice1())' in Type 'Basic3b' (Basic3b.java:7) advised by before advice from 'Y' (Y.java:17)"/>
-	        <message kind="weave" text="Join point 'method-call(void X$I.m2())' in Type 'Basic3b' (Basic3b.java:7) advised by before advice from 'Y' (Y.java:17)"/>
-	        <message kind="weave" text="Join point 'method-call(void X.advice1())' in Type 'Basic3b' (Basic3b.java:8) advised by before advice from 'Y' (Y.java:17)"/>
-	        <message kind="weave" text="Join point 'method-call(void X$I.m3())' in Type 'Basic3b' (Basic3b.java:8) advised by before advice from 'Y' (Y.java:17)"/>
-	        <message kind="weave" text="Join point 'method-call(void X.advice1())' in Type 'Basic3b' (Basic3b.java:9) advised by before advice from 'Y' (Y.java:17)"/>
-	        <message kind="weave" text="Join point 'method-call(void X$I.m2())' in Type 'Basic3b' (Basic3b.java:9) advised by before advice from 'Y' (Y.java:17)"/>
-	        <message kind="weave" text="Join point 'method-call(void X.advice1())' in Type 'Basic3b' (Basic3b.java:10) advised by before advice from 'Y' (Y.java:17)"/>
-	        <message kind="weave" text="Join point 'method-call(void X$I.m4())' in Type 'Basic3b' (Basic3b.java:10) advised by before advice from 'Y' (Y.java:17)"/>
-	        <message kind="weave" text="Join point 'method-call(void X.advice1())' in Type 'Basic3b' (Basic3b.java:11) advised by before advice from 'Y' (Y.java:17)"/>
-	        <message kind="weave" text="Join point 'method-call(void java.io.PrintStream.println(java.lang.String))' in Type 'Basic3b' (Basic3b.java:11) advised by before advice from 'Y' (Y.java:17)"/>
-	        <message kind="weave" text="Join point 'method-call(void X$I.m2())' in Type 'Basic3b' (Basic3b.java:1) advised by before advice from 'Y' (Y.java:17)"/>
-	        <message kind="weave" text="Join point 'method-call(void X$I.m3())' in Type 'Basic3b' (Basic3b.java:1) advised by before advice from 'Y' (Y.java:17)"/>
-	        <message kind="weave" text="Join point 'method-call(void X$I.m4())' in Type 'Basic3b' (Basic3b.java:1) advised by before advice from 'Y' (Y.java:17)"/>
-        </compile>
-        <run class="Basic3b">
-	        <stdout>
-	        <!-- BUG: one of these should be YImpl -->
-	        <line text="X.IImpl.m2() ran"/>
-	        <line text="X.IImpl.m2() ran"/>
-	        <line text="Basic3b.main ran"/>
-	        </stdout>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="bugs193/389678" vm="1.8" title="overweaving">
-        <compile files="OverWeave_1/src/Application.java,OverWeave_1/src/MyAspect.aj" options="-showWeaveInfo -1.8" outjar="ow1.jar">
-	        <message kind="weave" text="Join point 'method-execution(void Application.main(java.lang.String[]))' in Type 'Application' (Application.java:2) advised by before advice from 'MyAspect' (MyAspect.aj:2)"/>
-	        <message kind="weave" text="Join point 'method-execution(void Application.sayHelloTo(java.lang.String))' in Type 'Application' (Application.java:6) advised by before advice from 'MyAspect' (MyAspect.aj:2)"/>
-        </compile>
-        <compile files="OverWeave_2/src/MyAspect2.aj" options="-1.8" outjar="ow2.jar">
-        	<message kind="warning" text="advice defined in MyAspect2 has not been applied"/>
-        </compile>
-        <compile inpath="ow1.jar" aspectpath="ow2.jar" options="-1.8 -showWeaveInfo">
-	        <message kind="weave" text="Join point 'method-execution(void Application.main(java.lang.String[]))' in Type 'Application' (Application.java:2) advised by before advice from 'MyAspect2' (ow2.jar!MyAspect2.class:2(from MyAspect2.aj))"/>
-	        <message kind="weave" text="Join point 'method-execution(void Application.main(java.lang.String[]))' in Type 'Application' (Application.java:2) advised by before advice from 'MyAspect' (ow1.jar!MyAspect.class:2(from MyAspect.aj))"/>
-	        <message kind="weave" text="Join point 'method-execution(void Application.sayHelloTo(java.lang.String))' in Type 'Application' (Application.java:6) advised by before advice from 'MyAspect2' (ow2.jar!MyAspect2.class:2(from MyAspect2.aj))"/>
-	        <message kind="weave" text="Join point 'method-execution(void Application.sayHelloTo(java.lang.String))' in Type 'Application' (Application.java:6) advised by before advice from 'MyAspect' (ow1.jar!MyAspect.class:2(from MyAspect.aj))"/>
-        </compile>
-        <run class="Application" classpath="ow2.jar">
-	        <stdout>
-	        <line text="MyAspect -> execution(void Application.main(String[]))"/>
-	        <line text="MyAspect2 -> execution(void Application.main(String[]))"/>
-	        <line text="MyAspect -> execution(void Application.sayHelloTo(String))"/>
-	        <line text="MyAspect2 -> execution(void Application.sayHelloTo(String))"/>
-	        <line text="Hello world!"/>
-	        </stdout>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="bugs193/389678" vm="1.8" title="overweaving 2">
-        <compile files="OverWeave_1/src/Application.java,OverWeave_1/src/MyAspect.aj" options="-showWeaveInfo -1.8" outjar="ow1.jar">
-	        <message kind="weave" text="Join point 'method-execution(void Application.main(java.lang.String[]))' in Type 'Application' (Application.java:2) advised by before advice from 'MyAspect' (MyAspect.aj:2)"/>
-	        <message kind="weave" text="Join point 'method-execution(void Application.sayHelloTo(java.lang.String))' in Type 'Application' (Application.java:6) advised by before advice from 'MyAspect' (MyAspect.aj:2)"/>
-        </compile>
-        <compile files="OverWeave_2/src/MyAspect2.aj" options="-1.8" outjar="ow2.jar">
-        	<message kind="warning" text="advice defined in MyAspect2 has not been applied"/>
-        </compile>
-        <compile inpath="ow1.jar" aspectpath="ow2.jar" options="-showWeaveInfo -1.8 -Xset:overWeaving=true">
-        	<!-- this is a bit unfortunate, basically MyAspect is not being re-applied because of overweaving
-        	     so we get a message that it hasn't been applied. But really it doesn't need to be. -->
-        	<message kind="warning" text="advice defined in MyAspect has not been applied"/>
-<!-- These two don't come out because we are using overweaving to apply MyAspect2 where MyAspect is already applied.
-	        <message kind="weave" text="Join point 'method-execution(void Application.sayHelloTo(java.lang.String))' in Type 'Application' (Application.java:6) advised by before advice from 'MyAspect' (ow1.jar!MyAspect.class:2(from MyAspect.aj))"/>
-	        <message kind="weave" text="Join point 'method-execution(void Application.main(java.lang.String[]))' in Type 'Application' (Application.java:2) advised by before advice from 'MyAspect' (ow1.jar!MyAspect.class:2(from MyAspect.aj))"/>
--->
-	        <message kind="weave" text="Join point 'method-execution(void Application.main(java.lang.String[]))' in Type 'Application' (Application.java:2) advised by before advice from 'MyAspect2' (ow2.jar!MyAspect2.class:2(from MyAspect2.aj))"/>
- 	        <message kind="weave" text="Join point 'method-execution(void Application.sayHelloTo(java.lang.String))' in Type 'Application' (Application.java:6) advised by before advice from 'MyAspect2' (ow2.jar!MyAspect2.class:2(from MyAspect2.aj))"/>
-        </compile>
-        <run class="Application" classpath="ow2.jar">
-	        <stdout>
-	        <!--  notice order change to overweaving usage -->
-	        <line text="MyAspect2 -> execution(void Application.main(String[]))"/>
-	        <line text="MyAspect -> execution(void Application.main(String[]))"/>
-	        <line text="MyAspect2 -> execution(void Application.sayHelloTo(String))"/>
-	        <line text="MyAspect -> execution(void Application.sayHelloTo(String))"/>
-	        <line text="Hello world!"/>
-	        </stdout>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs193/389678" vm="1.8" title="overweaving 3">
-        <compile files="OverWeave_1/src/Application.java,OverWeave_1/src/MyAspect.aj" options="-showWeaveInfo -1.8" outjar="ow1.jar">
-	        <message kind="weave" text="Join point 'method-execution(void Application.main(java.lang.String[]))' in Type 'Application' (Application.java:2) advised by before advice from 'MyAspect' (MyAspect.aj:2)"/>
-	        <message kind="weave" text="Join point 'method-execution(void Application.sayHelloTo(java.lang.String))' in Type 'Application' (Application.java:6) advised by before advice from 'MyAspect' (MyAspect.aj:2)"/>
-        </compile>
-        <compile files="OverWeave_2/src/MyAspect2.aj" options="-1.8" outjar="ow2.jar">
-        	<message kind="warning" text="advice defined in MyAspect2 has not been applied"/>
-        </compile>
-        <compile files="OverWeave_4/src/MyAspect3.aj" options="-1.8" outjar="ow4.jar">
-        	<message kind="warning" text="advice defined in MyAspect3 has not been applied"/>
-        </compile>
-        <compile inpath="ow1.jar" aspectpath="ow2.jar" options="-showWeaveInfo -1.8 -Xset:overWeaving=true" outjar="ow3.jar">
-        	<!-- this is a bit unfortunate, basically MyAspect is not being re-applied because of overweaving
-        	     so we get a message that it hasn't been applied. But really it doesn't need to be. -->
-        	<message kind="warning" text="advice defined in MyAspect has not been applied"/>
-	        <message kind="weave" text="Join point 'method-execution(void Application.main(java.lang.String[]))' in Type 'Application' (Application.java:2) advised by before advice from 'MyAspect2' (ow2.jar!MyAspect2.class:2(from MyAspect2.aj))"/>
- 	        <message kind="weave" text="Join point 'method-execution(void Application.sayHelloTo(java.lang.String))' in Type 'Application' (Application.java:6) advised by before advice from 'MyAspect2' (ow2.jar!MyAspect2.class:2(from MyAspect2.aj))"/>
-        </compile>
-         <compile inpath="ow3.jar" aspectpath="ow4.jar" options="-showWeaveInfo -1.8 -Xset:overWeaving=true">
-        	<!-- this is a bit unfortunate, basically MyAspect is not being re-applied because of overweaving
-        	     so we get a message that it hasn't been applied. But really it doesn't need to be. -->
-        	<message kind="warning" text="advice defined in MyAspect has not been applied"/>
-	        <message kind="weave" text="Join point 'method-execution(void Application.main(java.lang.String[]))' in Type 'Application' (Application.java:2) advised by before advice from 'MyAspect3' (ow4.jar!MyAspect3.class:2(from MyAspect3.aj))"/>
- 	        <message kind="weave" text="Join point 'method-execution(void Application.sayHelloTo(java.lang.String))' in Type 'Application' (Application.java:6) advised by before advice from 'MyAspect3' (ow4.jar!MyAspect3.class:2(from MyAspect3.aj))"/>
-        </compile>
-        <run class="Application" classpath="ow2.jar">
-	        <stdout>
-	        <line text="MyAspect3 -> execution(void Application.main(String[]))"/>
-	        <line text="MyAspect2 -> execution(void Application.main(String[]))"/>
-	        <line text="MyAspect -> execution(void Application.main(String[]))"/>
-	        <line text="MyAspect3 -> execution(void Application.sayHelloTo(String))"/>
-	        <line text="MyAspect2 -> execution(void Application.sayHelloTo(String))"/>
-	        <line text="MyAspect -> execution(void Application.sayHelloTo(String))"/>
-	        <line text="Hello world!"/>
-	        </stdout>
-        </run>
-    </ajc-test>
-    
-    <ajc-test dir="bugs193/389678" vm="1.8" title="overweaving 4">
-        <compile files="OverWeave_1/src/Application.java,OverWeave_1/src/MyAspect.aj" options="-showWeaveInfo -1.8" outjar="ow1.jar">
-	        <message kind="weave" text="Join point 'method-execution(void Application.main(java.lang.String[]))' in Type 'Application' (Application.java:2) advised by before advice from 'MyAspect' (MyAspect.aj:2)"/>
-	        <message kind="weave" text="Join point 'method-execution(void Application.sayHelloTo(java.lang.String))' in Type 'Application' (Application.java:6) advised by before advice from 'MyAspect' (MyAspect.aj:2)"/>
-        </compile>
-        <compile files="OverWeave_2/src/MyAspect2.aj" options="-1.8" outjar="ow2.jar">
-        	<message kind="warning" text="advice defined in MyAspect2 has not been applied"/>
-        </compile>
-        <compile files="OverWeave_4/src/MyAspect3.aj" options="-1.8" outjar="ow4.jar">
-        	<message kind="warning" text="advice defined in MyAspect3 has not been applied"/>
-        </compile>
-        <compile inpath="ow1.jar" aspectpath="ow2.jar" options="-showWeaveInfo -1.8 -Xset:overWeaving=true" outjar="ow3.jar">
-        	<!-- this is a bit unfortunate, basically MyAspect is not being re-applied because of overweaving
-        	     so we get a message that it hasn't been applied. But really it doesn't need to be. -->
-        	<message kind="warning" text="advice defined in MyAspect has not been applied"/>
-	        <message kind="weave" text="Join point 'method-execution(void Application.main(java.lang.String[]))' in Type 'Application' (Application.java:2) advised by before advice from 'MyAspect2' (ow2.jar!MyAspect2.class:2(from MyAspect2.aj))"/>
- 	        <message kind="weave" text="Join point 'method-execution(void Application.sayHelloTo(java.lang.String))' in Type 'Application' (Application.java:6) advised by before advice from 'MyAspect2' (ow2.jar!MyAspect2.class:2(from MyAspect2.aj))"/>
-        </compile>
-         <compile inpath="ow3.jar" aspectpath="ow4.jar:ow2.jar" options="-1.8">
-	        <message kind="error" text="the type Application was previously subject to overweaving and after that can only be woven again in overweaving mode"/>
- 	        <message kind="error" text="the type MyAspect was previously subject to overweaving and after that can only be woven again in overweaving mode"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs193/542682" vm="1.5" title="wildcard enum match in itd">
-        <compile files="SimpleEnum.java,SimpleEnum2.java,EnumAspect04.aj" options="-1.5">
-            <message kind="warning" line="8" text="enum type SimpleEnum2 matches a declare parents type pattern but is being ignored"/>
-            <message kind="warning" line="8" text="enum type SimpleEnum matches a declare parents type pattern but is being ignored"/>
-        </compile>
-    </ajc-test>
-    
-	<ajc-test dir="bugs193/542682" title="declare mixin a">
-		<compile files="CaseA.java" options="-1.8">
-	        <message kind="warning" line="1" text="enum type Color matches a declare parents type pattern but is being ignored"/>
-		</compile>
-		<run class="CaseA">
-		  <stdout>
-		  <line text="Delegate factory invoked"/>
-		  <line text="methodOne running"/>
-		  </stdout>
-		</run>
-	</ajc-test>
-	
-	<ajc-test dir="bugs193/isAbstractType" title="is abstract">
-	<compile files="Code.java" options="-1.8"/>
-	<run class="Code">
-	  <stdout>
-	  <line text="execution(void Code.run())"/>
-	  </stdout>
-	</run>
-	</ajc-test>
-	
-	<ajc-test dir="bugs193/isAbstractType" title="is abstract - 2">
-	<compile files="Code2.java" options="-1.8"/>
-	<run class="Code2">
-	  <stdout>
-	  <line text="execution(void Helper.run())"/>
-	  </stdout>
-	</run>
-	</ajc-test>
-
-<!-- 
-  <ajc-test dir="bugs191/var" title="var 3">
-    <compile files="Code3.java" options="-10">
-	</compile>
-	<run class="Code3">
-	<stdout>
-	<line text="call(Class java.lang.Object.getClass())"/>
-	<line text="class java.lang.String"/>
-	</stdout>
-	</run>
-  </ajc-test>
--->
-
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/apt/apt-spec.xml b/tests/src/test/java/org/aspectj/systemtest/apt/apt-spec.xml
deleted file mode 100644
index 0ce327c49..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/apt/apt-spec.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<suite>
-
-    <ajc-test dir="apt/test1" title="annotation processing with specified processor">
-        <compile options="-1.8" files="Event.java SimpleProcessor.java"
-                 outjar="annotation_processor.jar"/>
-        <!--
-                SimpleProcessor should generate 2 files for each java class that utilizes @Event annotation:
-                    - {className}EventsAspect.aj - this file describes aspect with advices to weaving method annotated with @Event.
-                    - {className}Callbacks.java - this file contains callback interfaces for methods annotated with @Event. Example:
-                            public final class SomeCallbacks {
-                                public interface OnMethod1 {
-                                    void changed(Some emmiter);
-                                }
-                            }
-         -->
-         <!--  believe fails on JDK9 because of split packages and unable to find @Generated -->
-        <compile options="-1.8 -processor test.SimpleProcessor -s generated -showWeaveInfo" files="Some.java"
-                 classpath="annotation_processor.jar" outjar="code.jar">
-            <message kind="weave"
-                     text="Type 'test.Some' (Some.java) has intertyped field from 'test.SomeEventsAspect' (SomeEventsAspect.aj:'test.SomeEventsAspect$SomeOnMethod1Event test.Some.OnMethod1Event')"/>
-            <message kind="weave"
-                     text="Join point 'method-execution(void test.Some.method1())' in Type 'test.Some' (Some.java:14) advised by before advice from 'test.SomeEventsAspect' (SomeEventsAspect.aj:44)"/>
-        </compile>
-        <run class="test.Some">
-            <stdout>
-                <line text="callback registered from before aspect"/>
-                <line text="method1 is invoked"/>
-            </stdout>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="apt/test1" title="annotation processing in action using SPI">
-        <!--
-        what is SPI is described here - http://docs.oracle.com/javase/tutorial/sound/SPI-intro.html
-        -->
-        <!--<compile options="-1.8" files="Event.java SimpleProcessor.java" outjar="annotation_processors_with_spi.jar"/>-->
-        <compile options="-1.8" files="Event.java SimpleProcessor.java" outjar="annotation_processor.jar"/>
-        <!--
-                SimpleProcessor should generate 2 files for each java class that utilizes @Event annotation:
-                    - {className}EventsAspect.aj - this file describes aspect with advices to weaving method annotated with @Event.
-                    - {className}Callbacks.java - this file contains callback interfaces for methods annotated with @Event. Example:
-                            public final class SomeCallbacks {
-                                public interface OnMethod1 {
-                                    void changed(Some emitter);
-                                }
-                            }
-         -->
-
-        <!--apt_service_description.jar contains only SPI description file - META-INF/services/javax.annotation.processing.Processor-->
-        <compile options="-1.8 -s generated -showWeaveInfo" files="Some.java"
-                 classpath="annotation_processor.jar;apt_service_description.jar" outjar="code.jar">
-            <message kind="weave"
-                     text="Type 'test.Some' (Some.java) has intertyped field from 'test.SomeEventsAspect' (SomeEventsAspect.aj:'test.SomeEventsAspect$SomeOnMethod1Event test.Some.OnMethod1Event')"/>
-            <message kind="weave"
-                     text="Join point 'method-execution(void test.Some.method1())' in Type 'test.Some' (Some.java:14) advised by before advice from 'test.SomeEventsAspect' (SomeEventsAspect.aj:44)"/>
-        </compile>
-
-        <run class="test.Some">
-            <stdout>
-                <line text="callback registered from before aspect"/>
-                <line text="method1 is invoked"/>
-            </stdout>
-        </run>
-    </ajc-test>
-
-    <ajc-test dir="apt/test1" title="disabled annotation processing">
-        <compile options="-1.8" files="Event.java SimpleProcessor.java"
-                 outjar="annotation_processor.jar"/>
-        <!--
-                SimpleProcessor should generate 2 files for each java class that utilizes @Event annotation:
-                    - {className}EventsAspect.aj - this file describes aspect with advices to weaving method annotated with @Event.
-                    - {className}Callbacks.java - this file contains callback interfaces for methods annotated with @Event. Example:
-                            public final class SomeCallbacks {
-                                public interface OnMethod1 {
-                                    void changed(Some emmiter);
-                                }
-                            }
-         -->
-
-        <compile options="-1.8 -s generated -showWeaveInfo -proc:none" files="Some.java"
-                 classpath="annotation_processor.jar" outjar="code.jar">
-            <!--field was not injected, so error should occur-->
-            <message kind="error" text="OnMethod1Event cannot be resolved or is not a field"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="apt/test2" title="annotation processing generating java files with aspects">
-        <compile options="-1.6" files="DemoProcessor.java Marker.java" />
-        <compile options="-1.6 -showWeaveInfo -processor DemoProcessor" files="Code.java">
-            <message kind="warning" text="Generated aspect to advise too"/>
-            <message kind="warning" text="Generated aspect to advise boo"/>
-            <message kind="weave"
-                     text="Join point 'method-execution(void Code.boo())' in Type 'Code' (Code.java:6) advised by before advice from 'Advise_boo' (Advise_boo.java:2)"/>
-            <message kind="weave"
-                     text="Join point 'method-execution(void Code.too())' in Type 'Code' (Code.java:9) advised by before advice from 'Advise_too' (Advise_too.java:2)"/>
-        </compile>
-    </ajc-test>
-
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/aspectpath/aspectpath-tests.xml b/tests/src/test/java/org/aspectj/systemtest/aspectpath/aspectpath-tests.xml
deleted file mode 100644
index 5f201b355..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/aspectpath/aspectpath-tests.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<!-- Aspectpath Tests -->
-
-    <!-- .................................... aspectpath tests -->
-	<!-- The jars used by this test can be regenerated with
-	     org.aspectj.ajdt.core/testsrc/org.aspectj.ajdt.internal.compiler.batch.BcweaverJarMaker
-	-->
-    <ajc-test dir="new/options11" 
-      comment="XXX not validated correct yet"
-      title="testing new options">
-        <compile files="Main.java,injar.jar,Aspect.java" 
-            aspectpath="aspectlib1.jar,aspectlib2.jar"/>
-        <!-- can't run until we support classpath including the above jars
-        <run class="Main"/>
-        -->
-    </ajc-test>
-    
-	<ajc-test dir="new/interfaceLibrary"
-		title="aspect-declared interface members in libraries - baseline">
-		<compile files="lib/LibraryInterface.java,
-						Client.java,
-						LibraryAspect.java"/>
-		<run class="Client"/>
-		</ajc-test>
-		
-	<ajc-test dir="new/interfaceLibrary"
-		comment="prove that LibraryAspect is required"
-		title="aspect-declared interface members in libraries - interfaceOnly.jar">
-		<compile 
-			files="Client.java" 
-			aspectpath="interfaceOnly.jar">
-			<message kind="error" line="5"/>
-			</compile>
-		</ajc-test>
-
-	<ajc-test dir="new/interfaceLibrary"
-		title="aspect-declared interface members in libraries - aspectOnly.jar">
-		<compile 
-			files="lib/LibraryInterface.java,
-					Client.java" 
-			aspectpath="aspectOnly.jar"/>
-		<run class="Client"/>
-		</ajc-test>
-		
-	<ajc-test dir="new/interfaceLibrary"
-		title="aspect-declared interface members in libraries - aspectedInterfaceOnly.jar"
-		comment="prove aspect is required even if interface is woven"
-		>
-		<compile 
-			files="Client.java" 
-			classpath="aspectedInterfaceOnly.jar">
-			<message kind="error" line="0" text="LibraryAspect"/>
-			<message kind="error" line="9" text="LibraryInterface"/>
-			</compile>
-		</ajc-test>
-
-	<ajc-test dir="new/interfaceLibrary"
-		title="aspect-declared interface members in libraries - aspectedInterfaceOnly.jar,aspectOnly.jar"
-		comment="weaving required for implementations of interface? 
-		         XXX Would prefer to support javac compiles of Client here, mimicked with classpath only"
-		>
-		<compile 
-			files="Client.java" 
-			classpath="aspectedInterfaceOnly.jar,aspectOnly.jar">
-			<message kind="error" line="9"/>
-			</compile>
-		</ajc-test>
-
-	<ajc-test dir="new/interfaceLibrary"
-		title="aspect-declared interface members in libraries - aspectedInterfaceOnlyBinary.jar,aspectOnly.jar"
-		comment="works if aspect is only on the classpath?, i.e., no weaving XXX need javac run"
-		>
-		<compile 
-			files="Client.java" 
-			classpath="aspectedInterfaceOnlyBinary.jar,aspectOnly.jar">
-			<message kind="error" line="9"/>
-			</compile>
-		</ajc-test>
-
-	<ajc-test dir="new/interfaceLibrary"
-		title="aspect-declared interface members in libraries - aspectedInterfaceOnly.jar,aspectpath=aspectOnly.jar"
-		comment="can weave to create library, and then weave clients"
-		>
-		<compile 
-			files="Client.java" 
-			classpath="aspectedInterfaceOnly.jar"
-			aspectpath="aspectOnly.jar"/>
-		<run class="Client"/>
-		</ajc-test>
-
-	<ajc-test dir="new/interfaceLibrary"
-		title="aspect-declared interface members in libraries - aspectedInterfaceOnly.jar,aspectpath=aspectOnly.jar"
-		comment="works if source aspect and binary classpath woven with aspect? 
-		         should NOT warn about affected type not since affected type is already woven?"
-		>
-		<compile 
-			files="Client.java,LibraryAspect.java" 
-			classpath="aspectedInterfaceOnly.jar"/>
-			
-		<run class="Client"/>
-		</ajc-test>
-
-	<ajc-test 
-		dir="bugs/interfaceLibrary"
-		title="exception clause for aspect-declared interface methods - positive">
-		<compile files="Client.java,LibraryAspect.java,lib/LibraryInterface.java" options="-Xlint:ignore"/>
-		<run class="Client"/>
-		</ajc-test>
-
-	<ajc-test 
-		dir="bugs/interfaceLibrary"
-		title="exception clause for aspect-declared interface methods - negative">
-		<compile files="ClientCE.java,LibraryAspect.java,lib/LibraryInterface.java">
-			<message kind="error" file="ClientCE.java" line="5"/>
-		</compile>
-		</ajc-test>
-
-	<ajc-test 
-		dir="bugs/interfaceLibrary"
-		title="exception clause for aspect-declared class methods - positive">
-		<compile files="ClassClient.java,LibraryClassAspect.java,lib/LibraryClass.java" options="-Xlint:ignore"/>
-		<run class="ClassClient"/>
-		</ajc-test>
-
-	<ajc-test 
-		dir="bugs/interfaceLibrary"
-		title="exception clause for aspect-declared class methods - negative">
-		<compile files="ClassClientCE.java,LibraryClassAspect.java,lib/LibraryClass.java">
-			<message kind="error" file="ClassClientCE.java" line="5"/>
-			</compile>
-		</ajc-test>
-		
-	<ajc-test dir="bugs/interfaceLibrary"
-		pr="41175"
-		title="exception clause for aspect-declared interface methods - positive binary">
-		<compile files="Client.java" aspectpath="lib.jar" options="-Xlint:ignore"/>
-		<run class="Client"/>
-		</ajc-test>
-
-	<ajc-test dir="bugs/interfaceLibrary"
-		pr="41175"
-		title="exception clause for aspect-declared interface methods - negative binary">
-		<compile files="ClientCE.java" aspectpath="lib.jar">
-			<message kind="error" file="ClientCE.java" line="5"/>
-			</compile>
-		</ajc-test>
-
-	<ajc-test dir="bugs/interfaceLibrary"
-		pr="41175"
-		title="exception clause for aspect-declared class methods - positive binary">
-		<compile files="ClassClient.java" aspectpath="libClass.jar" options="-Xlint:ignore"/>
-		<run class="ClassClient"/>
-		</ajc-test>
-
-	<ajc-test dir="bugs/interfaceLibrary"
-		pr="41175"
-		title="exception clause for aspect-declared class methods - negative binary">
-		<compile files="ClassClientCE.java" aspectpath="libClass.jar">
-			<message kind="error" file="ClassClientCE.java" line="5"/>
-			</compile>
-	</ajc-test>
-	
-		<ajc-test dir="bugs/perCflowAndJar"
-		pr="41359"
-		title="percflow aspects compiled from jars share one instance for all entry points">
-		<compile files="PerCFlowCompileFromJar.java,PerCFlowCompileFromJarTest.java"/>
-		<run class="PerCFlowCompileFromJarTest"/>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/perCflowAndJar"
-		pr="41359"
-		title="(using aspectpath) percflow aspects compiled from jars share one instance for all entry points">
-		<compile files="PerCFlowCompileFromJarTest.java"
-				aspectpath="lib.jar"/>
-		<run class="PerCFlowCompileFromJarTest"/>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/abstractMethods" pr="49784"
-   	 title="Introduced abstract method on abstract class not implemented by subtype">
-        <compile files="abstractClass/C.java"
-        		 aspectpath="abstractClass/jars/AandB.jar">
-            <message kind="error" line="1"/>
-        </compile>
-    </ajc-test>
-
-	<ajc-test dir="bugs/abstractMethods" pr="49784"
-   	 title="Introduced abstract method on interface not implemented by subtype (aspectpath)">
-        <compile files="interface/C.java"
-        		 aspectpath="interface/jars/AandB.jar" />
-        <run class="C"/>
-    </ajc-test>
-    
-	
diff --git a/tests/src/test/java/org/aspectj/systemtest/aspectpath/aspectpath.xml b/tests/src/test/java/org/aspectj/systemtest/aspectpath/aspectpath.xml
deleted file mode 100644
index ba587fe9e..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/aspectpath/aspectpath.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[
-<!ENTITY tests SYSTEM "../tests/src/org/aspectj/systemtest/aspectpath/aspectpath-tests.xml">
-]>
-
-<!-- Aspectpath Tests -->
-
-<suite>
-
-&tests;
-
-</suite>
-
diff --git a/tests/src/test/java/org/aspectj/systemtest/bringup/bringup.xml b/tests/src/test/java/org/aspectj/systemtest/bringup/bringup.xml
deleted file mode 100644
index 6009c9484..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/bringup/bringup.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<!-- AspectJ Bring-up Tests -->
-<suite>
-
- <ajc-test title="empty class" dir="bringup">
-  <compile files="EmptyClass.java"></compile>
- </ajc-test>
-
- <ajc-test title="empty aspect" dir="bringup">
-  <compile files="EmptyAspect.aj"></compile>
- </ajc-test>
- 
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/design/design.xml b/tests/src/test/java/org/aspectj/systemtest/design/design.xml
deleted file mode 100644
index 51cc93173..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/design/design.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd" [
-<!ENTITY designTests SYSTEM "../tests/src/org/aspectj/systemtest/design/designtest.xml">
-]>
-
-<!-- Language Design Tests -->
-
-<suite>
-
-&designTests;
-
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/design/designtest.xml b/tests/src/test/java/org/aspectj/systemtest/design/designtest.xml
deleted file mode 100644
index 21be1943c..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/design/designtest.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-    <ajc-test dir="design/intro"
-      title="initial tests for new introduction style" keywords="from-design">
-        <compile files="Simple.java"/>
-        <run class="Simple"/>
-    </ajc-test>
-
-    <ajc-test dir="design/intro"
-      title="overriding of introduced methods and accessibility"
-      keywords="from-design">
-        <compile files="Overriding.java"/>
-        <run class="Overriding"/>
-    </ajc-test>
-
-    <ajc-test dir="design/intro"
-      title="within and introductions behaves correctly" keywords="from-design">
-        <compile files="Within.java" options="-1.4"/>
-        <run class="Within"/>
-    </ajc-test>
-
-    <ajc-test dir="design/intro" pr="570"
-      title="correct inheritance of multiple concrete methods"
-      keywords="from-design">
-        <compile files="MultiInheritCP.java"/>
-        <run class="MultiInheritCP"/>
-    </ajc-test>
-
-    <ajc-test dir="design/intro" pr="570"
-      title="errors in inheritance of multiple concrete methods"
-      keywords="from-design">
-        <compile files="MultiInheritCF.java">
-<!-- the error is:       error at java\lang\Object.java::0 can't override int I2.toString() with java.lang.String java.lang.Object.toString() return types don't match-->
-			<message kind="error" line="0"/>
-			<message kind="error" line="17"/>
-			<message kind="error" line="18"/>
-            <message kind="error" line="21"/>
-            <message kind="error" line="41"/>
-            <message kind="error" line="42"/>
-            <message kind="error" line="43"/>
-            <message kind="error" line="45"/>
-            <message kind="error" line="46"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="design/intro"
-      title="declared exceptions are checked correctly on intros (errors)">
-        <compile files="ExceptionsCF.java">
-            <message kind="error" line="8"/>
-            <message kind="error" line="23"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="design/intro"
-      title="declared exceptions are checked correctly on intros">
-      <compile files="ExceptionsCP.java">
-      </compile>
-        <run class="ExceptionsCP"/>
-    </ajc-test>
-
-    <ajc-test dir="design/reflect"
-      title="Joinpoint is not created for foo(String) when before() advice is present."
-      keywords="from-design">
-        <compile files="SimpleAround1.java"/>
-        <run class="SimpleAround1"/>
-    </ajc-test>
-
-    <ajc-test dir="design/eachobject"
-      title="more tests of eachobject with some difficult typing issues"
-      keywords="from-design">
-        <compile files="Tricky3.java" options="-1.4"/>
-        <run class="Tricky3"/>
-    </ajc-test>
-
-    <ajc-test dir="design/eachobject"
-      title="eachobject: eachobject(receptions(...)) [eachobject]"
-      keywords="from-design">
-        <compile files="Tricky1.java"/>
-        <run class="Tricky1"/>
-    </ajc-test>
-
-    <ajc-test dir="design/reflect" title="Checking new joinpoints"
-      keywords="from-design">
-        <compile files="Coverage.java" options="-Xlint:ignore"/>
-        <run class="Coverage"/>
-    </ajc-test>
-
-    <ajc-test dir="design/eachobject"
-      title="eachobject: simple test [eachobject] (still)"
-      keywords="from-design">
-        <compile files="Simple.java"/>
-        <run class="Simple"/>
-    </ajc-test>
-
-    <ajc-test dir="design/intro"
-      title="scope issues with introduction (needs more work)"
-      keywords="from-design">
-        <compile files="p1/ScopeIssues.java,p1/C1.java"/>
-        <run class="p1.ScopeIssues"/>
-    </ajc-test>
-
-<!-- uncomment this test if we decide to implement 42743 
-	<ajc-test dir="design/soft" pr="42743"
-		title="declare soft limitation">
-		<compile files="DeclareSoft.aj"/>
-		<run class="DeclareSoft"/>
-	</ajc-test>
--->
diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/incremental-junit-tests.xml b/tests/src/test/java/org/aspectj/systemtest/incremental/incremental-junit-tests.xml
deleted file mode 100644
index 659abff47..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/incremental/incremental-junit-tests.xml
+++ /dev/null
@@ -1,409 +0,0 @@
-<!-- Incremental compilation Tests -->
-
-     <ajc-test dir="incrementalju/initialTests/classAdded" 
-    	title="expect class added in initial incremental tests" 
-    	keywords="incremental-test" >
-        <compile staging="true" 
-        	options="-incremental"
-        	sourceroots="src"/>
-        <run class="main.Main"/>
-        <!--
-        <inc-compile tag="20" >
-            <dir-changes added="main.Target"/>
-        </inc-compile>
-        <run class="main.Main"  skipTester="true"/>
-        -->
-    </ajc-test>
-
-    <ajc-test dir="incrementalju/initialTests/classRemoved" 
-    	title="expect class removed in initial incremental tests" 
-    	keywords="incremental-test" >
-        <compile staging="true" 
-        	options="-incremental" 
-        	sourceroots="src"/>
-        <run class="main.Main"/>
-        <!--
-        <inc-compile tag="20">
-            <dir-changes removed="main.Target"/>
-        </inc-compile>
-        <run class="main.Main"/>
-        -->
-    </ajc-test>
-
-    <ajc-test dir="incrementalju/initialTests/classUpdated" 
-    	title="expect class updated in initial incremental tests" 
-    	keywords="incremental-test" >
-        <compile staging="true" 
-        	options="-incremental"
-        	sourceroots="src"/>
-        <run class="main.Main"/>
-        <!--
-        <inc-compile tag="20">
-            <dir-changes updated="main.Main"/>
-        </inc-compile>
-        <run class="main.Main"/>
-        -->
-    </ajc-test>
-
-     <ajc-test dir="incrementalju/initialTests/sourceAdded" 
-    	title="add file with class"
-    	comment="only expecting pickup if sourceroots"    
-    	keywords="incremental-test" >
-        <compile staging="true" 
-        	options="-incremental"
-        	sourceroots="src"/>
-        <run class="main.Main"/>
-        <!--
-        <inc-compile tag="20">
-            <dir-changes added="main.Target"/>
-        </inc-compile>
-        <inc-compile tag="30">
-            <dir-changes updated="main.Main"/>
-        </inc-compile>
-        <run class="main.Main"/>
-        -->
-    </ajc-test>
-
-    <ajc-test dir="incrementalju/initialTests/sourceDeleted" 
-        title="delete source file before incremental compile"
-        comment="build config should permit file deletions for incremental (sourceroots)"
-        keywords="incremental-test" >
-        <compile staging="true" 
-        	options="-incremental"
-    		sourceroots="src"/>
-        <run class="delete.Main"/>
-        <!--
-        <inc-compile tag="20">
-            <dir-changes removed="delete.DeleteMe"/>
-        	<message kind="error" line="6" file="delete/Target.java"/>
-        </inc-compile>
-        <inc-compile tag="30"/> 
-        <run class="delete.Main"/>
-        -->
-    </ajc-test>
-    
-    <ajc-test dir="incrementalju/initialTests/defaultPackage" 
-    	title="do everything in default package (sourceroots)" 
-    	keywords="incremental-test" >
-        <compile staging="true" 
-        	options="-incremental"
-    		sourceroots="src"/>
-        <run class="Main"/>
-        <!--
-        <inc-compile tag="20">
-            <dir-changes added="Target"/>
-        </inc-compile>
-        <run class="Target" skipTester="true"/>
-        <inc-compile tag="30">
-            <dir-changes updated="Main"/>
-        </inc-compile>
-        <run class="Main" skipTester="true"/>
-        <inc-compile tag="40"> 
-			<message kind="error" line="6" file="Main.java"/>
-        </inc-compile>
-        <inc-compile tag="50"/>
-        <run class="Main"/>
-        -->
-    </ajc-test>
-
-  <ajc-test dir="incrementalju/defaultPackage"
-    keywords="incremental-test"
-   	title="change sources in default package">
-        <compile 
-        	staging="true"
-        	options="-incremental" 
-        	sourceroots="src"/>
-        <run class="Main"/>
-        <!--
-        <inc-compile tag="20"/>
-        <run class="Main"/>
-        -->
-    </ajc-test>
-
-   <ajc-test dir="incrementalju/interPackage"
-    keywords="incremental-test"
-   	title="change source">
-        <compile 
-        	staging="true"
-        	options="-incremental" 
-        	sourceroots="src"/>
-        <run class="app.Main"/>
-        <!--
-        <inc-compile tag="20"/>
-        <run class="app.Main"/>
-        -->
-    </ajc-test>
-
-     <ajc-test dir="incrementalju/stringliteral"
-    	keywords="incremental-test"
-		title="incrementally change only string literal, still expect advice">
-        <compile staging="true" options="-incremental" 
-        	sourceroots="src"/>
-		<run class="packageOne.Main"
-			options="in packageOne.Main.main(..),before main packageOne.Main"/>
-        <!--
-        <inc-compile tag="20">
-        	<dir-changes updated="packageOne.Main"/>
-        </inc-compile>
-		<run class="packageOne.Main"
-			options="in longer packageOne.Main.main(..),
-					 before main packageOne.Main"/>
-        -->
-    </ajc-test>
-
-	<ajc-test dir="incrementalju/initialTests/aspectSourceAdded" 
-    	title="add aspect source file and check world is rewoven"
-    	keywords="incremental-test" >
-        <compile staging="true" 
-        	options="-incremental"
-        	sourceroots="src"/>
-        <!--
-        <inc-compile tag="20">
-            <dir-changes added="Detour"/>
-        </inc-compile>
-        <run class="Main"/>
-        -->
-    </ajc-test>
-    
-    <ajc-test dir="incrementalju/initialTests/classWAroundClosureRemoved"
-      title="make sure additional classes generated during weave are deleted with src class file"
-      keywords="incremental-test">
-      <compile staging="true" 
-        	options="-incremental"
-        	sourceroots="src"/>
-        <!--
-        <inc-compile tag="20" >
-            <dir-changes removed="AdviceOnIntroduced$AjcClosure1"/>
-        </inc-compile>
-        -->
-    </ajc-test>
-
-  <ajc-test dir="incrementalju/full-rebuild"
-    	pr="59895"
-		title="incremental with aspect-driven full rebuild">
-        <compile 
-			staging="true" 
-			sourceroots="src"
-			options="-incremental">
-        	<message kind="error" line="3" file="Aspect.java"/>
-        	</compile>
-        <!--
-        <inc-compile tag="20">
-        	<message kind="warning" line="3" file="Main.java"/>
-        </inc-compile>
-        <run class="Main"/>
-        -->
-    </ajc-test>
-	
-	 <ajc-test dir="incrementalju/resourceTests/resourceAdded"
-    	pr="54622"
-		title="incremental with addition of resource to inpath directory">
-        <compile 
-			staging="true" 
-			sourceroots="src"
-			options="-incremental"
-			inpath="indir">
-       	</compile>
-        <!--
-        <inc-compile tag="20">
-        </inc-compile>
-        <run class="Main"/>
-        -->
-    </ajc-test>
-
-
-	 <ajc-test dir="incrementalju/resourceTests/resourceAdded"
-    	pr="54622"
-		title="incremental with addition of resource to inpath jar">
-        <compile 
-			staging="true" 
-			sourceroots="src"
-			options="-incremental"
-			inpath="MyJar.jar">
-       	</compile>
-        <!--
-        <inc-compile tag="20">
-            <dir-changes added="AResourceFile.txt"/>
-        </inc-compile>
-        <run class="Main"/>
-        -->
-    </ajc-test>
-
-
-	<ajc-test dir="incrementalju/resourceTests/resourceRemoved"
-    	pr="54622"
-		title="incremental with removal of resource from inpath jar">
-        <compile 
-			staging="true" 
-			sourceroots="src"
-			options="-incremental"
-			inpath="MyJar.jar">
-       	</compile>
-        <!--
-        <inc-compile tag="20">
-            <dir-changes removed="AResourceFile.txt"/>
-        </inc-compile>
-        <run class="Main"/>
-        -->
-    </ajc-test>
-
-
-	 <ajc-test dir="incrementalju/injarTests/classAdded"
-    	pr="54621"
-		title="incremental with addition of class to inpath jar">
-        <compile 
-			staging="true" 
-			sourceroots="src"
-			options="-incremental"
-			inpath="MyJar.jar">
-       	</compile>
-        <!--
-        <inc-compile tag="20">
-            <dir-changes added="Hello2"/>
-        </inc-compile>
-        <run class="Main"/>
-        -->
-    </ajc-test>
-
-
-	<ajc-test dir="incrementalju/injarTests/classRemoved"
-    	pr="54621"
-		title="incremental with removal of class from inpath jar">
-        <compile 
-			staging="true" 
-			sourceroots="src"
-			options="-incremental"
-			inpath="MyJar.jar">
-       	</compile>
-        <!--
-        <inc-compile tag="20">
-            <dir-changes removed="Hello2"/>
-        </inc-compile>
-        <run class="Main"/>
-        -->
-    </ajc-test>
-
-   <ajc-test dir="incrementalju/injarTests/classAdded"
-    	pr="54621"
-		title="incremental with addition of class to injar jar">
-        <compile 
-			staging="true" 
-			sourceroots="src"
-			options="-incremental,-injars,MyJar.jar">
-       	</compile>
-        <!--
-        <inc-compile tag="20">
-            <dir-changes added="Hello2"/>
-        </inc-compile>
-        <run class="Main"/>
-        -->
-    </ajc-test>
-
-
-	<ajc-test dir="incrementalju/injarTests/classRemoved"
-    	pr="54621"
-		title="incremental with removal of class from injar jar">
-        <compile 
-			staging="true" 
-			sourceroots="src"
-			options="-incremental,-injars,MyJar.jar"
-			inpath="MyJar.jar">
-       	</compile>
-        <!--
-        <inc-compile tag="20">
-            <dir-changes removed="Hello2"/>
-        </inc-compile>
-        <run class="Main"/>
-        -->
-    </ajc-test>
-
-
-
-	 <ajc-test dir="incrementalju/inpathDirTests/classAdded"
-    	pr="54621"
-		title="incremental with addition of class to inpath dir">
-        <compile 
-			staging="true" 
-			sourceroots="src"
-			options="-incremental"
-			inpath="indir">
-       	</compile>
-        <!--
-        <inc-compile tag="20">
-            <dir-changes added="Hello2"/>
-        </inc-compile>
-        <run class="Main"/>
-        -->
-    </ajc-test>
-
-
-	<ajc-test dir="incrementalju/inpathDirTests/classRemoved"
-    	pr="54621"
-		title="incremental with removal of class from inpath dir">
-        <compile 
-			staging="true" 
-			sourceroots="src"
-			options="-incremental"
-			inpath="indir">
-       	</compile>
-        <!--
-        <inc-compile tag="20">
-            <dir-changes removed="Hello2"/>
-        </inc-compile>
-        <run class="Main"/>
-        -->
-    </ajc-test>
-
-	 <ajc-test dir="incrementalju/inpathDirTests/classUpdated"
-    	pr="54621"
-		title="incremental with update of class in inpath dir">
-        <compile 
-			staging="true" 
-			sourceroots="src"
-			options="-incremental"
-			inpath="indir">
-       	</compile>
-        <!--
-        <inc-compile tag="20">
-        </inc-compile>
-        <run class="Main"/>
-        -->
-    </ajc-test>
-    
-    <ajc-test dir="incremental/structureModel"
-      pr="90806"
-      keywords="incremental-test"
-   	  title="NPE in genHandleIdentifier">
-        <compile staging="true"	options="-incremental,-verbose,-emacssym,-1.4" sourceroots="src"/>
-        <!--inc-compile tag="20"/-->
-    </ajc-test>
-    	 
-   <ajc-test dir="bugs/incremental-declare-error" pr="84033"
-   	 title="incremental declare error persists after fix">
-        <compile staging="true" 
-        	options="-incremental,-verbose"
-        	sourceroots="src">
-			<message kind="error" line="6" text="main"/>
-		</compile>
-        <!--inc-compile tag="20"/-->
-        <!--run class="pack.Main"/-->
-    </ajc-test>
-
-   <ajc-test dir="bugs153/pr154054" pr="154054"
-   	 title="incremental update of body in around advice">
-        <compile staging="true" 
-        	options="-incremental,-verbose"
-        	sourceroots="src"/>
-        <!--inc-compile tag="20"/-->
-        <!--run class="MyClass"/-->
-    </ajc-test>
-
-   <ajc-test dir="bugs153/pr154054_2" pr="154054"
-   	 title="incremental update of body in around advice with string">
-        <compile staging="true" 
-        	options="-incremental,-verbose"
-        	sourceroots="src"/>
-        <!--inc-compile tag="30"/-->
-        <!--run class="MyClass"/-->
-    </ajc-test>
-	
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/incremental-tests.xml b/tests/src/test/java/org/aspectj/systemtest/incremental/incremental-tests.xml
deleted file mode 100644
index 1ce24711e..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/incremental/incremental-tests.xml
+++ /dev/null
@@ -1,185 +0,0 @@
-<!-- Incremental compilation Tests -->
-
-     <ajc-test dir="incremental/initialTests/classAdded" 
-    	title="expect class added in initial incremental tests" 
-    	keywords="incremental-test" >
-        <compile staging="true" 
-        	options="-incremental"
-        	sourceroots="."/>
-        <run class="main.Main"/>
-        <inc-compile tag="20" >
-            <dir-changes added="main.Target"/>
-        </inc-compile>
-        <run class="main.Main"  skipTester="true"/>
-    </ajc-test>
-
-    <ajc-test dir="incremental/initialTests/classRemoved" 
-    	title="expect class removed in initial incremental tests" 
-    	keywords="incremental-test" >
-        <compile staging="true" 
-        	options="-incremental" 
-        	sourceroots="."/>
-        <run class="main.Main"/>
-        <inc-compile tag="20">
-            <dir-changes removed="main.Target"/>
-        </inc-compile>
-        <run class="main.Main"/>
-    </ajc-test>
-
-    <ajc-test dir="incremental/initialTests/classUpdated" 
-    	title="expect class updated in initial incremental tests" 
-    	keywords="incremental-test" >
-        <compile staging="true" 
-        	options="-incremental"
-        	sourceroots="."/>
-        <run class="main.Main"/>
-        <inc-compile tag="20">
-            <dir-changes updated="main.Main"/>
-        </inc-compile>
-        <run class="main.Main"/>
-    </ajc-test>
-
-     <ajc-test dir="incremental/initialTests/sourceAdded" 
-    	title="add file with class"
-    	comment="only expecting pickup if sourceroots"    
-    	keywords="incremental-test" >
-        <compile staging="true" 
-        	options="-incremental"
-        	sourceroots="."/>
-        <run class="main.Main"/>
-        <inc-compile tag="20">
-            <dir-changes added="main.Target"/>
-        </inc-compile>
-        <inc-compile tag="30">
-            <dir-changes updated="main.Main"/>
-        </inc-compile>
-        <run class="main.Main"/>
-    </ajc-test>
-
-    <ajc-test dir="incremental/initialTests/sourceDeleted" 
-        title="delete source file before incremental compile"
-        comment="build config should permit file deletions for incremental (sourceroots)"
-        keywords="incremental-test" >
-        <compile staging="true" 
-        	options="-incremental"
-    		sourceroots="."/>
-        <run class="delete.Main"/>
-        <inc-compile tag="20">
-            <dir-changes removed="delete.DeleteMe"/>
-        	<message kind="error" line="6" file="delete/Target.java"/>
-        </inc-compile>
-        <inc-compile tag="30"/> 
-        <run class="delete.Main"/>
-    </ajc-test>
-
-<!-- this test cannot pass with the new AjAttribute.MethodDeclarationLineNumberAttribute
-    <ajc-test dir="incremental/initialTests/expClasses" 
-    	title="expected class tree" >
-        <compile files="Main.java">
-            <dir-changes expDir="expected"/>
-        </compile>
-        <run class="Main"/>
-    </ajc-test>
- -->
-    
-    <ajc-test dir="incremental/initialTests/defaultPackage" 
-    	title="do everything in default package (sourceroots)" 
-    	keywords="incremental-test" >
-        <compile staging="true" 
-        	options="-incremental"
-    		sourceroots="."/>
-        <run class="Main"/>
-        <inc-compile tag="20">
-            <dir-changes added="Target"/>
-        </inc-compile>
-        <run class="Target" skipTester="true"/>
-        <inc-compile tag="30">
-            <dir-changes updated="Main"/>
-        </inc-compile>
-        <run class="Main" skipTester="true"/>
-        <inc-compile tag="40"> 
-			<message kind="error" line="6" file="Main.java"/>
-        </inc-compile>
-        <inc-compile tag="50"/>
-        <run class="Main"/>
-    </ajc-test>
-
-  <ajc-test dir="incremental/defaultPackage"
-    keywords="incremental-test"
-   	title="change sources in default package">
-        <compile 
-        	staging="true"
-        	options="-incremental" 
-        	sourceroots="src"/>
-        <run class="Main"/>
-        <inc-compile tag="20"/>
-        <run class="Main"/>
-    </ajc-test>
-
-   <ajc-test dir="incremental/interPackage"
-    keywords="incremental-test"
-   	title="change source">
-        <compile 
-        	staging="true"
-        	options="-incremental" 
-        	sourceroots="src"/>
-        <run class="app.Main"/>
-        <inc-compile tag="20"/>
-        <run class="app.Main"/>
-    </ajc-test>
-
-
-     <ajc-test dir="incremental/stringliteral"
-    	keywords="incremental-test"
-		title="incrementally change only string literal, still expect advice">
-        <compile staging="true" options="-incremental" 
-        	sourceroots="src"/>
-		<run class="packageOne.Main"
-			options="in packageOne.Main.main(..),
-					 before main packageOne.Main"/>
-        <inc-compile tag="20">
-        	<dir-changes updated="packageOne.Main"/>
-        </inc-compile>
-		<run class="packageOne.Main"
-			options="in longer packageOne.Main.main(..),
-					 before main packageOne.Main"/>
-    </ajc-test>
-
-	<ajc-test dir="incremental/initialTests/aspectSourceAdded" 
-    	title="add aspect source file and check world is rewoven"
-    	keywords="incremental-test" >
-        <compile staging="true" 
-        	options="-incremental"
-        	sourceroots="."/>
-        <inc-compile tag="20">
-            <dir-changes added="Detour"/>
-        </inc-compile>
-        <run class="Main"/>
-    </ajc-test>
-    
-    <ajc-test dir="incremental/initialTests/classWAroundClosureRemoved"
-      title="make sure additional classes generated during weave are deleted with src class file"
-      keywords="incremental-test">
-      <compile staging="true" 
-        	options="-incremental"
-        	sourceroots="."/>
-        <inc-compile tag="20" >
-            <dir-changes removed="AdviceOnIntroduced$AjcClosure1"/>
-        </inc-compile>
-    </ajc-test>
-
-  <ajc-test dir="incremental/full-rebuild"
-    	pr="59895"
-		title="incremental with aspect-driven full rebuild">
-        <compile 
-			staging="true" 
-			sourceroots="src"
-			options="-incremental">
-        	<message kind="error" line="3" file="Aspect.java"/>
-        	</compile>
-        <inc-compile tag="20">
-        	<message kind="warning" line="3" file="Main.java"/>
-        	</inc-compile>
-        <run class="Main"/>
-    </ajc-test>
-	
diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/incremental.xml b/tests/src/test/java/org/aspectj/systemtest/incremental/incremental.xml
deleted file mode 100644
index 39d6a6823..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/incremental/incremental.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[
-<!ENTITY tests SYSTEM "../tests/src/org/aspectj/systemtest/incremental/incremental-junit-tests.xml">
-]>
-<!-- Incremental compilation Tests -->
-
-<suite>
-
-&tests;	
-
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/model/incremental-model-tests.xml b/tests/src/test/java/org/aspectj/systemtest/incremental/model/incremental-model-tests.xml
deleted file mode 100644
index ae9e6be31..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/incremental/model/incremental-model-tests.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-<!-- 
-     In order for these tests to pass you have to flip this flag to true:
-       AsmManager.attemptIncrementalModelRepairs
-       
-     If you want to debug the output from the tests, you might want uncomment
-     the static initializer in AsmManager which will enable you to collect
-     detailed information on model processing.
--->
-
-<!-- 
-     These tests utilise the inc-compile test harness option but I've extended it
-     with a checkModel option which enables me to check information about the model
-     after a incremental compilation step.
--->
-
-<!--
-	asm relationships for inter type declarations are tricky things.  
-	Today, because type mungers don't remember where they came from in attribute form, 
-	the relationships for ITDs are created during source compilation.  When building incrementally,
-	we are really doing a binary weave of 'everything else' with the source for the file that
-	has changed.  In this case the relationships for ITDs are not added.  This makes managing
-	them incrementally in the model rather tough!
-	
-	The solution is to make them remember where they came from.  This would mean we can create
-	the relationships during weave time and so they will be created when either doing a 
-	source compilation or a binary weave.  The support is in ResolvedTypeMunger to remember
-	where they came from (you just have to flick a switch) but I haven't switched it on
-	because we need to version *all* aspectj attributes properly so that we don't end up with 
-	a migration nightmare.  If ITD attributes remembered their location in a particular version
-	of AspectJ then everyone would need to recompile their code from source with that version.
-	If we keep changing the attributes, we keep having this problem.  If we include a *version*
-	number in every attribute we can make the compiler more robust to coping with 'old' attributes
-	that might be missing certain options or values.
-	
-	Hence the first test here is not complete...
-	
--->
-    <ajc-test dir="incremental/model/introduction" 
-    	title="Testing incremental structure model: Intertype declarations (and a declare parents)" 
-    	keywords="incremental-test,model-test" >
-        <compile staging="true" options="-incremental,-emacssym -Xlint:ignore" sourceroots="src"/>
-        <inc-compile tag="20"/> <!-- Just 'touched' one file -->
-        <inc-compile tag="30"/> <!-- Just 'touched another aspect -->
-     </ajc-test>
-     
-	 <ajc-test dir="incremental/model/intertype" 
-    	title="Testing incremental structure model: Intertype field declarations" 
-    	keywords="incremental-test,model-test" >
-        <compile staging="true" options="-incremental,-emacssym" sourceroots="src"/>
-        <inc-compile tag="20" checkModel="inter-type field=2,RelationshipMapSize=3"/> <!-- BetaA intertypes int i and String s -->
-        <inc-compile tag="30" checkModel="inter-type field=1,RelationshipMapSize=2"/> <!-- BetaA takes the String intertype away -->
-     </ajc-test>
-     
-	<ajc-test dir="incremental/model/weaving2" 
-    	title="Testing incremental structure model: Weaving handlers" 
-    	keywords="incremental-test,model-test" >
-        <compile staging="true" options="-incremental,-emacssym, -XnotReweavable" sourceroots="src"/>
-        <inc-compile tag="20" checkModel="code=1,advice=1,RelationshipMapSize=2"/> <!-- BetaA has a new piece of handler advice added -->
-        <inc-compile tag="30" checkModel="code=1,advice=2,RelationshipMapSize=3"/> <!-- secondary.GammaA added, also advises the same handler -->
-        <inc-compile tag="40" checkModel="code=1,advice=1,RelationshipMapSize=2"/> <!-- primary.BetaA deleted -->
-    </ajc-test>
-    
-	<ajc-test dir="incremental/model/weaving" 
-    	title="Testing incremental structure model: Weaving" 
-    	keywords="incremental-test,model-test" >
-        <compile staging="true" options="-incremental,-emacssym" sourceroots="src"/>
-        <inc-compile tag="20" checkModel="code=2,advice=2,java source file=3,RelationshipMapSize=4"/> <!-- BetaA has a new piece of advice added -->
-        <inc-compile tag="30" checkModel="code=1,advice=1,RelationshipMapSize=2"/> <!-- BetaA has a piece of advice removed -->
-        <inc-compile tag="40" checkModel="code=0,RelationshipMapSize=0,advice=0"/> <!-- BetaA other piece of advice removed (now empty) -->
-    </ajc-test>
-
-
-    <ajc-test dir="incremental/model/sourcefiles_updating" 
-    	title="Testing incremental structure model: Updating files"
-    	keywords="incremental-test,model-test" >
-        <compile staging="true" options="-incremental,-emacssym,-Xset:minimalModel=false,-1.4" sourceroots="src"/>
-        <!-- On first compile, 5 source files in model, 'root','Alpha','Beta','Gamma','Delta' -->
-        <inc-compile tag="20" checkModel="java source file=5,method=4,class=3,FileMapSize=4"/> <!-- Beta changed, method added -->
-        <inc-compile tag="30" checkModel="java source file=5,method=4,class=4,advice=1"/> <!-- Delta changed, class added -->
-        <inc-compile tag="40" checkModel="advice=2"/> <!-- Gamma changed, advice added -->
-        <inc-compile tag="50" checkModel="advice=2,pointcut=1"/> <!-- Gamma changed, pointcut added -->
-        <inc-compile tag="60" checkModel="advice=0,pointcut=1"/> <!-- Gamma changed, both advice removed -->
-	</ajc-test>
-	
-	<ajc-test dir="incremental/model/sourcefiles_addremove" 
-    	title="Testing incremental structure model: Adding and removing files" 
-    	keywords="incremental-test,model-test" >
-        <compile staging="true" options="-incremental,-emacssym, -XnotReweavable,-Xset:minimalModel=false" sourceroots="src"/>
-        <!-- On first compile, two source files in model, 'root' and 'Alpha' -->
-        <inc-compile tag="20" checkModel="java source file=3,FileMapSize=2"/> <!-- Adds primary.Beta class -->   
-        <inc-compile tag="30" checkModel="java source file=4"/> <!-- Adds secondary.Gamma aspect -->
-        <inc-compile tag="40" checkModel="java source file=5,package=2,FileMapSize=4"/> <!-- Adds seconday.Delta class -->
-        <inc-compile tag="50" checkModel="java source file=4,package=2"/> <!-- Deletes Gamma aspect -->
-        <inc-compile tag="60" checkModel="java source file=2,FileMapSize=1"/> <!-- Deletes Beta and Delta classes -->
-    </ajc-test>
-       
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/model/incremental-model.xml b/tests/src/test/java/org/aspectj/systemtest/incremental/model/incremental-model.xml
deleted file mode 100644
index 1768ea102..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/incremental/model/incremental-model.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[
-<!ENTITY tests SYSTEM "../tests/src/org/aspectj/systemtest/incremental/model/incremental-model-tests.xml">
-]>
-<!-- Incremental structure model compilation Tests -->
-
-<suite>
-
-&tests;	
-
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbed.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbed.java
index 01426d923..1a2d53c02 100644
--- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbed.java
+++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbed.java
@@ -31,6 +31,7 @@ import org.aspectj.ajdt.internal.core.builder.AjState;
 import org.aspectj.ajdt.internal.core.builder.IncrementalStateManager;
 import org.aspectj.asm.AsmManager;
 import org.aspectj.bridge.IMessage;
+import org.aspectj.testing.util.TestUtil;
 import org.aspectj.tools.ajc.Ajc;
 
 /**
@@ -178,7 +179,7 @@ public class AjdeInteractionTestbed extends TestCase {
 		}
 		MyStateListener.reset();
 		// Create a sandbox in which to work
-		sandboxDir = Ajc.createEmptySandbox();
+		sandboxDir = TestUtil.createEmptySandbox();
 	}
 
 	protected void tearDown() throws Exception {
diff --git a/tests/src/test/java/org/aspectj/systemtest/inpath/inpath-tests.xml b/tests/src/test/java/org/aspectj/systemtest/inpath/inpath-tests.xml
deleted file mode 100644
index 46fe869c1..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/inpath/inpath-tests.xml
+++ /dev/null
@@ -1,297 +0,0 @@
-<!-- InPath Tests -->
-
-    <!-- .................................... -injars tests -->
-
-    <ajc-test dir="options/injars/simple" 
-      title="source for options -injars">
-        <compile files="Simple.java,Main.java"/>
-        <run class="Main"/>
-    </ajc-test>
- 
-    <ajc-test dir="options/injars/simple" 
-      title="options -injars">
-        <compile files="Simple.java,main.jar"
-        	options="!eclipse"/>
-        <run class="Main"/>
-    </ajc-test>
-
-    
-    <ajc-test dir="options/injars/simple"  pr="35865"
-      title="options -injars checking declare parents interactions">
-        <compile files="DecParents.java,main.jar"
-        	options="!eclipse"/>
-        <run class="DecParents"/>
-    </ajc-test>
-    
-  <ajc-test dir="new/options11"  pr="36329"
-   	  comment="the line number might change, we're really interested only in the files here"
-      title="The compiler crashes when using aspect libraries created without using -terminateAfterCompile">
-        <compile files="Main.java,injar.jar,Aspect.java,aspectlib1.jar,aspectlib2.jar">
-            <message kind="error" line="0"/>
-        </compile>
-   </ajc-test>
- 
-    <ajc-test dir="new/binaryWarnings/src" pr="37020"
-   	 title="declare warnings on main">
-        <compile files="aspects/MainWarnings.java,app/Main.java">
-        	<message line="4"  text="staticinitialization(Main)" kind="warning" file="app/Main.java" />
-        	<message line="6"  text="set(String Main.staticString)" kind="warning" file="app/Main.java" />
-        	<message line="8"  text="set(String Main.s)" kind="warning" file="app/Main.java" />
-        	<message line="12" text="get(String Main.staticString)" kind="warning" file="app/Main.java" />
-        	<message line="14" text="set(String Main.staticString)" kind="warning" file="app/Main.java" />
-        	<message line="16" text="call(Main.new())" kind="warning" file="app/Main.java" />
-        	<message line="19" text="call(void Main.go(String))" kind="warning" file="app/Main.java" />
-        	<message line="23" text="initialization(Main.new())" kind="warning" file="app/Main.java" />
-        	<message line="23" text="get(String Main.s)" kind="warning" file="app/Main.java" />
-        	<message line="23" text="set(String Main.s)" kind="warning" file="app/Main.java" />
-        	<message line="26" text="execution(void Main.go(String))" kind="warning" file="app/Main.java" />
-        	<message line="29" text="get(String Main.s)" kind="warning" file="app/Main.java" />
-        	<message line="31" text="set(String Main.s)" kind="warning" file="app/Main.java" />
-        	<message line="32" text="D.go withincode(void Main.go(String))" kind="warning" file="app/Main.java" />
-        	<message line="33" text="handler(RuntimeException)" kind="warning" file="app/Main.java" />
-        	<message line="35" text="withincode(void Main.go(String))" kind="warning" file="app/Main.java" />
-        	<message line="42" text="withincode(void Main.stop())" kind="warning" file="app/Main.java" />
-        	<message line="50" text="preinitialization(app.C.new())" kind="warning" file="app/Main.java" />
-        </compile>
-        <run class="app.Main"/>
-    </ajc-test>
-
-    <ajc-test dir="new/binaryWarnings/src"  pr="37020"
-   	title="declare warnings on binary javac 1.4 classes">
-        <compile files="aspects/MainWarnings.java,../injars/app-javac-1.4.jar">
-        	<message line="6"  text="staticinitialization(Main)" kind="warning" file="app/Main.java" />
-        	<message line="6"  text="set(String Main.staticString)" kind="warning" file="app/Main.java" />
-        	<message line="8"  text="set(String Main.s)" kind="warning" file="app/Main.java" />
-        	<message line="12" text="get(String Main.staticString)" kind="warning" file="app/Main.java" />
-        	<message line="14" text="set(String Main.staticString)" kind="warning" file="app/Main.java" />
-        	<message line="16" text="call(Main.new())" kind="warning" file="app/Main.java" />
-        	<message line="19" text="call(void Main.go(String))" kind="warning" file="app/Main.java" />
-        	<message line="23" text="initialization(Main.new())" kind="warning" file="app/Main.java" />
-        	<message line="23" text="get(String Main.s)" kind="warning" file="app/Main.java" />
-        	<message line="23" text="set(String Main.s)" kind="warning" file="app/Main.java" />
-        	<message line="26" text="execution(void Main.go(String))" kind="warning" file="app/Main.java" />
-        	<message line="29" text="get(String Main.s)" kind="warning" file="app/Main.java" />
-        	<message line="31" text="set(String Main.s)" kind="warning" file="app/Main.java" />
-        	<message line="32" text="D.go withincode(void Main.go(String))" kind="warning" file="app/Main.java" />
-        	<message line="33" text="handler(RuntimeException)" kind="warning" file="app/Main.java" />
-        	<message line="35" text="withincode(void Main.go(String))" kind="warning" file="app/Main.java" />
-        	<message line="42" text="withincode(void Main.stop())" kind="warning" file="app/Main.java" />
-        	<message line="50" text="preinitialization(app.C.new())" kind="warning" file="app/Main.java" />
-        </compile>
-        <run class="app.Main"/>
-    </ajc-test>
-    
-   <ajc-test dir="new/binaryWarnings/src" pr="37023"
-   	title="declare warnings on binary ajc 1.1 classes">
-        <compile files="aspects/MainWarnings.java,../injars/app-ajc-1.1.jar">
-        	<message line="6"  text="staticinitialization(Main)" kind="warning" file="app/Main.java" />
-        	<message line="6"  text="set(String Main.staticString)" kind="warning" file="app/Main.java" />
-        	<message line="8"  text="set(String Main.s)" kind="warning" file="app/Main.java" />
-        	<message line="12" text="get(String Main.staticString)" kind="warning" file="app/Main.java" />
-        	<message line="14" text="set(String Main.staticString)" kind="warning" file="app/Main.java" />
-        	<message line="16" text="call(Main.new())" kind="warning" file="app/Main.java" />
-        	<message line="19" text="call(void Main.go(String))" kind="warning" file="app/Main.java" />
-        	<message line="23" text="initialization(Main.new())" kind="warning" file="app/Main.java" />
-        	<message line="23" text="get(String Main.s)" kind="warning" file="app/Main.java" />
-        	<message line="23" text="set(String Main.s)" kind="warning" file="app/Main.java" />
-        	<message line="26" text="execution(void Main.go(String))" kind="warning" file="app/Main.java" />
-        	<message line="29" text="get(String Main.s)" kind="warning" file="app/Main.java" />
-        	<message line="31" text="set(String Main.s)" kind="warning" file="app/Main.java" />
-        	<message line="32" text="D.go withincode(void Main.go(String))" kind="warning" file="app/Main.java" />
-        	<message line="33" text="handler(RuntimeException)" kind="warning" file="app/Main.java" />
-        	<message line="35" text="withincode(void Main.go(String))" kind="warning" file="app/Main.java" />
-        	<message line="42" text="withincode(void Main.stop())" kind="warning" file="app/Main.java" />
-        	<message line="50" text="preinitialization(app.C.new())" kind="warning" file="app/Main.java" />
-        </compile>
-        <run class="app.Main"/>
-	</ajc-test>
-
-   <ajc-test dir="bugs/lines" pr="37758"
-   	 title="Weaving rt.jar results in stack overflow">
-        <compile files="A.java,big.jar">
- 			<!-- message no longer produced as a result of bug fix 44190
-        	<message kind="warning" text="manifest not copied"/>
-        	-->
-        </compile>
-        <run class="Big"/>
-    </ajc-test>
-
-	<ajc-test dir="bugs/moreInterfaceLibrary"
-		pr="41123"
-		title="Weaving failure when using injars (no jars)">
-		<compile
-			files="lib/ExecutionMonitor.aj,model/BusObj.java,model/MonitorBusObj.java">
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/moreInterfaceLibrary"
-		pr="41123"
-		title="Weaving failure when using injars (on aspectpath)">
-		<compile
-			files="model/BusObj.java,model/MonitorBusObj.java"
-			aspectpath="lib.jar">
-		</compile>
-	</ajc-test>
-
-	<ajc-test dir="bugs/moreInterfaceLibrary"
-		pr="41123"
-		title="Weaving failure when using injars (on classpath)">
-		<compile
-			files="model/BusObj.java,model/MonitorBusObj.java"
-			classpath="lib.jar">
-		    <message kind="error" line="3"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/moreInterfaceLibrary"
-		pr="41123"
-		title="Weaving failure when using injars (actual injars)">
-		<compile
-			files="model/BusObj.java,model/MonitorBusObj.java,lib.jar">
-		    <message kind="error" line="3"/>
-		</compile>
-	</ajc-test>
-
-    <ajc-test dir="bugs/abstractMethods" pr="49784"
-   	 title="Introduced abstract method on interface not implemented by subtype (injars)">
-       <compile files="interface/C.java,interface/jars/AandB.jar"> 
-            <message kind="error" line="1"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs/StringToString" pr="55341"
-	    title="error Type mismatch: cannot convert from java.lang.String to java.lang.String"
-     		comment="make helloworld.jar with 'ajc -outjar helloworld.jar HW.java' or run BcweaverJarMaker"
-     		keywords="">
-        <compile files="X.java" classpath="helloworld.jar">
-        	<message kind="warning" line="3"/>
-        	<message kind="warning" line="7"/>
-        	<message kind="warning" text="needed for privileged"/>
-        </compile>
-    </ajc-test>
-	
-    <ajc-test dir="bugs/systemouts"
-    	pr="57432"
-		title="declare error binary-weaving NPE">
-        <compile files="injar-debug.jar,A.java">
-			<message kind="error" line="12" file="X.java"/>
-			<message kind="error" line="13" file="X.java"/>
-			<message kind="error" line="20" file="X.java"/>
-			<message kind="error" line="22" file="X.java"/>
-			<message kind="error" line="23" file="X.java"/>
-			<message kind="error" line="27" file="X.java"/>
-			<message kind="error" line="28" file="X.java"/>
-			<message kind="error" line="29" file="X.java"/>
-			<message kind="error" line="30" file="X.java"/>
-			<message kind="error" line="31" file="X.java"/>
-			<message kind="error" line="32" file="X.java"/>
-			<message kind="error" line="33" file="X.java"/>
-			<message kind="error" line="34" file="X.java"/>
-			<message kind="error" line="35" file="X.java"/>
-			<message kind="error" line="36" file="X.java"/>
-			<message kind="error" line="37" file="X.java"/>
-			<message kind="error" line="38" file="X.java"/>
-			<message kind="error" line="39" file="X.java"/>
-			<message kind="error" line="40" file="X.java"/>
-			<message kind="error" line="41" file="X.java"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs/systemouts"
-    	pr="57432"
-		title="declare error binary-weaving NPE">
-        <compile files="injar-nodebug.jar,A.java">
-			<message kind="error" line="0"/>
-        </compile>
-    </ajc-test>
-	
-	<ajc-test dir="bugs/tooManyErrors"
-    	pr="58679"
-		title="Regression from 1.1: NPE in CompilationResult">
-        <compile files="Joinpoints101.jar,DecErrors.aj">
-         
-          <message kind="error" line="10"/><message kind="error" line="11"/>
-          <message kind="error" line="12"/><message kind="error" line="13"/>
-          <message kind="error" line="14"/>
-
-          <message kind="error" line="16"/><message kind="error" line="17"/>
-          <message kind="error" line="18"/><message kind="error" line="19"/>
-          <message kind="error" line="20"/>
- 
-          <message kind="error" line="22"/><message kind="error" line="23"/>
-          <message kind="error" line="24"/><message kind="error" line="25"/>
-          <message kind="error" line="26"/>
- 
-          <message kind="error" line="28"/><message kind="error" line="29"/>
-          <message kind="error" line="30"/><message kind="error" line="31"/>
-          <message kind="error" line="32"/>
-  
-          <message kind="error" line="34"/><message kind="error" line="35"/>
-          <message kind="error" line="36"/><message kind="error" line="37"/>
-          <message kind="error" line="38"/>
- 
-          <message kind="error" line="40"/><message kind="error" line="41"/>
-          <message kind="error" line="42"/><message kind="error" line="43"/>
-          <message kind="error" line="44"/>
-          
-          <message kind="error" line="46"/><message kind="error" line="47"/>
-          <message kind="error" line="48"/><message kind="error" line="49"/>
-          <message kind="error" line="50"/>
- 
-          <message kind="error" line="52"/><message kind="error" line="53"/>
-          <message kind="error" line="54"/><message kind="error" line="55"/>
-          <message kind="error" line="56"/>
-  
-          <message kind="error" line="58"/><message kind="error" line="59"/>
-          <message kind="error" line="60"/><message kind="error" line="61"/>
-          <message kind="error" line="62"/>
- 
-          <message kind="error" line="64"/><message kind="error" line="65"/>
-          <message kind="error" line="66"/><message kind="error" line="67"/>
-          <message kind="error" line="68"/>
-          
-          <message kind="error" line="70"/><message kind="error" line="71"/>
-          <message kind="error" line="72"/><message kind="error" line="73"/>
-          <message kind="error" line="74"/>
- 
-          <message kind="error" line="76"/><message kind="error" line="77"/>
-          <message kind="error" line="78"/><message kind="error" line="79"/>
-          <message kind="error" line="80"/>
-  
-          <message kind="error" line="82"/><message kind="error" line="83"/>
-          <message kind="error" line="84"/><message kind="error" line="85"/>
-          <message kind="error" line="86"/>
- 
-          <message kind="error" line="88"/><message kind="error" line="89"/>
-          <message kind="error" line="90"/><message kind="error" line="91"/>
-          <message kind="error" line="92"/>
-          
-          <message kind="error" line="94"/><message kind="error" line="95"/>
-          <message kind="error" line="96"/><message kind="error" line="97"/>
-          <message kind="error" line="98"/>
- 
-          <message kind="error" line="100"/><message kind="error" line="101"/>
-          <message kind="error" line="102"/><message kind="error" line="103"/>
-          <message kind="error" line="104"/>
-  
-          <message kind="error" line="106"/><message kind="error" line="107"/>
-          <message kind="error" line="108"/><message kind="error" line="109"/>
-          <message kind="error" line="110"/>
- 
-          <message kind="error" line="112"/><message kind="error" line="113"/>
-          <message kind="error" line="114"/><message kind="error" line="115"/>
-          <message kind="error" line="116"/>
-          
-          <message kind="error" line="118"/><message kind="error" line="119"/>
-          <message kind="error" line="120"/><message kind="error" line="121"/>
-          <message kind="error" line="122"/>
-  
-          <message kind="error" line="124"/><message kind="error" line="125"/>
-          <message kind="error" line="126"/><message kind="error" line="127"/>
-          <message kind="error" line="128"/>
- 
-          <message kind="error" line="130"/>
-          
-        </compile>
-    </ajc-test>
- 
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/inpath/inpath.xml b/tests/src/test/java/org/aspectj/systemtest/inpath/inpath.xml
deleted file mode 100644
index 2c0eac4c7..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/inpath/inpath.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[
-<!ENTITY tests SYSTEM "../tests/src/org/aspectj/systemtest/inpath/inpath-tests.xml">
-]>
-
-<!-- InPath Tests -->
-
-<suite>
-
-&tests;
-
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/java14/java14-tests.xml b/tests/src/test/java/org/aspectj/systemtest/java14/java14-tests.xml
deleted file mode 100644
index 364c28e4f..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/java14/java14-tests.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<!-- Java 1.4 Specific Tests -->
-
-  <ajc-test dir="pureJava" title="assert flow"
-      keywords="from-14tests,purejava">
-        <compile options="-source,1.4" files="AssertsCF.java">
-            <message kind="error" line="8"/>
-            <message kind="error" line="11"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" title="assert flow - 2"
-      keywords="from-14tests,purejava">
-        <compile options="-source,1.4" files="AssertsCF2.java">
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" title="assert typing"
-      keywords="from-14tests,purejava,fail-publicType">
-        <compile options="-source,1.4" files="AssertsCF1.java">
-            <message kind="error" line="5"/>
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="pureJava" title="compiling asserts in methods"
-      keywords="from-14tests,purejava">
-        <compile options="-source,1.4" files="AssertInMethod.java"/>
-        <run class="AssertInMethod" vm="1.4"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" title="asserts" keywords="from-14tests">
-        <compile options="-source,1.4" files="Asserts.java"/>
-        <run class="Asserts" vm="1.4"/>
-    </ajc-test>
-    
-    <ajc-test dir="pureJava" pr="725"
-      title="asserts in aspect and declared methods [requires 1.4]"
-      keywords="from-14tests" comment="not pure java!">
-        <compile options="-source,1.4"
-          files="IntroducedAssertion.java"/>
-        <run class="IntroducedAssertion" vm="1.4"/>
-    </ajc-test>
-
-    <!-- This test case requires bytecode generated according to the declaring type
-        rules in JLS 2nd edition.  -1.4 must be passed to the eclipse compiler for
-        this behavior. -->
-    <ajc-test dir="new"
-      title="Does the matrix coverage thing for the new method signatures"
-      keywords="from-resolved_10x">
-        <compile files="MethodSignatures.java" options="-1.4,-Xlint:ignore"/>
-        <run class="MethodSignatures" vm="1.4"/>
-    </ajc-test>  
-
-    <!-- This test case requires bytecode generated according to the declaring type
-        rules in JLS 2nd edition.  -1.4 must be passed to the eclipse compiler for
-        this behavior. -->
-    <ajc-test dir="new" title="correct types of parameters at call-sites"
-      keywords="from-resolved_10x">
-        <compile files="CallTypes.java" options="-1.4,-Xlint:ignore"/>
-        <run class="CallTypes" vm="1.4"/>
-    </ajc-test>
-
-    <!-- This test case requires bytecode generated according to the declaring type
-        rules in JLS 2nd edition.  -1.4 must be passed to the eclipse compiler for
-        this behavior.  That means that this case will only work under 1.4.  -->
-    <ajc-test dir="new"
-      title="target type matching with messy interface hierarchies"
-      keywords="from-resolved_10x">
-        <compile files="CallTypesI.java" options="-1.4,-Xlint:ignore"/>
-        <run class="CallTypesI" vm="1.4"/>
-    </ajc-test>
- 
-      <ajc-test dir="new" title="assert tests in introduction [requires 1.4]"
-      keywords="from-14tests,fail-unimplemented">
-        <compile options="-source,1.4" files="AssertInIntro.java"/>
-        <run class="AssertInIntro" vm="1.4"/>
-    </ajc-test>
-
- 
-    <ajc-test dir="base/test131"
-      title="various forms of package name pattern matching work"
-      keywords="from-broken14usejavac">
-        <compile files="Driver.java,p1/C1.java,p1/p2/C2.java" />
-        <run class="Driver"/>
-    </ajc-test>
-
-     <ajc-test dir="new" pr="657"
-      title="assert statement in advice coverage [requires 1.4]"
-      keywords="from-14tests,fail-in-eclipse">
-        <compile options="-source,1.4" files="AssertInAdvice.java"/>
-        <run class="AssertInAdvice" vm="1.4"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="657"
-      title="assert statement in advice  [requires 1.4]" 
-      keywords="from-14tests,fail-in-eclipse">
-        <compile options="-source,1.4" files="AssertInAdviceBug.java"/>
-        <run class="AssertInAdviceBug" vm="1.4"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs" pr="28703" title="assert and pertarget crashes compiler">
-        <compile files="EnsureOverriding.java" options="-source,1.4"/>
-        <run class="EnsureOverriding" vm="1.4"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs/interSpecials" title="testing that assert works like .class"
-      pr="36110">
-        <compile files="p1/C.java,p2/A2.java" options="-source,1.4"/>
-        <run class="p2.A2" vm="1.4"/>
-    </ajc-test>
-
-   <ajc-test dir="bugs/jpOptimization" 
-    	pr="45441"
-    	title="JoinPoint Optimization when targetting 1.4">
-        <compile 
-        	files="de/test/MyMain.java,
-        		   de/test/MyAspect.java"
-            options="-1.4"/>
-        <run class="de.test.MyMain"/>
-    </ajc-test>
-
-	<ajc-test dir="bugs"
-		title="XLint warning for call PCD's using subtype of defining type (-1.4 -Xlint:ignore)"
-		pr="41952"
-		>
-		<compile
-			options="-Xlint:ignore,-1.4" 
-			files="DeclaringTypeWarning.java" >
-            <message kind="warning" line="12"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs"
-		title="XLint warning for call PCD's using subtype of defining type (-1.4)"
-		pr="41952"
-		>
-		<compile
-			options="-1.4" 
-			files="DeclaringTypeWarning.java" >
-			<message kind="warning" line="6" text="declaring type">
-				<source line="14" file="DeclaringTypeWarning.java"/>
-			</message>
-			<message kind="warning" line="12" text="declare warning">
-				<source line="19" file="DeclaringTypeWarning.java"/>
-			</message>
-		</compile>
-	</ajc-test>
- 
-    <ajc-test dir="bugs" pr="39711"
-   	 title="Class Literals as non final fields (also assert, and this$0)">
-        <compile files="ClassLiteralField.java" options="-source,1.4"/>
-        <run vm="1.4" class="ClassLiteralField"/>
-    </ajc-test>
- 
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/java14/java14.xml b/tests/src/test/java/org/aspectj/systemtest/java14/java14.xml
deleted file mode 100644
index c25b999cf..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/java14/java14.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[
-<!ENTITY tests SYSTEM "../tests/src/org/aspectj/systemtest/java14/java14-tests.xml">
-]>
-
-<!-- Tests requiring JDK 1.4 or above -->
-
-<suite>
-
-&tests;
-
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/knownfailures/knownfailures.xml b/tests/src/test/java/org/aspectj/systemtest/knownfailures/knownfailures.xml
deleted file mode 100644
index e2e2343dc..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/knownfailures/knownfailures.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[
-]>
-
-<!-- AspectJ v1.5.0 Tests -->
-
-<suite>
-    
-    <ajc-test dir="bugs150/pr90588"
-		pr="90588" title="NullPointerException in jdt when using generics and inpath">
-        <compile files="AbstractClass.java,ConcreteClass.java">
-        </compile>
-    </ajc-test>
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/knownlimitations/knownLimitations-tests.xml b/tests/src/test/java/org/aspectj/systemtest/knownlimitations/knownLimitations-tests.xml
deleted file mode 100644
index d420885de..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/knownlimitations/knownLimitations-tests.xml
+++ /dev/null
@@ -1,297 +0,0 @@
-<!-- Known Limitations -->
-
-	<!-- we're not implementing static inter-type fields on interfaces in 1.1 -->
-    <ajc-test dir="knownLimitations/test117" title="DEPRECATED: introduce of variables"
-      keywords="from-base,knownLimitation">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-	<!-- we're not implementing this error check in 1.1 -->
-    <ajc-test dir="errors"
-      title="checking the contra-variant errors for typing of proceed"
-      keywords="from-errors,knownLimitation">
-        <compile files="BadAround.java">
-            <message kind="error" line="12"/>
-            <message kind="error" line="15"/>
-            <message kind="error" line="18"/>
-            <message kind="error" line="19"/>
-            <message kind="error" line="22"/>
-        </compile>
-    </ajc-test>
-
-	<!-- we're not implementing static inter-type fields on interfaces in 1.1 -->
-    <ajc-test dir="design/intro"
-      title="introduction of static methods and fields on classes and interfaces"
-      keywords="from-design,knownLimitation">
-        <compile files="Statics.java"/>
-        <run class="Statics"/>
-    </ajc-test>
-
-	<!-- only before advice implemented for handler join points in 1.1 -->
-    <ajc-test dir="new" title="advice on catch clauses"
-      keywords="from-resolved_10x,knownLimitation">
-        <compile files="CatchAdvice.java"/>
-        <run class="CatchAdvice"/>
-    </ajc-test>
-
-	<!-- we will handle this by signalling a weave-time error for any around
-	     advice that is applied to a join point which throws checked exceptions
-	     that it can't handle.  proceeds in closures change the exceptions that
-	     around advice can handle to include the greatest lower bound of the
-	     checked exceptions that are legally throwable by the proceed.
-	     Ideally their should be an -Xlint compile-time warning for ALL 
-	     cases that could produce weave-time errors.
-	-->
-    <ajc-test dir="new" title="holding onto proceed calls in a closure-like way"
-      keywords="from-resolved_10x,knownLimitation">
-        <compile files="HoldProceed.java"/>
-        <run class="HoldProceed"/>
-    </ajc-test>
-
-	<!-- around advice not implemented on initializer join points -->
-    <ajc-test dir="new" pr="490"
-      title="PR#458 Compiler was incorrectly flagging error in advice on initialization and static initialization"
-      keywords="from-resolved_10x,knownLimitation">
-        <compile files="StaticInitCE.java"/>
-        <run class="StaticInitCE"/>
-    </ajc-test>
-
-	<!-- This behavior is different from 1.0, but we might want to consider allowing it
-	     Using the eclipse compiler it would be much easier to permit than forbid. -->
-    <ajc-test dir="new/introTypeMissing"
-      title="Introduced type unavailable to instanceof expressions in introduced methods"
-      keywords="from-resolved_10x,knownLimitation">
-        <compile files="InstanceOf.java,TargetClass.java,Util.java">
-            <message kind="error" line="19"/>
-            <message kind="error" line="20"/>
-            <message kind="error" line="21"/>
-            <message kind="error" line="22"/>
-            <message kind="error" line="23"/>
-            <message kind="error" line="24"/>
-            <message kind="error" line="25"/>
-            <message kind="error" line="26"/>
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="new"
-      title="enclosing join point not exported properly in pre-initialization join point"
-      keywords="from-resolved_10x,knownLimitation">
-        <compile files="PreInitialization.java"/>
-        <run class="PreInitialization"/>
-    </ajc-test>
-
-	<!-- pointcuts aren't checked for circularities unless they're used -->
-    <ajc-test dir="new" pr="568" title="cyclic pointcut definitions"
-      keywords="from-resolved_10rc3,knownLimitation">
-        <compile files="CyclicPointcuts.java">
-            <message kind="error" line="11"/>
-            <message kind="error" line="14"/>
-            <message kind="error" line="18"/>
-            <message kind="error" line="32"/>
-            <message kind="error" line="43"/>
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="new"
-      title="package typepattern with no packages (in default package)"
-      keywords="from-resolved_105,knownLimitation">
-        <compile options="-Xlint" files="TypeNames.java">
-            <message kind="warning" line="34"/>
-            <message kind="warning" line="39"/>
-            <message kind="warning" line="43"/>
-            <message kind="warning" line="47"/>
-        </compile>
-        <run class="TypeNames"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="764"
-      title="flag errors when binding args with indeterminate prefix and suffix"
-      keywords="from-resolved_105,knownLimitation">
-        <compile files="IndeterminateArgsCE.java">
-            <message kind="error" line="67"/>
-            <message kind="error" line="68"/>
-            <message kind="error" line="70"/>
-            <message kind="error" line="72"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="design/around"
-      title="around and return types + inlining optimizations"
-      comment="-XOcodeSize not in 1.1, source uses 1.4 APIs"
-      keywords="from-14tests,knownLimitation">
-        <compile options="-XOcodeSize,-source,1.4"
-          files="ReturnCastProceed.java,StackChecker.java">
-            <message kind="warning" line="68"/>
-        </compile>
-        <run class="ReturnCastProceed" vm="1.4"/>
-    </ajc-test>
-
-   <ajc-test dir="new" pr="885" keywords="knownLimitation"
-      comment="this behaves differently in 1.3 from 1.4 for unknown reasons, merge with above when resolved"
-      title="source locations within expressions (hard case of constructor start)">
-        <compile files="SourceLocationWithinExprHard.java"/>
-        <run class="SourceLocationWithinExprHard"/>
-    </ajc-test>
-
-   <!-- Can't handle packages named 'aspect' in parser
-    -->
-    <ajc-test dir="new/PR852" pr="852"
-      title="declaring method on superclass and subclass"
-      keywords="knownLimitation">
-        <compile files="aspect/Aspect.java,target/SubClass.java,target/SuperClass.java">
-          <dir-changes added="target.SubClass,target.SuperClass"/>
-        </compile>
-        <run class="aspect.Aspect"/>
-    </ajc-test>
-
-   <ajc-test dir="new" pr="660" title="illegal name binding in around cflow"
-      keywords="from-resolved_104,knownLimitation">
-        <compile files="ArgsInCflowCf.java">
-            <message kind="error" line="19"/>
-            <message kind="error" line="29"/>
-            <message kind="error" line="35"/>
-        </compile>
-    </ajc-test>
-
-     <ajc-test dir="incremental/stringliteral"   
-    	keywords="knownLimitation"
-    	title="incrementally change string size and wire in injar classes">
-        <compile staging="true" options="-incremental" 
-        	files="oneInjar.jar,twoInjar.jar"
-        	sourceroots="src"/>
-		<run class="packageOne.Main"
-			options="in packageOne.Main.main(..),
-					 before main packageOne.Main"/>
-        <inc-compile tag="20">
-        	<dir-changes updated="packageOne.Main"/>
-        </inc-compile>
-        <!-- now failing here.  This step passes in non-injar variant. -->
-		<run class="packageOne.Main"
-			options="in longer packageOne.Main.main(..),
-					 before main packageOne.Main"/>
-        <inc-compile tag="30">
-        	<dir-changes added="RunInjarMains"/>
-        </inc-compile>
-		<run class="packageOne.Main"
-			options="in longer packageOne.Main.main(..),
-					 before main InjarOneMain,
-					 before main InjarTwoMain,
-					 before main packageOne.Main"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs" pr="34206" 
-    	keywords="knownLimitation"
-    	title="before():execution(new(..)) does not throw NoAspectBoundException"
-    	comment="correct behavior of this case needs to be thought through">
-        <compile files="AspectInitError.java"/>
-        <run class="AspectInitError"/>
-    </ajc-test>
-    
-  <ajc-test dir="new/binaryWarnings/src" pr="37020"
-   	keywords="knownLimitation"
-   	comment="source loc of binary jp depends on first code, not block start"
-   	title="declare error on handler/method execution with no code on binary ajc 1.1 classes">
-        <compile files="aspects/MainExecStartLinesErrors.java,../injars/appStartLines-ajc-1.1.jar">
-        	<message kind="error" file="app/MainExecStartLines.java"
-        	  line="6" text="execution(void MainExecStartLines.main(String[]))"/>
-        	<message kind="error" file="app/MainExecStartLines.java"
-        	  line="17" text="handler(RuntimeException)"/>        	  
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="new/binaryWarnings/src" pr="37020"
-   	keywords="knownLimitation"
-   	comment="source loc of binary jp depends on first code, not block start; XXX need javac inlining example"
-   	title="declare error on handler/method execution with no code on binary javac 1.4 classes">
-        <compile files="aspects/MainExecStartLinesErrors.java,../injars/appStartLines-javac-1.4.jar">
-        	<message kind="error" file="app/MainExecStartLines.java"
-        	  line="6" text="execution(void MainExecStartLines.main(String[]))"/>
-        	<message kind="error" file="app/MainExecStartLines.java"
-        	  line="17" text="handler(RuntimeException)"/>        	  
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="harness" 
-    	keywords="command-line-error,knownLimitation"
-    	comment="can't test -help: has to abort, but returns 0, normal status"    
-		title="CLE: -help usage">
-        <compile  badInput="true" options="-help">
-            <message kind="abort" text="Usage"/>
-        </compile>
-    </ajc-test>
-
-     <!-- The next three tests are all about the same issue.  The source
-         line for a constructor execution is returned as the first executable
-         line within the constructor-execution join point rather than the declaration
-         line of the constructor.  Any other definition will require collusion between
-         the source->bytecode compiler and the weaver and will only work in
-         those case where such collusion is possible.
-    -->
-
-    <ajc-test dir="new/binaryWarnings/src" pr="37020" keywords="knownLimitation"
-   	 title="declare warnings on main - constructor execution">
-        <compile files="aspects/ConstructorExecutionWarning.java,app/Main.java">
-        	<message kind="warning" file="app/Main.java"
-        	  line="23" text="execution(Main.new())"/>
-        </compile>
-        <run class="app.Main"/>
-    </ajc-test>
-
-    <ajc-test dir="new/binaryWarnings/src" pr="37020" keywords="knownLimitation"
-   	 title="declare warnings on binary javac 1.4 main - constructor execution">
-        <compile files="aspects/ConstructorExecutionWarning.java,../injars/app-javac-1.4.jar">
-        	<message kind="warning" file="app/Main.java"
-        	  line="23" text="execution(Main.new())"/>
-        </compile>
-        <run class="app.Main"/>
-    </ajc-test>
-
-    <ajc-test dir="new/binaryWarnings/src" pr="37020" keywords="knownLimitation"
-   	 title="declare warnings on binary ajc 1.1 main - constructor execution">
-        <compile files="aspects/ConstructorExecutionWarning.java,../injars/app-ajc-1.1.jar">
-        	<message kind="warning" file="app/Main.java"
-        	  line="23" text="execution(Main.new())"/>
-        </compile>
-        <run class="app.Main"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs/handlers" pr="37898" keywords="knownLimitation"
-		title="advice on handler join points should not throw unpermitted checked exceptions">
-        <compile files="ExceptionCheckCE.java">
-			<message kind="warning" line="8" text="expected"/>
-			<message kind="error" line="25" text="throw checked exception" />
-			<message kind="error" line="8" text="throw checked exception" />
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="harness" pr="38134" keywords="knownLimitation"
-   		comment="behavior is correct for 1.1 - revisit for 1.2"
-        title="-nowarn suppresses XLint warnings">
-        <compile files="XLintWarningTest.java" options="-nowarn"/>
-    </ajc-test>
-
-   <ajc-test dir="harness" pr="38134" keywords="knownLimitation"
-   		comment="behavior is correct for 1.1 - revisit for 1.2"
-        title="warn:none suppresses XLint warnings">
-        <compile files="XLintWarningTest.java" options="-warn:none"/>
-    </ajc-test>
-
-    <ajc-test dir="harness" pr="38134" keywords="knownLimitation"
-   		comment="behavior is correct for 1.1 - revisit for 1.2"
-        title="-nowarn suppresses declare warnings">
-        <compile files="WarningTest.java" options="-nowarn"/>
-    </ajc-test>
-
-    <ajc-test dir="harness" pr="38134" keywords="knownLimitation"
-   		comment="behavior is correct for 1.1 - revisit for 1.2"
-        title="-warn:none suppresses declare warnings">
-        <compile files="WarningTest.java" options="-warn:none"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs" pr="38168" keywords="knownLimitation"
-   	 title="insertion of lots of advice code can make branch offset for if too large">
-        <compile files="WideJumps.java"/>
-        <run class="WideJumps"/>
-    </ajc-test>
-  
diff --git a/tests/src/test/java/org/aspectj/systemtest/knownlimitations/knownLimitations.xml b/tests/src/test/java/org/aspectj/systemtest/knownlimitations/knownLimitations.xml
deleted file mode 100644
index 25d99f6e4..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/knownlimitations/knownLimitations.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[
-<!ENTITY tests SYSTEM "../tests/src/org/aspectj/systemtest/knownlimitations/knownLimitations-tests.xml">
-]>
-
-<!-- Known Limitations -these tests will fail -->
-
-<suite>
-
-&tests;
-  
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/model/model.xml b/tests/src/test/java/org/aspectj/systemtest/model/model.xml
deleted file mode 100644
index 811b78254..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/model/model.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<!-- Model and Hierarchy Tests -->
-<suite>
-<!-- non-AspectJ 5 specific tests -->
-
-    <ajc-test dir="model/pr238054" title="multiple identical jps on one line">
-        <compile files="pr238054.aj" options="-emacssym"/>
-    </ajc-test> 
-
-
-
-    <ajc-test dir="model/pr77269_1" title="advice in structure model with anonymous inner class">
-        <compile files="pack/pr77269.aj" options="-emacssym -Xset:minimalModel=false"/>
-    </ajc-test> 
-
-    <ajc-test dir="model/pr77269_2" title="advice in structure model with named inner class">
-        <compile files="pr77269b.aj" options="-emacssym -Xset:minimalModel=false"/>
-    </ajc-test> 
-
-    <ajc-test dir="model/pr77269_3" title="declare warning in structure model with anonymous inner class">
-        <compile files="pack/pr77269c.aj" options="-emacssym -Xset:minimalModel=false">
-        	<message kind="warning" line="8" text="blah blah blah"/>
-        </compile>
-    </ajc-test> 
-
-    <ajc-test dir="model/pr145963_1" title="sourcelocation and jar file">
-      <compile files="C.java, SourceAspect.aj" aspectpath="simple.jar" options="-emacssym">
-		<message kind="warning" line="6" text="There should be no printlns"/>
-	  </compile>
-    </ajc-test>
-
-    <ajc-test dir="model/pr145963_2" title="sourcelocation and class file">
-      <compile files="C.java, SourceAspect.aj" aspectpath="pkg" options="-emacssym">
-		<message kind="warning" line="6" text="There should be no printlns"/>
-	  </compile>
-    </ajc-test>
-
-   <ajc-test dir="model/pr145963_3" title="aspect in default package">
-      <compile files="C.java" aspectpath="simple.jar" options="-emacssym -Xset:minimalModel=false">
-		<message kind="warning" line="6" text="There should be no printlns"/>
-	</compile>
-    </ajc-test>
-
-   <ajc-test dir="model/pr145963_4" title="aspect in java file">
-      <compile files="C.java" aspectpath="simple.jar" options="-emacssym -Xset:minimalModel=false">
-		<message kind="warning" line="6" text="There should be no printlns"/>
-	</compile>
-    </ajc-test>
-    
-    <ajc-test dir="model/pr141730_1" title="new iprogramelement methods">
-      <compile files="pr141730.aj" options="-emacssym"/>
-    </ajc-test>
-
-	<ajc-test dir="model/pr141730_3" title="ensure aspectpath injar relationships are correct when not filling in model">
-      <compile files="MyFoo.java" aspectpath="aspectpath.jar" options="-emacssym"/>
-    </ajc-test>
-
-	<ajc-test dir="model/pr148027" title="ensure pcd declare in class appears in model">
-      <compile files="A.aj, C.aj" options="-emacssym"/>
-    </ajc-test>
-
-	<ajc-test dir="model/pr160469_1" title="ensure advice from abstract aspects appear correctly in the model">
-      <compile files="Simple.java" options="-emacssym" aspectpath="aspects.jar"/>
-    </ajc-test>
-
-	<ajc-test dir="model/pr160469_2" title="ensure deow from abstract aspects appear correctly in the model">
-      <compile files="Simple.java" options="-emacssym -Xset:minimalModel=false" aspectpath="aspects.jar">
-		<message kind="warning" line="5" text="warning"/>
-      </compile>
-    </ajc-test>
-
-<!-- AspectJ 5 specific tests -->
-
-	<ajc-test dir="model/pr115607" title="declare at type appears correctly in structure model">
-        <compile files="pr115607.java" options="-1.5,-emacssym,-Xset:minimalModel=false"/>
-    </ajc-test>
-
-    <ajc-test dir="model/pr131932" title="structure model for generic itd">
-        <compile files="pr131932.aj" options="-1.5 -emacssym"/>
-    </ajc-test>
-
-    <ajc-test dir="model/pr132130" title="declare annotation appears in structure model when in same file">
-        <compile files="pr132130.aj" options="-1.5 -emacssym -Xset:minimalModel=false"/>
-    </ajc-test>
-    
-    <ajc-test dir="model/pr120356" title="@AJ deow appear correctly when structure model is generated">
-        <compile files="C.java, A.java" options="-1.5, -emacssym -Xset:minimalModel=false">
-         <message kind="error" line="8" text="error"/>
-         <message kind="warning" line="5" text="warning"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="model/pr143924" title="declare @method relationship">
-     <compile files="pr143924.aj" options="-1.5 -showWeaveInfo -emacssym -Xset:minimalModel=false">
-        <message kind="weave" text="'public void BankAccount.debit(String,long)' (pr143924.aj:7) is annotated with @Secured"/>
-     </compile>
-    </ajc-test>
-    
-    <ajc-test dir="model/pr141730_2" title="new iprogramelement methods for generics">
-      <compile files="pr141730.aj" options="-1.5 -emacssym"/>
-    </ajc-test>
-
-	<ajc-test dir="model/pr141730_4" title="ensure inpath injar relationships are correct when not filling in model">
-      <compile files="MyBar.aj, MyAnnotation.java, NewClass.java" inpath="inpath.jar" options="-1.5 -emacssym -Xset:minimalModel=false">
-			<message kind="warning" line="20" text="System.out should not be called"/>
-	  </compile>
-    </ajc-test>
-    
-    <ajc-test dir="model/prX" title="inpath advised elements">
-      <compile files="X.java" inpath="inpath.jar" options="-1.5 -emacssym"/>
-    </ajc-test>
-
-
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/options/options-tests.xml b/tests/src/test/java/org/aspectj/systemtest/options/options-tests.xml
deleted file mode 100644
index d109cd2d0..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/options/options-tests.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!-- Options Tests -->
-
-    <!-- .................................... option tests -->
-    <!-- .................................... -warn tests -->
-      <ajc-test dir="options/deprecated" 
-      title="options -warn:deprecation">
-        <compile files="WarnDeprecated.java,OldStuff.java"
-        	options="!eclipse,-warn:deprecation">
-            <message kind="warning" line="10"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="options/deprecated" 
-      title="options -warn:deprecation not enabled">
-        <compile files="WarnDeprecated.java,OldStuff.java"
-        	options="!eclipse">
-        </compile>
-    </ajc-test>
- 
-  
-   <ajc-test dir="harness" 
-        title="setting -warn:constructorName works">
-        <compile files="ConstructorNameWarning.java" 
-        	options="-warn:constructorName">
-        	<message kind="warning" line="5" text="constructor name"/>
-    	</compile>
-    </ajc-test>
- 
-     <ajc-test dir="bugs/deprecated" pr="54098"
-    	title="-deprecation not working?" >
-    	 <compile files="Deprecation.java, Deprecated.java" options="-deprecation">
-            <message kind="warning" line="5"/>
-            <message kind="warning" line="6"/>
-        </compile>
-    </ajc-test>
-    
- 
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/options/options.xml b/tests/src/test/java/org/aspectj/systemtest/options/options.xml
deleted file mode 100644
index d877da040..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/options/options.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[
-<!ENTITY tests SYSTEM "../tests/src/org/aspectj/systemtest/options/options-tests.xml">
-]>
-<!-- Options Tests -->
-
-<suite>
-
-&tests;    
- 
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/pre10x/pre10x-tests.xml b/tests/src/test/java/org/aspectj/systemtest/pre10x/pre10x-tests.xml
deleted file mode 100644
index 9b0837dbe..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/pre10x/pre10x-tests.xml
+++ /dev/null
@@ -1,638 +0,0 @@
-<!-- AspectJ v0.8 - 0.99 Tests -->
-
-
-    <ajc-test dir="pureJava" title="Using 'aspect' as identifier is legal TODO"
-      keywords="from-java" comment="keep this test in main suite">
-        <compile files="KeywordAspect.java"/>
-        <run class="KeywordAspect"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="Using 'pointcut' as identifier is legal TODO"
-      keywords="from-java" comment="keep this test in main suite">
-        <compile files="KeywordPointcut.java"/>
-        <run class="KeywordPointcut"/>
-    </ajc-test>
-
-    <ajc-test dir="new/introTypeMissing"
-      title="CF expected when enclosing class superclass used as this qualifier in inner class"
-      keywords="from-java">
-        <compile files="TargetClassCF.java,Util.java">
-            <message kind="error" line="22"/>
-            <message kind="error" line="23"/>
-            <message kind="error" line="27"/>
-            <message kind="error" line="28"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new/introTypeMissing"
-      title="enclosing class may be used as this qualifier in inner class"
-      keywords="from-java">
-        <compile files="TargetClassCP.java,Util.java"/>
-        <run class="TargetClassCP"/>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="reasonable error for crosscut reference with no formals specified"
-      keywords="from-errors">
-        <compile files="NoFormalsCrosscut.java">
-            <message kind="error" line="6"/>
-            <message kind="error" line="7"/>
-            <message kind="error" line="8"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="reasonable error for introduction on type whose source isn't found"
-      keywords="from-errors">
-        <compile files="NoSource.java">
-            <message kind="error" line="4"/>
-        </compile>
-    </ajc-test>
-
-
-    <ajc-test dir="errors"
-      title="handle errors in crosscut designators, insist that they end with a semicolon"
-      keywords="from-errors">
-        <compile files="BadDesignator.java">
-            <message kind="error" line="4"/>
-        </compile>
-    </ajc-test>
-
-
-    <ajc-test dir="errors"
-      title="try to return from a before, after, after throwing and after returning"
-      keywords="from-errors">
-        <compile files="InvalidReturn.java">
-            <message kind="error" line="12"/>
-            <message kind="error" line="16"/>
-            <message kind="error" line="19"/>
-            <message kind="error" line="22"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" pr="130"
-      title="the designator has a wildcard for method name but no return type specified"
-      keywords="from-errors">
-        <compile files="NoReturnTypeInDesignator.java">
-            <message kind="error" line="6"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="the designator for the introduction has no type after the | charcter"
-      keywords="from-errors">
-        <compile files="BadIntroductionDesignator.java">
-            <message kind="error" line="6"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" pr="140" title="crosscut signature does not match"
-      keywords="from-errors">
-        <compile files="BadCCutSig.java">
-            <message kind="error" line="8"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="proper exit conditions when errors fall through to javac"
-      keywords="from-errors">
-        <compile files="FromJavac.java">
-            <message kind="error" line="11"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" pr="213"
-      title="mismatched parens on advice (wasn't binding Tester)"
-      keywords="from-errors">
-        <compile files="MismatchedParens.java">
-            <message kind="error" line="16"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" pr="209" title="Non-static advice silently ignored"
-      keywords="from-errors">
-        <compile files="BadPointcutName.java">
-            <message kind="error" line="15"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" pr="219" title="extra closing brace"
-      keywords="from-errors">
-        <compile files="ExtraClosingBrace.java">
-            <message kind="error" line="8"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" pr="244"
-      title="decent errors for around return type not matching target point"
-      keywords="from-errors">
-        <compile files="AroundReturnType.java" options="-1.4">
-            <message kind="error" line="2"/>
-            <message kind="error" line="6"/>
-            <message kind="error" line="7"/>
-            <message kind="error" line="16"/>
-            <message kind="error" line="21"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="eachobject: can't call new on an aspect of"
-      keywords="from-errors">
-        <compile files="CantCallConstructorOnAspects.java">
-            <message kind="error" line="4"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="eachobject: only zero-argument constructors allowed in an aspect"
-      keywords="from-errors,fail-unimplemented">
-        <compile files="AspectsCantHaveYesArgumentConstructors.java">
-            <message kind="error" line="8"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="eachobject: can't extend a concrete aspect"
-      keywords="from-errors,fail-unimplemented">
-        <compile files="SubAspectsCantExtendNonAbstractAspects.java">
-            <message kind="error" line="14"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" pr="271" title="instanceof used without a class"
-      keywords="from-errors">
-        <compile files="InstanceofWithoutClass.java">
-            <message kind="error" line="14"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" pr="280" title="wildcard used for returns clause"
-      keywords="from-errors">
-        <compile files="WildcardForReturns.java">
-            <message kind="error" line="17"/>           
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" pr="280" title="no return statement in around advice"
-      keywords="from-errors,new-messages-vary">
-        <compile files="NoReturnStatement.java">
-            <message kind="error" line="14"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" pr="286"
-      title="inner aspects must be static (no longer matches PR#286)"
-      keywords="from-errors,fail-unimplemented">
-        <compile files="AbstractAspectOf.java">
-            <message kind="error" line="12"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="Casting class declarations as interfaces"
-      keywords="from-errors">
-        <compile files="InterfaceCast.java">
-            <message kind="error" line="14"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="omits a variable name and crashes with a null pointer"
-      keywords="from-errors">
-        <compile files="BindingNullPointer.java">
-            <message kind="error" line="7"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="Not generating an error for using new as a method name"
-      keywords="from-errors">
-        <compile files="New.java">
-            <message kind="error" line="12"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="ClassCastException on the int literal"
-      keywords="from-errors">
-        <compile files="IntLiteral.java">
-            <message kind="error" line="17"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Wrong strictfp keyword usage in interface function prototype [TODO: move to errors]"
-      keywords="from-errors">
-        <compile files="StrictFpCErr1.java">
-            <message kind="error" line="3"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Wrong strictfp keyword usage in field declaration [TODO: move to errors]"
-      keywords="from-errors">
-        <compile files="StrictFpCErr2.java">
-            <message kind="error" line="3"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Wrong strictfp keyword usage in constructor declaration [TODO: move to errors]"
-      keywords="from-errors">
-        <compile files="StrictFpCErr3.java">
-            <message kind="error" line="3"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="Incorrect static casts to primitively foldable arguments should not crash the compiler."
-      keywords="from-errors">
-        <compile files="BadStaticCast.java">
-            <message kind="error" line="5"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="Dominates with commas should signal an error."
-      keywords="from-errors">
-        <compile files="DominatesWithCommas.java">
-            <message kind="error" line="9"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" pr="95"
-      title="stack overflow with recursive crosscut specifier"
-      keywords="from-errors">
-        <compile files="RecursiveCCutSpecifier.java">
-            <message kind="error" line="10"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="Throwing a NullPointerException when formals can't be bound in named pointcut"
-      keywords="from-errors">
-        <compile files="BadFormalsToCalls.java">
-            <message kind="error" line="22"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" pr="385"
-      title="disallow defining more than one pointcut with the same name"
-      keywords="from-errors,fail-unimplemented">
-        <compile files="OverloadedPointcuts.java">
-            <message kind="error" line="4"/>
-            <message kind="error" line="5"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="pre 0.7 introduction form outside aspect body causes an EmptyStackException"
-      keywords="from-errors">
-        <compile files="BadIntroduction.java">
-            <message kind="error" line="1" />
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="a class can't extend an aspect"
-      keywords="from-errors,fail-unimplemented">
-        <compile files="ClassExtendingAspect.java">
-            <message kind="error" line="19"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="a before() clause at the class-level causes an EmptyStackException"
-      keywords="from-errors">
-        <compile files="TopLevelBefore.java">
-            <message kind="error" line="1"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="an after() clause at the class-level causes an EmptyStackException"
-      keywords="from-errors">
-        <compile files="TopLevelAfter.java">
-            <message kind="error" line="1"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="an around() clause at the class-level causes an EmptyStackException"
-      keywords="from-errors">
-        <compile files="TopLevelAround.java">
-            <message kind="error" line="1"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="Doesn't detect cyclic inheritance of aspects."
-      keywords="from-errors">
-        <compile files="CircularExtendsAspect.java">
-            <message kind="error" line="18"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="Binds the pointcut formals to member variables instead of pointcut formals."
-      keywords="from-errors">
-        <compile files="PointcutFormals.java" options="-Xlint:warning">
-            <message kind="error" line="14"/>
-            <message kind="error" line="15"/>
-            <message kind="warning" line="16"/>
-            <message kind="warning" line="17"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="ambiguous formal in formals pattern"
-      keywords="from-errors">
-        <compile files="AmbiguousFormal.java">
-            <message kind="error" line="6"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="good error for field name instead of type name"
-      keywords="from-errors">
-        <compile files="BadTypeName.java">
-            <message kind="error" line="2"/>
-            <message kind="error" line="4"/>
-            <message kind="error" line="6"/>
-            <message kind="error" line="8"/>
-            <message kind="error" line="10"/>
-            <message kind="error" line="12"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="errors in aspect inheritance - 1"
-      keywords="from-errors">
-        <compile files="AspectInheritance1.java">
-            <message kind="error" line="17"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="errors in aspect inheritance - 2"
-         keywords="from-errors">
-        <compile files="AspectInheritance2.java">
-            <message kind="error" line="8"/>
-            <message kind="error" line="16"/>
-            <message kind="error" line="20"/>
-            <message kind="error" line="26"/>
-            <message kind="error" line="30"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="errors in aspect inheritance - 3"
-      keywords="from-errors">
-        <compile files="AspectInheritance3.java">
-            <message kind="error" line="19"/>
-            <message kind="error" line="24"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="errors in aspect inheritance - 4"
-      keywords="from-errors">
-        <compile files="AspectInheritance4.java">
-            <message kind="error" line="17"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="circular dominates leading to irresolvable advice precedence"
-      keywords="from-errors">
-        <compile files="CircularDominates.java" options="-1.4">
-            <message kind="error" line="12"/>
-            <message kind="error" line="16"/>
-            <message kind="error" line="20"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="Should issue an error for using 'class' instead of 'aspect'"
-      keywords="from-errors">
-        <compile files="NoAspect.java">
-            <message kind="error" line="1" text="Syntax error on token &quot;{&quot;, ; expected"/>
-            <message kind="error" line="12" text="Syntax error on token &quot;{&quot;, pointcut expected after this token"/>
-            <message kind="error" line="12" text="Syntax error, insert &quot;;&quot; to complete ClassBodyDeclarations"/>
-            <message kind="error" line="12" text="Syntax error on token &quot;{&quot;, delete this token"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="Should signal an error when we need an exposed value but don't provide it"
-      keywords="from-errors">
-        <compile files="MissingExposure.java">
-            <message kind="error" line="13"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="StackOverFlowException with circular +implements's."
-      keywords="from-errors">
-        <compile files="CircularPlusImplementsIntros.java">
-            <message kind="error" line="19"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="Introducing protected methods is causing a crash"
-      keywords="from-errors">
-        <compile files="ProtectedIntro.java">
-            <message kind="error" line="14"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="Introducing protected fields is causing a crash"
-      keywords="from-errors">
-        <compile files="ProtectedFieldIntro.java">
-            <message kind="error" line="14"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" pr="388"
-      title="two classes with the same fully-qualified names [eachjvm]"
-      keywords="from-errors"
-      comment="XXX error not flagging initial type">
-        <compile files="DuplicatedNames.java">
-            <message kind="error" line="3"/>
-            <message kind="error" line="5"/>
-            <message kind="error" line="7"/>
-            <message kind="error" line="9"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" pr="396"
-      title="Undefined pointcuts were throwing exceptions in 07b11 [callsto]"
-      keywords="from-errors">
-        <compile files="UndefinedPointCut_PR396.java">
-            <message kind="error" line="8"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" pr="240" title="advice on abstract pointcuts"
-      keywords="from-errors">
-        <compile files="StaticAdviceOnAbstract.java">
-            <message kind="error" line="17"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="Whoops, I forgot to put a class in the field access PCD."
-      keywords="from-errors">
-        <compile files="BadGetPCD.java">
-            <message kind="error" line="5"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" pr="138"
-      title="the arounds return something but there is no returns statement"
-      keywords="from-errors">
-        <compile files="MissingReturns.java">
-            <message kind="error" line="14"/>
-            <message kind="error" line="20"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="multiple conflicting introductions"
-      keywords="from-errors">
-        <compile files="MultipleIntros.java">
-            <message kind="error" line="5"/>
-            <message kind="error" line="16"/>
-            <message kind="error" line="18"/>
-            <message kind="error" line="19"/>
-            <message kind="error" line="22"/>
-            <message kind="error" line="27"/>
-            <message kind="error" line="30"/>
-            <!-- new error due to 275032 - other end of itd clash has error recorded against it -->
-            <message kind="error" line="7"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="referencing non-static pointcuts in outer aspects"
-      keywords="from-errors">
-        <compile files="StaticPointcutRefs.java">
-            <message kind="error" line="8"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="javac correct compiler error if there is no return in around returning result"
-      keywords="from-errors">
-        <compile files="NoReturnInProceed.java">
-            <message kind="error" line="16"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="should give an error for introducing two members with the same name"
-      keywords="from-errors">
-        <compile files="TwoIntros.java">
-            <message kind="error" line="10"/>
-            <message kind="error" line="14"/>
-            <message kind="error" line="16"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="wimpy test for undeclared and uncaught exceptions"
-      keywords="from-errors">
-        <compile files="UndeclaredThrows.java">
-            <message kind="error" line="12"/>
-            <message kind="error" line="18"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Given non-matching TypePattern, CE flags use of non-introduced method rather than failure to introduce"
-      keywords="from-errors">
-        <compile
-          files="typepatternmatch/pack1/IntroErrorLocation.java,typepatternmatch/pack2/TargetClass.java">
-            <message kind="error" line="28"
-              file="pack1/IntroErrorLocation.java"
-              text="TargetClass cannot be resolved"/>
-            <message kind="warning" line="33"
-              file="pack1/IntroErrorLocation.java"
-              text="no match for this type name: TargetClass"/>
-            <message kind="error" line="39"
-              file="pack1/IntroErrorLocation.java"
-              text="undefined for the type TargetClass"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="457"
-      title="Compiler should suggest using aspect when advice, pointcuts, or introduction is in a class"
-      keywords="from-errors,poorErrorMessages">
-        <compile files="RecognizeAspectCE.java">
-            <message kind="error" line="3"  
-            	file="RecognizeAspectCE.java"
-            	text="Syntax error on token &quot;}&quot;, pointcut expected after this token"/>
-            <message kind="error" line="2"  
-            	file="RecognizeAspectCE.java"
-            	text="Syntax error"/>
-            <message kind="error" line="6"  
-            	file="RecognizeAspectCE.java"
-            	text="Syntax error"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="declare error working with pointcut and-not (amp,amp,bang)"
-      keywords="from-errors">
-        <compile files="DeclareError.java">
-            <message kind="error" line="5"/>
-            <message kind="error" line="19"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="534"
-      title="aspect as member of interface (private and protected)"
-      keywords="from-errors">
-        <compile files="AspectInInterfaceCF.java">
-            <message kind="error" line="11"/>
-            <message kind="error" line="14"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="494"
-      title="introduced inner interfaces - compile should fail to bind interface name outside of Aspect or if implementing method is not public"
-      keywords="from-errors">
-        <compile files="IntroduceInnerInterfaceCF.java" options="-Xlint:ignore">
-            <message kind="error" line="18"/>
-            <message kind="error" line="19"/>
-            <message kind="error" line="20"/>
-            <message kind="error" line="24"/>
-            <message kind="error" line="42"/>
-            <message kind="error" line="45"/>
-            <message kind="error" line="48"/>
-            <message kind="error" line="50"/>
-            <message kind="error" line="58"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="aspects may not implement Serializable or Cloneable"
-      keywords="from-errors">
-        <compile files="AspectInterfaces.java">
-            <message kind="error" line="4"/>
-            <message kind="error" line="5"/>
-            <message kind="error" line="9"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="explicit constructor calls can throw exceptions"
-      keywords="from-errors">
-        <compile files="ExplicitConstructorThrows.java">
-            <message kind="error" line="3"/>
-            <message kind="error" line="12"/>
-            <message kind="error" line="18"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" pr="664" title="bad proceed args good error messages"
-      keywords="from-errors">
-        <compile files="ProceedArgsCE.java">
-            <message kind="error" line="13"/>
-            <message kind="error" line="16"/>
-            <message kind="error" line="19"/>
-        </compile>
-    </ajc-test>
-
-
diff --git a/tests/src/test/java/org/aspectj/systemtest/pre10x/pre10x.xml b/tests/src/test/java/org/aspectj/systemtest/pre10x/pre10x.xml
deleted file mode 100644
index cfaa7480d..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/pre10x/pre10x.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[
-<!ENTITY tests SYSTEM "../tests/src/org/aspectj/systemtest/pre10x/pre10x-tests.xml">
-]>
-<!-- AspectJ v0.8 - 0.99 Tests -->
-
-<suite>
-
-&tests;
-
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/purejava/pureJava-tests.xml b/tests/src/test/java/org/aspectj/systemtest/purejava/pureJava-tests.xml
deleted file mode 100644
index 9864ffe79..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/purejava/pureJava-tests.xml
+++ /dev/null
@@ -1,1894 +0,0 @@
-<!-- Pure Java Tests -->
-
-    <ajc-test dir="pureJava/test120" title="unicodes and literals"
-      keywords="from-base,purejava">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-   <ajc-test dir="pureJava/test126" title="For Statement"
-      keywords="from-base,purejava">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-    
-    <ajc-test dir="pureJava/test133"
-      title="correct super call lookup for method().name()"
-      keywords="from-base,purejava">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="99"
-      title="combined logic expression (handling coericions vs. parens)"
-      keywords="from-java,purejava">
-        <compile files="CombinedLogic.java"/>
-        <run class="CombinedLogic"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="99"
-      title="comment after class closes (with no new line at end)"
-      keywords="from-java,purejava">
-        <compile files="CommentAfterClass.java"/>
-        <run class="CommentAfterClass"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="108" title="multi-dimensional array initializers"
-      keywords="from-java,purejava">
-        <compile files="MultiArrays.java"/>
-        <run class="MultiArrays"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="125"
-      title="probelm with the generated names of exceptions"
-      keywords="from-java,purejava">
-        <compile files="ExceptionNames.java"/>
-        <run class="ExceptionNames"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="109"
-      title="checks if the class field can be used on all of the primitive types"
-      keywords="from-java,purejava">
-        <compile files="ClassFieldOnPrimitiveType.java"/>
-        <run class="ClassFieldOnPrimitiveType"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Doesn't parse an array-returning method that throws an exception"
-      keywords="from-java,purejava">
-        <compile files="ArrayMethod.java"/>
-        <run class="ArrayMethod"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="check that nested constructions of local classes work"
-      keywords="from-java,purejava">
-        <compile files="NestedConstructionsOfLocalClasses.java"/>
-        <run class="NestedConstructionsOfLocalClasses"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="Make sure anonymous classes can have non-nullary constructors"
-      keywords="from-java,purejava">
-        <compile files="NonNullaryAnonymous.java"/>
-        <run class="NonNullaryAnonymous"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="417"
-      title="Full names are dropped from inner interfaces"
-      keywords="from-java,purejava">
-        <compile files="PR417a.java"/>
-        <run class="PR417a"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="417"
-      title="Making sure full names stay on static inner classes"
-      keywords="from-java,purejava">
-        <compile files="PR417b.java"/>
-        <run class="PR417b"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="408"
-      title="Not binding constructor when using more than one compilation"
-      keywords="from-java,purejava">
-        <compile files="OuterAbstract_PR408.java"/>
-        <compile files="ExtendsOuterAbstract_PR408.java"/>
-        <compile files="ConstructorNotFound_PR408.java"/>
-        <run class="ConstructorNotFound_PR408"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" title="return;;; is not really legal"
-      keywords="from-java,purejava">
-        <compile files="ReachableEmpty.java">
-            <message kind="error" line="5"/>
-            <message kind="error" line="9"/>
-            <message kind="error" line="13"/>
-            <message kind="error" line="17"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="ajc treating Throwable as checked, issuing error if not found"
-      keywords="from-java,purejava">
-        <compile files="FalseThrowsCE.java"/>
-        <run class="FalseThrowsCE"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="328"
-      title="package protected classes becoming public"
-      keywords="from-java,purejava">
-        <compile files="PR328.java"/>
-        <run class="PR328"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="IOException on windows if nul used as identifier"
-      keywords="from-java,purejava">
-        <compile files="NulIOException.java">
-            <message kind="error" line="12"/>
-            <message kind="error" line="14"/>
-            <message kind="error" line="17"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="NullPointerException (not compiler error) when extending non-static inner class"
-      keywords="from-java,purejava">
-        <compile files="ExtendInnerCE.java">
-            <message kind="error" line="3"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="compiler flags final static variable as indefinite in member assignment."
-      keywords="from-java,purejava">
-        <compile files="DefiniteStatic.java"/>
-        <run class="DefiniteStatic"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="confirm no IOException on windows if nul used as identifier"
-      keywords="from-java,purejava">
-        <compile files="NulIOException2.java"/>
-        <run class="NulIOException2"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="final constructor parameter causes incorrect compiler error"
-      keywords="from-java,purejava">
-        <compile files="FinalConstructorParm.java"/>
-        <run class="FinalConstructorParm"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Error expected for field of type void"
-      keywords="from-java,purejava">
-        <compile files="VoidField.java">
-            <message kind="error" line="2"/>
-            <message kind="error" line="4"/>
-            <message kind="error" line="6"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Error expected for constructor in interfaces"
-      keywords="from-java,purejava">
-        <compile files="InterfaceConstructor.java">
-            <message kind="error" line="2"/>
-            <message kind="error" line="6"/>
-            <message kind="error" line="8"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="558"
-      title="class name for identifier as String should provoke error"
-      keywords="from-java,purejava">
-        <compile files="PR558.java">
-            <message kind="error" line="4"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="567"
-      title="cyclic interface inheritance not detected if no classes implement the interfaces"
-      keywords="from-java,purejava,messages-vary">
-        <compile files="CyclicInterfaceInheritance.java" 
-               options="!eclipse">
-            <message kind="error" line="14"/>
-            <message kind="error" line="15"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="567" title="cyclic class inheritance"
-      keywords="from-java,purejava">
-        <compile files="CyclicClassInheritance.java">
-            <message kind="error" line="11"/>
-            <message kind="error" line="12"/>
-        </compile>
-    </ajc-test>
-
-    <!-- broken test - both javac and eclipse give error on line 35 -->
-    <!--
-    <ajc-test dir="pureJava" title="Type names are not expressions on their own"
-      keywords="from-java,purejava">
-        <compile files="TypeExprErrors.java">
-            <message kind="error" line="10"/>
-            <message kind="error" line="17"/>
-            <message kind="error" line="18"/>
-            <message kind="error" line="19"/>
-            <message kind="error" line="20"/>
-            <message kind="error" line="21"/>
-            <message kind="error" line="22"/>
-            <message kind="error" line="23"/>
-            <message kind="error" line="24"/>
-            <message kind="error" line="25"/>
-            <message kind="error" line="26"/>
-            <message kind="error" line="27"/>
-            <message kind="error" line="28"/>
-            <message kind="error" line="29"/>
-            <message kind="error" line="30"/>
-            <message kind="error" line="31"/>
-            <message kind="error" line="32"/>
-            <message kind="error" line="33"/>
-            <message kind="error" line="34"/>
-            <message kind="error" line="36"/>
-            <message kind="error" line="37"/>
-        </compile>
-    </ajc-test>
-    -->
-
-    <ajc-test dir="pureJava/nameConflicts"
-      title="type and package name conflicts are resolved happily (1a)"
-      keywords="from-java,purejava">
-        <compile files="p1/Main1.java,p1/Foo.java,p1/p2.java"/>
-        <run class="p1.Main1"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava/nameConflicts"
-      title="(fails in USEJAVAC) type and package name conflicts are resolved happily (1b)"
-      keywords="from-java,purejava">
-        <compile files="p1.java,p1/p2/Foo.java"/>
-        <compile files="p1/Main1.java,p1/Foo.java,p1/p2.java"/>
-        <run class="p1.Main1"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava/nameConflicts"
-      title="type and package name conflicts caught as errors (1)"
-      keywords="from-java,purejava">
-        <compile files="p1/p2.java,p1/Main1.java,p1/Foo.java,p1/p2/Foo.java">
-            <message kind="error" line="3"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="flow analysis where final variable set in another constructor"
-      keywords="from-java,purejava">
-        <compile files="ConstructorFlow.java"/>
-        <run class="ConstructorFlow"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="584"
-      title="Can construct inner classes using qualified expressions"
-      keywords="from-java,purejava">
-        <compile files="PR584.java"/>
-        <run class="PR584"/>
-    </ajc-test>
-
-    <ajc-test dir="new/protectedStatic" pr="585"
-      title="subclass unable to access protected static methods using type-qualified references"
-      keywords="from-java,purejava">
-        <compile files="SubClass.java,pack/SuperClass.java"/>
-        <run class="SubClass"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="588" title="Undefined inner class constructor"
-      keywords="from-java,purejava">
-        <compile files="UndefinedInner.java">
-            <message kind="error" line="6"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new/packagePrefix" pr="574"
-      title="classes that are package prefixes are illegal"
-      keywords="from-java,purejava,messages-vary">
-        <compile files="p/prefix.java,p/prefix/SomeClass.java"
-               options="!eclipse">
-            <message kind="error" line="2"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new/introTypeMissing"
-      title="valid type expressions for introduced type testing"
-      keywords="from-java,purejava">
-        <compile files="TargetClass.java,Util.java"/>
-        <run class="TargetClass"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="PR591 compiler error expected when directly calling unimplemented abstract method using super"
-      keywords="from-java,purejava">
-        <compile files="AbstractMethodCall.java">
-            <message kind="error" line="10"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="suggested by Jacks 15.28-qualified-namestr tests"
-      keywords="from-java,purejava,messages-vary">
-        <compile files="NonConstants.java" 
-               options="!eclipse">
-            <message kind="error" line="13"/>
-            <message kind="error" line="14"/>
-            <message kind="error" line="15"/>
-            <message kind="error" line="16"/>
-            <message kind="error" line="17"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="suggested by jacks 3.7-15 all comments must be closed"
-      keywords="from-java,purejava">
-        <compile files="OpenComment.java">
-            <message kind="error" line="7"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new/classaccess"
-      title="package class access not enforced outside of package"
-      keywords="from-java,purejava">
-        <compile files="main/Main.java,pack1/Target.java">
-            <message kind="error" line="7"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="631" title="expecting CE for ambiguous reference"
-      keywords="from-java,purejava">
-        <compile files="AmbiguousClassReference.java">
-            <message kind="error" line="11"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="643" title="try without catch or finally"
-      keywords="from-java,purejava,message-vary">
-        <compile files="TryNoCatchCE.java"
-               options="!eclipse">
-            <message kind="error" line="6"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="642" title="invalid floating-point constant"
-      keywords="from-java,purejava,messages-vary">
-        <compile files="ParsingFloatCE.java"
-               options="!eclipse">
-            <message kind="error" line="5"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new/subaspects" pr="647"
-      title="concrete aspect unable to access abstract package-private method in parent for overriding"
-      keywords="from-java,purejava,messages-vary"
-      comment="XXX fix source - package-private">
-        <compile files="parent/ParentMethodCE.java,child/ChildMethodCE.java"
-               options="!eclipse">
-            <message kind="warning" line="28"/>
-            <message kind="error" line="27"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="super reference used to disambiguate names of different but compatible types"
-      keywords="from-java,purejava">
-        <compile files="SuperDisambiguatingType.java"/>
-        <run class="SuperDisambiguatingType"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" title="anonymous explicit inner constructors"
-      keywords="from-java,purejava">
-        <compile files="QualifiedNewCP.java"/>
-        <run class="QualifiedNewCP"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="Overruning the lineStarts buffer, DO NOT EDIT THIS FILE!!!!"
-      keywords="from-java,purejava">
-        <compile files="AJError.java"/>
-        <run class="AJError"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="701" title="no CE for unambiguous type reference"
-      keywords="from-java,purejava">
-        <compile files="UnambiguousClassReference3CP.java"/>
-        <run class="UnambiguousClassReference3CP"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="701"
-      title="CE for ambiguous type reference (imports)"
-      keywords="from-java,purejava">
-        <compile files="AmbiguousClassReference2CE.java">
-            <message kind="error" line="2"/>
-            <message kind="error" line="10"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="701"
-      title="CE for ambiguous type reference (two type declarations)"
-      keywords="from-java,purejava,messages-vary">
-        <compile files="AmbiguousClassReference3CE.java"
-               options="!eclipse">
-            <message kind="error" line="10"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="701"
-      title="CE for ambiguous type reference (two inner types)"
-      keywords="from-java,purejava,messages-vary">
-        <compile files="AmbiguousClassReference4CE.java"
-               options="!eclipse">
-            <message kind="error" line="10"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="709" title="final assignment in loop"
-      keywords="from-java,purejava">
-        <compile files="FinalInLoop.java"/>
-        <run class="FinalInLoop"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" title="private super access in inners"
-      keywords="from-java,purejava">
-        <compile files="PrivateSuperInnerAccess.java"/>
-        <run class="PrivateSuperInnerAccess"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="nested interface does not require new qualifier (8)"
-      keywords="from-java,purejava">
-        <compile files="InvalidNewQualifier8CE.java">
-            <message kind="error" line="8"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="nested interface does not require new qualifier (9)"
-      keywords="from-java,purejava">
-        <compile files="InvalidNewQualifier9CE.java">
-            <message kind="error" line="9"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="nested interface does not require new qualifier (10)"
-      keywords="from-java,purejava">
-        <compile files="InvalidNewQualifier10CE.java">
-            <message kind="error" line="10"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="nested interface does not require new qualifier (14)"
-      keywords="from-java,purejava">
-        <compile files="InvalidNewQualifier14CE.java">
-            <message kind="error" line="14"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="nested interface does not require new qualifier (15)"
-      keywords="from-java,purejava">
-        <compile files="InvalidNewQualifier15CE.java">
-            <message kind="error" line="15"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="nested interface does not require new qualifier (16)"
-      keywords="from-java,purejava">
-        <compile files="InvalidNewQualifier16CE.java">
-            <message kind="error" line="16"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="check that constructor name's match the enclosing type"
-      keywords="from-errors,purejava">
-        <compile files="BadConstructorName.java">
-            <message kind="error" line="4"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="errors for not applicable or accessible methods"
-      keywords="from-errors,purejava">
-        <compile files="MethodsNotFound.java">
-            <message kind="error" line="4"/>
-            <message kind="error" line="8"/>
-            <message kind="error" line="12"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" pr="218"
-      title="import statement within class body crashes compiler"
-      keywords="from-errors,purejava">
-        <compile files="ImportWithinClassBody.java">
-            <message kind="error" line="8"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="Accessing instance fields and instance methods statically."
-      keywords="from-errors,purejava">
-        <compile files="AccessingInstanceFieldsStatically.java">
-            <message kind="error" line="15"/>
-            <message kind="error" line="16"/>
-            <message kind="error" line="17"/>
-            <message kind="error" line="18"/>
-            <message kind="error" line="26"/>
-            <message kind="error" line="27"/>
-            <message kind="error" line="30"/>
-            <message kind="error" line="38"/>
-            <message kind="error" line="39"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="Crashes when a cast is within another cast"
-      keywords="from-errors,purejava">
-        <compile files="CastInCast.java">
-            <message kind="error" line="9"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="Crashes when a cast of the form )int) appears"
-      keywords="from-errors,purejava,messages-vary">
-        <compile files="BadCast.java"
-               options="!eclipse">
-            <message kind="error" line="9"/>
-            <message kind="error" line="10"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="Crashes when the closing brace is reversed"
-      keywords="from-errors,purejava,messages-vary">
-        <compile files="ClosingBrace.java"
-               options="!eclipse">
-            <message kind="error" line="11"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="Crashes when a method name is missing in a call -- e.g. 'System.out.();'"
-      keywords="from-errors,purejava">
-        <compile files="NoMethodName.java">
-            <message kind="error" line="9"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="Crashes when a bad r-value appears."
-      keywords="from-errors,purejava">
-        <compile files="BadValue.java">
-            <message kind="error" line="9"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="Two underscores as a variables causes a crash"
-      keywords="from-errors,purejava">
-        <compile files="BadVar.java">
-            <message kind="error" line="9"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="Crashes when assigning to a final static in an intializer and declaration"
-      keywords="from-errors,purejava">
-        <compile files="FinalStatic.java">
-            <message kind="error" line="13"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="Crashes when two dots appear instead of one"
-      keywords="from-errors,purejava">
-        <compile files="TwoDots.java">
-            <message kind="error" line="9"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="Crashes when there're stray dots"
-      keywords="from-errors,purejava">
-        <compile files="StrayDot.java">
-            <message kind="error" line="9"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="Stray characters cause a crash"
-      comment="XXX public class in wrong file"
-      keywords="from-errors,purejava">
-        <compile files="StraySlash.java">
-            <message kind="error" line="9"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="Colon instead of a semi-colon causes a crash"
-      comment="XXX public class in wrong file"
-      keywords="from-errors,purejava">
-        <compile files="Colon.java">
-            <message kind="error" line="9"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="type error in initializer caught by ajc, not javac"
-      keywords="from-errors,purejava">
-        <compile files="ArrayInitializerType.java">
-            <message kind="error" line="2"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="Circular inheritance with classes causes a stack overflow."
-      keywords="from-errors,purejava">
-        <compile files="CircularExtends.java">
-            <message kind="error" line="7"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="Missing ;" keywords="from-errors,purejava">
-        <compile files="PR405.java">
-            <message kind="error" line="15"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="cast expressions should not allow casts between ifaces and array types"
-      keywords="from-errors,purejava">
-        <compile files="InterfaceArrayCast.java">
-            <message kind="error" line="9"/>
-            <message kind="error" line="10"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="parsing errors for various bad forms of NewArrayExprs."
-      keywords="from-errors,purejava">
-        <compile files="BadNewArrayExprs.java">
-            <message kind="error" line="4"/>
-            <message kind="error" line="5"/>
-            <message kind="error" line="6"/>
-            <message kind="error" line="7"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="good error for bad field and inner class references"
-      keywords="from-errors,purejava">
-        <compile files="BadReferences.java">
-            <message kind="error" line="3"/>
-            <message kind="error" line="5"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="Implementing a non-interface used to crash the compiler."
-      keywords="from-errors,purejava">
-        <compile files="PR333.java">
-            <message kind="error" line="6"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="error of no return statement detected not by ajc but by javac (line 4)"
-      keywords="from-errors,purejava">
-        <compile files="NoReturnStatementSimple.java">
-            <message kind="error" line="4"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="class and interface extension"
-      keywords="from-errors,purejava,messages-vary">
-        <compile files="BadExtension.java"
-               options="!eclipse">
-            <message kind="error" line="7"/>
-            <message kind="error" line="9"/>
-            <message kind="error" line="16"/>
-            <message kind="error" line="17"/>
-            <message kind="error" line="18"/>
-            <message kind="error" line="19"/>
-            <message kind="error" line="21"/>
-            <message kind="error" line="35"/>
-            <message kind="error" line="38"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="types in throws clauses"
-      keywords="from-errors,purejava">
-        <compile files="ThrowsClause.java">
-            <message kind="error" line="2"/>
-            <message kind="error" line="4"/>
-            <message kind="error" line="13"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="bad switch syntax"
-      keywords="from-errors,purejava">
-        <compile files="Switch.java">
-            <message kind="error" line="4"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="Referencing various things from static contexts"
-      keywords="from-errors,purejava">
-        <compile files="StaticContexts.java">
-            <message kind="error" line="11"/>
-            <message kind="error" line="18"/>
-            <message kind="error" line="19"/>
-            <message kind="error" line="20"/>
-            <message kind="error" line="21"/>
-            <message kind="error" line="27"/>
-            <message kind="error" line="28"/>
-            <message kind="error" line="31"/>
-            <message kind="error" line="35"/>
-            <message kind="error" line="36"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="Some expressions are illegal expression statements"
-      keywords="from-errors,purejava">
-        <compile files="BadExpressionStatement.java">
-            <message kind="error" line="3"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" title="illegal forward reference"
-      keywords="from-errors,purejava">
-        <compile files="IllegalForwardReference.java">
-            <message kind="error" line="9"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="protected accessibility"
-      keywords="from-errors,purejava">
-        <compile files="protectedAccess/Main.java,protectedAccess/p1/C1.java">
-            <message kind="error" line="26"/>
-            <message kind="error" line="28"/>
-            <message kind="error" line="29"/>
-            <message kind="error" line="31"/>
-            <message kind="error" line="37"/>
-            <message kind="error" line="45"/>
-            <message kind="error" line="46"/>
-            <message kind="error" line="54"/>
-            <message kind="error" line="55"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="parse-time illegal modifiers"
-      keywords="from-errors,purejava">
-        <compile files="Modifiers1.java">
-            <message kind="error" line="2"/>
-            <message kind="error" line="3"/>
-            <message kind="error" line="6"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="check-time illegal modifiers"
-      keywords="from-errors,purejava">
-        <compile files="Modifiers.java">
-            <message kind="error" line="2"/>
-            <message kind="error" line="3"/>
-            <message kind="error" line="4"/>
-            <message kind="error" line="6"/>
-            <message kind="error" line="7"/>
-            <message kind="error" line="8"/>
-            <message kind="error" line="9"/>
-            <message kind="error" line="11"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="illegal synchronized stmts"
-      keywords="from-errors,purejava,messages-vary">
-        <compile files="BadSynchronized.java"
-               options="!eclipse">
-            <message kind="error" line="6"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" title="modifiers on interface members"
-      keywords="from-errors,purejava">
-        <compile files="InterfaceMembers.java">
-            <message kind="error" line="2"/>
-            <message kind="error" line="3"/>
-            <message kind="error" line="4"/>
-            <message kind="error" line="5"/>
-            <message kind="error" line="7"/>
-            <message kind="error" line="8"/>
-            <message kind="error" line="9"/>
-            <message kind="error" line="10"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="good errors (and not too many) for missing members"
-      comment="XXX import of class in default package"
-
-      keywords="from-errors,purejava">
-        <compile files="NotFound.java">
-            <message kind="error" line="1"/>
-            <message kind="error" line="2"/>
-            <message kind="error" line="6"/>
-            <message kind="error" line="9"/>
-            <message kind="error" line="10"/>
-            <message kind="error" line="14"/>
-            <message kind="error" line="16"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="536"
-      title="expecting compile failures with subclass narrowing scope of superclass methods or accessing private superclass variables"
-      keywords="from-errors,purejava">
-        <compile files="RestrictingVisibilityCF.java">
-            <message kind="error" line="27"/>
-            <message kind="error" line="29"/>
-            <message kind="error" line="31"/>
-            <message kind="error" line="39"/>
-            <message kind="error" line="41"/>
-            <message kind="error" line="46"/>
-            <message kind="error" line="48"/>
-            <message kind="error" line="53"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="inner classes may not have static non-constant members"
-      keywords="from-errors,purejava">
-        <compile files="InnerMembers.java">
-            <message kind="error" line="8"/>
-            <message kind="error" line="9"/>
-            <message kind="error" line="10"/>
-            <message kind="error" line="11"/>
-            <message kind="error" line="16"/>
-            <message kind="error" line="17"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" title="flow analysis with local types"
-      keywords="from-errors,purejava">
-        <compile files="InnerFlow.java">
-            <message kind="error" line="5"/>
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="new"
-      title="PR584 Can construct inner classes using qualified expressions"
-      keywords="from-resolved_10rc3,purejava">
-        <compile files="PR584.java"/>
-        <run class="PR584"/>
-    </ajc-test>
-
-   <ajc-test dir="new" pr="715" title="incrementing objects, arrays - 2"
-      keywords="from-resolved_104,purejava">
-        <compile files="ArrayInc2CE.java">
-            <message kind="error" line="12"/>
-            <message kind="error" line="13"/>
-            <message kind="error" line="14"/>
-            <message kind="error" line="15"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="715" title="incrementing objects, arrays CE"
-      keywords="from-resolved_104,purejava,messages-vary">
-        <compile files="ArrayIncCE.java"
-               options="!eclipse">
-            <message kind="error" line="15"/>
-            <message kind="error" line="16"/>
-            <message kind="error" line="17"/>
-            <message kind="error" line="18"/>
-            <message kind="error" line="19"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="715" title="incrementing objects, arrays - 3"
-      keywords="from-resolved_104,purejava">
-        <compile files="ArrayInc3CE.java">
-            <message kind="error" line="15"/>
-            <message kind="error" line="16"/>
-            <message kind="error" line="17"/>
-            <message kind="error" line="18"/>
-            <message kind="error" line="19"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="715" title="incrementing objects, arrays"
-      keywords="from-resolved_104,purejava">
-        <compile files="ArrayInc.java"/>
-        <run class="ArrayInc"/>
-    </ajc-test>
-
-   <ajc-test dir="pureJava" pr="737"
-      title="no circularity errors simply because of inners (1)"
-      keywords="from-resolved_105,purejava">
-        <compile files="circle/Test1CP.java"/>
-        <run class="circle.Test1CP"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" pr="737"
-      title="no circularity errors simply because of inners (2)"
-      keywords="from-resolved_105,purejava">
-        <compile files="circle/Test2CP.java"/>
-        <run class="circle.Test2CP"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" pr="737"
-      title="should have circular inheritance errors (1)"
-      keywords="from-resolved_105,purejava,messages-vary">
-        <compile files="circle/Test1CF.java"
-               options="!eclipse">
-            <message kind="error" line="7"/>
-            <message kind="error" line="15"/>
-            <message kind="error" line="17"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" pr="737"
-      title="should have circular inheritance errors (2)"
-      keywords="from-resolved_105,purejava,messages-vary">
-        <compile files="circle/Test2CF.java"
-               options="!eclipse">
-            <message kind="error" line="6"/>
-            <message kind="error" line="10"/>
-            <message kind="error" line="15"/>
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="pureJava" pr="728"
-      title="interface using preceding subinterface in its definition"
-      keywords="from-resolved_105,purejava">
-        <compile files="ParentUsingChild.java"/>
-        <run class="ParentUsingChild"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="645"
-      title="Parent interface using public inner interface of child in same file"
-      keywords="from-resolved_105,purejava">
-        <compile files="ParentInterfaceUsingChildInnerInterface.java"/>
-        <run class="ParentInterfaceUsingChildInnerInterface"/>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="a type is not allowed to extend or implement its own innner type"
-      keywords="from-resolved_105,purejava">
-        <compile files="NestedInterfaceTest.java">
-            <message kind="error" line="1"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" title="try requires block JLS 14.19"
-      keywords="from-resolved_105,purejava,messages-vary">
-        <compile files="TryBlockRequiredCE.java"
-               options="!eclipse">
-            <message kind="error" line="6"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" pr="722" title="loop expressions not declarations"
-      keywords="from-resolved_105,purejava,messages-vary">
-        <compile files="DeclarationsInLoopsCE.java"
-                options="!eclipse">
-            <message kind="error" line="7"/>
-        </compile>
-    </ajc-test>
-
-
-
-
-
-
-
-
-    <ajc-test dir="new" pr="663"
-      title="no error when public class is in file of a different name"
-      keywords="from-resolved_105,purejava">
-        <compile options="-strict" files="PublicClassWrongFilename.java">
-            <message kind="error" line="3"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" pr="739"
-      title="local variables must be final to be accessed from inner class"
-      keywords="from-resolved_105,purejava">
-        <compile files="LocalsFromInnerCE.java">
-            <message kind="error" line="6"/>
-            <message kind="error" line="13"/>
-            <message kind="error" line="19"/>
-            <message kind="error" line="25"/>
-            <message kind="error" line="32"/>
-            <message kind="error" line="40"/>
-            <message kind="error" line="51"/>
-            <message kind="error" line="61"/>
-            <message kind="error" line="67"/>
-            <message kind="error" line="75"/>
-            <message kind="error" line="81"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" pr="739"
-      title="final local variables may be accessed from inner class"
-      keywords="from-resolved_105,purejava">
-        <compile files="LocalsFromInnerCP.java"/>
-        <run class="LocalsFromInnerCP"/>
-    </ajc-test>
-
-
-    <ajc-test dir="pureJava" pr="723" title="missing package identifier"
-      keywords="from-resolved_105,purejava">
-        <compile files="MissingPackageCE.java">
-            <message kind="error" line="2"/>
-        </compile>
-    </ajc-test>
-   <ajc-test dir="new" pr="701"
-      title="CE for ambiguous type reference (two files in package)"
-      keywords="from-resolved_105,purejava">
-        <compile
-          files="ambiguousClass/AmbiguousReferent.java,ambiguousClass/AmbiguousClassReference.java">
-            <message kind="error" line="5"/>
-        </compile>
-    </ajc-test>
-
-
-    <ajc-test dir="new"
-      title="initializer can throw so long as all constructors declare so"
-      keywords="from-resolved_105,purejava">
-        <compile files="InitializerWithThrow.java"/>
-        <run class="InitializerWithThrow"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="interfaces may not contain initializers (bug found by jacks)"
-      keywords="from-resolved_105,purejava">
-        <compile files="InterfaceMembersCf.java">
-            <message kind="error" line="2"/>
-            <message kind="error" line="3"/>
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="pureJava"
-      title="initializers must be able to complete normally (found by jacks)"
-      keywords="from-resolved_105,purejava,messages-vary">
-        <compile files="InitializerFlowCf.java"
-               options="!eclipse">
-            <message kind="error" line="2"/>
-            <message kind="error" line="4"/>
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="pureJava" title="more tests of super alone"
-      keywords="from-resolved_105,purejava">
-        <compile files="SuperIsWeird.java">
-            <message kind="error" line="9"/>
-            <message kind="error" line="13"/>
-            <message kind="error" line="20"/>
-            <message kind="error" line="21"/>
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="pureJava" pr="752"
-      title="subclass access to enclosing super class private members"
-      keywords="from-resolved_105,purejava,fail-unimplemented">
-        <compile files="SubclassAccessToEnclosingSuperClassPrivate.java"/>
-        <run class="SubclassAccessToEnclosingSuperClassPrivate"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" title="various tests of switch bounds"
-      keywords="from-resolved_106,purejava">
-        <compile files="SwitchBounds.java"/>
-        <run class="SwitchBounds"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="601"
-      title="VerifyError if nested sync returning result"
-      comment="XXX inconsistent behavior?"
-      keywords="from-resolved_10final,purejava">
-        <compile files="NestedSyncWithResult.java"/>
-        <run class="NestedSyncWithResult"/>
-    </ajc-test>
-
- 
-    <ajc-test dir="new" pr="134"
-      title="import of a class in the default package"
-      keywords="from-broken14usejavac,purejava">
-        <compile files="ImportFromUnnamed.java,DeclaredExcs.java"/>
-        <run class="ImportFromUnnamed"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" pr="386"
-      title="Referencing static interfaces with import statements"
-      keywords="from-broken14usejavac,purejava">
-        <compile files="ClassWithStaticInnerInterfaces.java"/>
-        <compile files="ImportingStaticInnerInterfaces_PR386.java"/>
-        <run class="ImportingStaticInnerInterfaces_PR386"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" pr="386"
-      title="Referencing static interfaces with import statements stars"
-      keywords="purejava,from-broken14usejavac">
-        <compile files="ClassWithStaticInnerInterfaces.java"/>
-        <compile files="ImportingStaticInnerInterfacesStars_PR386.java"/>
-        <run class="ImportingStaticInnerInterfacesStars_PR386"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" pr="386"
-      title="Referencing static interfaces with import statements stars 2"
-      keywords="purejava,from-broken14usejavac">
-        <compile files="ClassWithStaticInnerInterfaces.java"/>
-        <compile files="ImportingStaticInnerInterfacesStars2_PR386.java"/>
-        <run class="ImportingStaticInnerInterfacesStars2_PR386"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" pr="386"
-      title="Referencing static interfaces with import statements stars 3"
-      keywords="purejava,from-broken14usejavac">
-        <compile files="ClassWithStaticInnerInterfaces.java"/>
-        <compile files="ImportingStaticInnerInterfacesStars3_PR386.java"/>
-        <run class="ImportingStaticInnerInterfacesStars3_PR386"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" pr="386"
-      title="Referencing interfaces with import statements"
-      keywords="purejava,from-broken14usejavac">
-        <compile
-          files="ClassWithInnerInterfaces.java,ImportingInnerInterfaces_PR386.java"/>
-        <run class="ImportingInnerInterfaces_PR386"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" pr="386"
-      title="Referencing interfaces with import statements stars"
-      keywords="purejava,from-broken14usejavac">
-        <compile
-          files="ClassWithInnerInterfaces.java,ImportingInnerInterfacesStars_PR386.java"/>
-        <run class="ImportingInnerInterfacesStars_PR386"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" pr="386"
-      title="Referencing interfaces with import statements stars 2"
-      keywords="purejava,from-broken14usejavac">
-        <compile
-          files="ClassWithInnerInterfaces.java,ImportingInnerInterfacesStars2_PR386.java"/>
-        <run class="ImportingInnerInterfacesStars2_PR386"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" pr="386"
-      title="Referencing interfaces with import statements stars 3"
-      keywords="purejava,from-broken14usejavac">
-        <compile
-          files="ClassWithInnerInterfaces.java,ImportingInnerInterfacesStars3_PR386.java"/>
-        <run class="ImportingInnerInterfacesStars3_PR386"/>
-    </ajc-test>
-
-   <ajc-test dir="new/PR862" pr="862"
-      title="import any inner from interface implementor"
-      keywords="purejava">
-        <compile files="pack/ImportInnerFromInterfaceImplementor.java">
-          <dir-changes added="pack.ImportInnerFromInterfaceImplementor"/>
-        </compile>
-        <run class="pack.ImportInnerFromInterfaceImplementor"/>
-    </ajc-test>
-    
-     <ajc-test dir="pureJava/equalsMethOnStr" pr="214"
-      title="equals method on quoted strings" keywords="from-java">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava/anonInnerClass" pr="294"
-      title="anonymous inner class" keywords="from-java">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
- 
-    <ajc-test dir="pureJava"
-      title="parsing of parenthesized 'this' (in returns)" keywords="from-java">
-        <compile files="ReturnThis.java"/>
-        <run class="ReturnThis"/>
-    </ajc-test>
- 
-    <ajc-test dir="pureJava" title="Strings are folded and interned correctly"
-      keywords="from-java">
-        <compile files="StringFold.java"/>
-        <run class="StringFold"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" title="Cast binds tighter than equality tests"
-      keywords="from-java">
-        <compile files="CastAndBinary.java"/>
-        <run class="CastAndBinary"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" title="Boundary base values can be parsed"
-      keywords="from-java">
-        <compile files="BoundaryNums.java"/>
-        <run class="BoundaryNums"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="State is passed correctly across nested annonymous inners"
-      keywords="from-java">
-        <compile files="NestedInners.java"/>
-        <run class="NestedInners"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="?: expressions should typecheck in interesting ways"
-      keywords="from-java">
-        <compile files="TriTestTypecheck.java"/>
-        <run class="TriTestTypecheck"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="cast expressions should allow casts to/from interfaces at compile-time."
-      keywords="from-java">
-        <compile files="InterfaceCast.java"/>
-        <run class="InterfaceCast"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="various anonymous inner classes plus super types tests"
-      keywords="from-java">
-        <compile files="InnerSuper.java"/>
-        <run class="InnerSuper"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" title="Various comment syntaxes should be handled."
-      keywords="from-java">
-        <compile files="CommentSyntax.java"/>
-        <run class="CommentSyntax"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava/abstractInner"
-      title="Abstract inner classes across package boundaries"
-      keywords="from-java">
-        <compile files="C.java,pkg/A.java"/>
-        <run class="C"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="inner classes accessing outers and some more inner class names"
-      keywords="from-java">
-        <compile files="InnerAccess.java"/>
-        <run class="InnerAccess"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="remember to cast folded values down to the proper types."
-      keywords="from-java">
-        <compile files="CastingFoldedValues.java"/>
-        <run class="CastingFoldedValues"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="inner classes can be built using protected constructors in super"
-      keywords="from-java">
-        <compile files="VariousConstructors.java"/>
-        <run class="VariousConstructors"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" pr="401"
-      title="The current AspectJ compiler cannot parse qualified superclass constructor invocations"
-      keywords="from-java">
-        <compile files="QualifiedSuperClassConstructorInvocations_PR401.java"/>
-        <run class="QualifiedSuperClassConstructorInvocations_PR401"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" pr="421"
-      title="More thourough test of static members using full names"
-      keywords="from-java">
-        <compile
-          files="Statics.java,StaticMembers_PR421.java,p1/C1.java,p1/P1Statics.java,p1/subp1/SubC1.java,p1/p2/P1P2Statics.java"/>
-        <run class="StaticMembers_PR421"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" pr="421"
-      title="More thourough test of static members using imports"
-      keywords="from-java">
-        <compile
-          files="Statics.java,StaticMembersImports_PR421.java,p1/C1.java,p1/P1Statics.java,p1/subp1/SubC1.java,p1/p2/P1P2Statics.java"/>
-        <run class="StaticMembersImports_PR421"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava/conflictingPackageNames" pr="437"
-      title="Looking in class Java for java.lang.String WITH separate compilation"
-      keywords="from-java">
-        <compile files="Java.java"/>
-        <compile files="Main.java"/>
-        <run class="Main"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava/conflictingPackageNames" pr="437"
-      title="Looking in class Java for java.lang.String WITHOUT separate compilation"
-      keywords="from-java">
-        <compile files="Main.java,Java.java"/>
-        <run class="Main"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava/conflictingPackageNamesWithPackages" pr="437"
-      title="Looking in class Java for java.lang.String WITH separate compilation with packages"
-      keywords="from-java">
-        <compile files="Java.java"/>
-        <compile files="Main.java"/>
-        <run class="conflictingPackageNamesWithPackages.Main"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava/conflictingPackageNamesWithPackages" pr="437"
-      title="Looking in class Java for java.lang.String WITHOUT separate compilation with packages"
-      keywords="from-java">
-        <compile files="Main.java,Java.java"/>
-        <run class="conflictingPackageNamesWithPackages.Main"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" title="Testing ternary operations."
-      keywords="from-java">
-        <compile files="MultiTernaryOps.java"/>
-        <run class="MultiTernaryOps"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" title="Lifting locals in switch statements."
-      keywords="from-java">
-        <compile files="SwitchStmtLocals.java"/>
-        <run class="SwitchStmtLocals"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="Getting confused when looking up method signatures"
-      keywords="from-java">
-        <compile files="MethodSigs.java"/>
-        <run class="MethodSigs"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="Not recognizing the chars '\0', '\1', '\2', '\3', '\4', '\5', '\6', '\7'"
-      keywords="from-java">
-        <compile files="Chars.java"/>
-        <run class="Chars"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="Test chars '\0', '\1', '\2', '\3', '\4', '\5', '\6', '\7' with a case statement"
-      keywords="from-java">
-        <compile files="CaseClauses.java"/>
-        <run class="CaseClauses"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="Checking character values with all the unicode chars."
-      keywords="from-java">
-        <compile files="CharsUnicode.java"/>
-        <run class="CharsUnicode"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="Trouble finding methods with the same name and different parameter types"
-      keywords="from-java">
-        <compile files="MethodsWithTheSameName.java"/>
-        <run class="MethodsWithTheSameName"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="Binding non-public static inner classes of interfaces in other packages"
-      keywords="from-java">
-        <compile
-          files="StaticClassesInInterfaces.java,anotherPackage/AnotherPackageInterface.java"/>
-        <run class="StaticClassesInInterfaces"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="Not recognizing the octal chars '\0', '\1', '\2', '\3', '\4', '\5', '\6', '\7'"
-      keywords="from-java">
-        <compile files="OctalChars.java"/>
-        <run class="OctalChars"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="Members with the same name as their package cause confusion with fully-qualified names."
-      keywords="from-java">
-        <compile files="samenames/Main.java,samenames/Other.java"/>
-        <run class="samenames.Main"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="Fully-qual'ed names with same start as variable names"
-      keywords="from-java">
-        <compile files="FullNames.java"/>
-        <run class="FullNames"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="Fully qualifying inner classes within annonymous classes causes problems."
-      keywords="from-java">
-        <compile files="InnerClassesInAnnonymousClasses.java"/>
-        <run class="InnerClassesInAnnonymousClasses"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="Calls to methods in outer annonymous classes are being qual's incorrectly with 'this'"
-      keywords="from-java">
-        <compile files="MisplacedThisInAnnonymousInnerClasses.java"/>
-        <run class="MisplacedThisInAnnonymousInnerClasses"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava/innersFromSourceAndBytecode"
-      title="Reading inner classes from source and bytecode (1) -- was failing"
-      keywords="from-java">
-        <compile files="C.java,D.java"/>
-        <compile files="Main.java,C.java"
-        	includeClassesDir="true"/>
-        <run class="Main"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava/innersFromSourceAndBytecode"
-      title="Reading inner classes from source and bytecode (2)"
-      keywords="from-java">
-        <compile files="Main.java,C.java,D.java"/>
-        <run class="Main"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava/innersFromSourceAndBytecode"
-      title="Reading inner classes from source and bytecode (3)"
-      keywords="from-java">
-        <compile files="C.java,D.java"/>
-        <compile files="Main.java,C.java,D.java"
-        	includeClassesDir="true"/>
-        <run class="Main"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="Not lifting types correctly with bytes and shorts with ternary ops"
-      keywords="from-java">
-        <compile files="TernaryPrimitiveOps.java"/>
-        <run class="TernaryPrimitiveOps"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="Not looking up methods inside of anonymous declarations correctly."
-      keywords="from-java">
-        <compile files="AnonymousMethodLookup.java"/>
-        <run class="AnonymousMethodLookup"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="Resolving extended classes with array parameters"
-      keywords="from-java">
-        <compile files="ResolvingArrayParameters.java"/>
-        <run class="ResolvingArrayParameters"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="Assignments as second arguments in ternary operators."
-      keywords="from-java">
-        <compile files="TernaryAssignments.java"/>
-        <run class="TernaryAssignments"/>
-    </ajc-test>
-
-
-    <ajc-test dir="pureJava" title="Conflicting inner classes with interfaces."
-      keywords="from-java">
-        <compile files="PR413.java"/>
-        <run class="PR413"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" title="confusions of casts and parens"
-      keywords="from-java">
-        <compile files="CastVsParen.java"/>
-        <run class="CastVsParen"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="default constructors seen by inner classes subtyping outers"
-      keywords="from-java">
-        <compile files="DefaultConsAndInner.java"/>
-        <run class="DefaultConsAndInner"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="folding fields set to anonymous instances containing self-references"
-      keywords="from-java">
-        <compile files="AnonFolding.java"/>
-        <run class="AnonFolding"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="finally at the end of a method that needs to return"
-      keywords="from-java">
-        <compile files="FinallyAndReturns.java"/>
-        <run class="FinallyAndReturns"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="overriding methods from object in interfaces and multiple-inheritance"
-      keywords="from-java">
-        <compile files="InterfaceAndObject.java"/>
-        <run class="InterfaceAndObject"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="private fields in an outer class accessed by an inner which also extends the outer"
-      keywords="from-java">
-        <compile files="PrivateFields.java"/>
-        <run class="PrivateFields"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="breaking out of a labeled block inside of an if"
-      keywords="from-java">
-        <compile files="Breaks.java"/>
-        <run class="Breaks"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="abstractifying a method and getting it back through super"
-      keywords="from-java">
-        <compile files="Abstracts.java"/>
-        <run class="Abstracts"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="Packages and static classes with the same name produce compile errors."
-      keywords="from-java">
-        <compile files="PackagesAndStaticClassesWithTheSameName.java"/>
-        <run class="PackagesAndStaticClassesWithTheSameName"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava/innerTypeModifiers"
-      title="Inner types must generate classfiles with only Public/Default access flags."
-      keywords="from-java">
-        <compile files="pkg1/Main.java,pkg2/Foo.java"/>
-        <run class="pkg1.Main"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava/innerDefaultConstructors"
-      title="Default constructors have same access as their enclosing type"
-      keywords="from-java">
-        <compile files="pkg1/Main.java,pkg2/Foo.java">
-            <message kind="error" line="6"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="Returning primitive values matching method return type (minimal)"
-      keywords="from-java">
-        <compile files="ReturnTypes.java"/>
-        <run class="ReturnTypes"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" title="Flow analysis and if(true)"
-      keywords="from-java">
-        <compile files="Flow.java"/>
-        <run class="Flow"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="packages and generated inner types (for I.class)"
-      keywords="from-java">
-        <compile files="InterfaceAndClass.java"/>
-        <run class="p.InterfaceAndClass"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" title="A.this exprs match by exact type matching"
-      keywords="from-java">
-        <compile files="QualifiedThisMatchesExactly.java">
-            <message kind="error" line="14"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="Implicit this for new inner instance must be avaliable"
-      keywords="from-java">
-        <compile files="ImplicitThisMissing.java">
-            <message kind="error" line="4"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="Inners can reference protected fields of their outer's super."
-      keywords="from-java">
-        <compile
-          files="protectedFieldRefInInner/Main.java,protectedFieldRefInInner/p1/C.java"/>
-        <run class="protectedFieldRefInInner.Main"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="Primitives that special case for a constant arm should work"
-      keywords="from-java">
-        <compile files="OneArmedPrimitiveTests.java"/>
-        <run class="OneArmedPrimitiveTests"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" title="Parenthesized true and false don't parse"
-      keywords="from-java">
-        <compile files="ParenKeywords.java"/>
-        <run class="ParenKeywords"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="Field sets to public fields of private fields of enclosing types"
-      keywords="from-java">
-        <compile files="InnerFieldRef.java"/>
-        <run class="InnerFieldRef"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="Constant values should be stored with the correct type of their fields"
-      keywords="from-java">
-        <compile files="ConstantValueConversion.java"/>
-        <run class="ConstantValueConversion"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="Local variables in initializers should not be treated as blank final fields"
-      keywords="from-java">
-        <compile files="LocalInitializerVariableNotBlank.java"/>
-        <run class="LocalInitializerVariableNotBlank"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="Binops aren't allowed as update stmts in for loops"
-      keywords="from-java">
-        <compile files="NonStmtInFor.java">
-            <message kind="error" line="3"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="Can't avoid doing division in case of div by zero"
-      keywords="from-java">
-        <compile files="DivOpMustHappen.java"/>
-        <run class="DivOpMustHappen"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="Testing frames w/greater than FF locals and 7F incs (i.e., WIDE instruction)"
-      keywords="from-java">
-        <compile files="BigFrameTest.java"/>
-        <run class="BigFrameTest"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" title="correct numeric literals"
-      keywords="from-java">
-        <compile files="LiteralsCp.java"/>
-        <run class="LiteralsCp"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" title="invalid numeric literals"
-      keywords="from-java">
-        <compile files="LiteralsCf.java">
-            <message kind="error" line="8"/>
-            <message kind="error" line="9"/>
-            <message kind="error" line="10"/>
-            <message kind="error" line="11"/>
-            <message kind="error" line="12"/>
-            <message kind="error" line="17"/>
-            <message kind="error" line="18"/>
-            <message kind="error" line="19"/>
-            <message kind="error" line="20"/>
-            <message kind="error" line="21"/>
-            <message kind="error" line="22"/>
-            <message kind="error" line="23"/>
-            <message kind="error" line="25"/>
-            <message kind="error" line="27"/>
-            <message kind="error" line="28"/>
-            <message kind="error" line="29"/>
-            <message kind="error" line="30"/>
-            <message kind="error" line="32"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" pr="538"
-      title="inner types can't have the same simple name as an enclosing type"
-      keywords="from-java">
-        <compile files="InnerNameConflictsCf.java">
-            <message kind="error" line="9"/>
-            <message kind="error" line="14"/>
-            <message kind="error" line="20"/>
-            <message kind="error" line="21"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="test the unops and binops with various values" keywords="from-java">
-        <compile files="BigOps.java"/>
-        <run class="BigOps"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="test + and += for strings and variously typed values"
-      keywords="from-java">
-        <compile files="BigString.java"/>
-        <run class="BigString"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" title="test try/catch/finally statements"
-      keywords="from-java">
-        <compile files="TryCatchFinally.java"/>
-        <run class="TryCatchFinally"/>
-    </ajc-test>
-
-
-    <ajc-test dir="pureJava" pr="547"
-      title="local types can be bound in the signatures of other local types"
-      keywords="from-resolved_10rc3,from-java">
-        <compile files="LocalInners.java"/>
-        <run class="LocalInners"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava/nameConflicts"
-      title="type and package name conflicts are resolved happily (2)"
-      keywords="from-java">
-        <compile files="p1/Main2.java,p1/p2/Foo.java"/>
-        <run class="p1.Main2"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="try statements work sorta like scoped items for exception flow control"
-      keywords="from-java">
-        <compile files="TryWorksLikeEnvironment.java"/>
-        <run class="TryWorksLikeEnvironment"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="qualified this must work exactly, not based on subtypes"
-      keywords="from-java">
-        <compile files="QualifiedThisExactness.java">
-            <message kind="error" line="6"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="nested finally blocks have interesting frame location problems"
-      keywords="from-java">
-        <compile files="NestedFinally.java"/>
-        <run class="NestedFinally"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" pr="601"
-      title="nested synchronized blocks have interesting frame location problems"
-      keywords="from-java">
-        <compile files="NestedSynchronized.java"/>
-        <run class="NestedSynchronized"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" title="anonymous inner classes with inner types"
-      keywords="from-java">
-        <compile files="AnonymousWithInner.java"/>
-        <run class="AnonymousWithInner"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" pr="651" title="qualified super call expr"
-      keywords="from-java">
-        <compile files="QualifiedSuperCall.java"/>
-        <run class="QualifiedSuperCall"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" pr="680"
-      title="interfaces with non-explicitly static inner classes"
-      keywords="from-java">
-        <compile files="InterfaceAndInnerHelper.java"/>
-        <compile files="InterfaceAndInner.java"
-        	includeClassesDir="true"/>
-        <run class="InterfaceAndInner"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" title="Operands work correctly"
-      keywords="from-bigjava">
-        <compile files="Ops.java"/>
-        <run class="Ops"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" title="simple tests of throws and for stmt typing"
-      keywords="from-errors">
-        <compile files="SimpleSpec.java">
-            <message kind="error" line="4"/>
-            <message kind="error" line="7"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" title="test for not folding circular constants"
-      keywords="from-errors">
-        <compile files="CircularFolding.java">
-            <message kind="error" line="6"/>
-            <message kind="error" line="7"/>
-            <message kind="error" line="8"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" title="continue targets must be continuable"
-      keywords="from-errors">
-        <compile files="BadContinueTarget.java">
-            <message kind="error" line="6"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="qualified this to non-inner should be caught"
-      keywords="from-errors">
-        <compile files="BadQualifiedNew.java">
-            <message kind="error" line="4"/>
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="new" 
-    	title="Cannot bind a name." keywords="from-resolved_10x,purejava">
-        <compile files="CannotReferenceSuper.java"/>
-        <run class="CannotReferenceSuper"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" pr="721"
-      title="interface declaration not permitted in local method scope"
-      keywords="from-resolved_105">
-        <compile files="LocalInterfaceCE.java">
-            <message kind="error" line="5"/>
-            <message kind="error" line="8"/>
-            <message kind="error" line="11"/>
-            <message kind="error" line="15"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="Locals inside other locals, ordering of processing [eh]"
-      keywords="from-resolved_105">
-        <compile files="LocalInners2.java"/>
-        <run class="LocalInners2"/>
-    </ajc-test>
-
-   <ajc-test dir="pureJava" pr="866"
-      title="non-constant static final fields marked as final in .class">
-        <compile files="FinalStaticField.java"/>
-        <run class="FinalStaticField"/>
-    </ajc-test>
-
-   <ajc-test dir="new" title="handle multiple nested inner classes"
-      keywords="from-java">
-        <compile files="InnerHell.java"/>
-        <run class="InnerHell"/>
-    </ajc-test>
-
-   <ajc-test dir="new/volatileKeyword" pr="151"
-      title="advice on a static method" keywords="from-java">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-   <ajc-test dir="new/innerConsSyntax" pr="192"
-      title="inner constructor syntax causes compile error" keywords="from-java">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="new/paramWidening" pr="195"
-      title="widening of method parameters to match javac" keywords="from-java">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="313"
-      title="parenthesized string literals matching primitive type names"
-      keywords="from-java">
-        <compile files="ParenPrimitive.java"/>
-        <run class="ParenPrimitive"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="simple type coercions tests" keywords="from-java">
-        <compile files="TypeCoercions.java"/>
-        <run class="TypeCoercions"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="order of type declarations shouldn't matter"
-      keywords="from-java">
-        <compile files="OrderOfTypes.java"/>
-        <run class="OrderOfTypes"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Scanner non recognizing strictfp."
-      keywords="from-java">
-        <compile files="StrictFp.java"/>
-        <run class="StrictFp"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Crashes when a lot of zeros are in front of a double variable [!!! purejava]"
-      keywords="from-java">
-        <compile files="Zeros.java"/>
-        <run class="Zeros"/>
-    </ajc-test>
-
diff --git a/tests/src/test/java/org/aspectj/systemtest/purejava/pureJava.xml b/tests/src/test/java/org/aspectj/systemtest/purejava/pureJava.xml
deleted file mode 100644
index 1eb4b9f60..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/purejava/pureJava.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[
-<!ENTITY tests SYSTEM "../tests/src/org/aspectj/systemtest/purejava/pureJava-tests.xml">
-]>
-<!-- Pure Java Tests -->
-
-<suite>
-
-&tests;
-
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/serialVerUID/serialVerUID-tests.xml b/tests/src/test/java/org/aspectj/systemtest/serialVerUID/serialVerUID-tests.xml
deleted file mode 100644
index d6346ceac..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/serialVerUID/serialVerUID-tests.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<!-- SUID Tests -->
-
-    <ajc-test dir="bugs/serialVersionUID"
-		title="SUID: Before execution advice" pr="41181">
-		<compile files="Test.java, Util.java"/>
-        <run class="Test"/>
-		<compile files="Test.java, Util.java, BeforeExecutionAdvice.aj" options="-Xlint:warning"/>
-        <run class="Util"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs/serialVersionUID"
-		title="SUID: Around execution advice" comment="OK because around_body private" pr="41181">
-		<compile files="Test.java, Util.java"/>
-        <run class="Test"/>
-		<compile files="Test.java, Util.java, AroundExecutionAdvice.aj" options="-Xlint:warning"/>
-        <run class="Util"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs/serialVersionUID" 
-	    title="SUID: Around closure execution advice (-Xlint:ignore)" comment="OK because ignoring warnings"
-		pr="41181">
-		<compile files="Test.java, Util.java"/>
-        <run class="Test"/>
-		<compile files="Test.java, Util.java, AroundClosureExecutionAdvice.aj" options="-Xlint:ignore"/>
-        <run class="Util" options="-fail"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs/serialVersionUID"
-		title="SUID: Around closure execution advice" comment="Warning because around_body non-private"
-		pr="41181">
-		<compile files="Test.java, Util.java"/>
-        <run class="Test"/>
-		<compile files="Test.java, Util.java, AroundClosureExecutionAdvice.aj"
-		  xlintfile="Xlint.properties">
-            <message kind="warning" line="9"/>
-		</compile>
-        <run class="Util" options="-fail"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs/serialVersionUID"
-		title="SUID: thisJoinPoint" comment="Warning because of introduced clinit"	pr="41181">
-		<compile files="Test.java, Util.java"/>
-        <run class="Test"/>
-		<compile
-			files="Test.java, Util.java, TJP.aj" options="-Xlint:warning">
-            <message kind="warning" line="6"/>
-            <message kind="warning" line="13"/>
-            <message kind="warning" line="17"/>
-            <message kind="warning" line="24"/>
-            <message kind="warning" line="31"/>
-		</compile>
-        <run class="Util" options="-fail"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs/serialVersionUID"
-		title="SUID: thisJoinPoint with clinit method" comment="OK if tjp private and existing clinit"
-		pr="41181">
-		<compile files="ClinitTest.java, Util.java"/>
-        <run class="ClinitTest"/>
-		<compile files="ClinitTest.java, Util.java, TJP.aj" options="-Xlint:warning -1.4">
-		  <message kind="warning" line="24" text="can not build"/>
-		  <message kind="warning" line="31" text="can not build"/>
-		</compile>
-        <run class="Util" options="-read"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs/serialVersionUID"
-		title="SUID: After returning staticinitialization advice" comment="Warning because of added clinit"
-		pr="41181">
-		<compile files="Test.java, Util.java"/>
-        <run class="Test"/>
-		<compile
-		  files="Test.java, Util.java, AfterReturningStaticinitializationAdvice.aj" options="-Xlint:warning">
-            <message kind="warning" line="6"/>
-		</compile>
-        <run class="Util" options="-fail"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs/serialVersionUID"
-		title="SUID: After returning staticinitialization advice with serialVersionUID field"
-		comment="OK because of serialVersionUID field" pr="41181">
-		<compile files="SuidTest.java, Util.java" />
-        <run class="SuidTest"/>
-		<compile files="SuidTest.java, Util.java, AfterReturningStaticinitializationAdvice.aj" options="-Xlint:warning"/>
-        <run class="Util"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs/serialVersionUID"
-		title="SUID: ITD field" comment="Error because added field may not be initialized" pr="41181">
-		<compile files="Test.java, Util.java"/>
-        <run class="Test"/>
-		<compile files="Test.java, Util.java, ITDField.aj" options="-Xlint:error">
-			<message kind="error" line="1"/> <!-- two messages about new getter/setter affecting suid for private itd field -->
-            <message kind="error" line="3"/>
-		</compile>
-	</ajc-test>
-
-	<ajc-test dir="bugs/serialVersionUID"
-		title="SUID: ITD method" comment="Warning because of added method" pr="41181">
-		<compile files="Test.java, Util.java" />
-        <run class="Test"/>
-		<compile files="Test.java, Util.java, ITDMethod.aj" options="-Xlint:warning">
-            <message kind="warning" line="3"/>
-		</compile>
-        <run class="Util" options="-fail"/>
-	</ajc-test>
-    
-	<ajc-test dir="bugs/serialVersionUID"
-		title="SUID: Declare extends" comment="OK" pr="41181">
-		<compile files="Test.java, Util.java" />
-        <run class="Test"/>
-		<compile files="Test.java, Util.java, DeclareExtends.aj" options="-Xlint:warning"/>
-        <run class="Util"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs/serialVersionUID"
-		title="SUID: Declare implements (compile)" comment="Warning because of added interface" pr="41181">
-		<compile files="Test.java, Util.java" />
-        <run class="Test"/>
-		<compile files="Test.java, Util.java, DeclareImplements.aj" options="-Xlint:warning">
-            <message kind="warning" line="3"/>
-		</compile>
-        <run class="Util" options="-fail"/>
-	</ajc-test>
- 
- 	<ajc-test dir="bugs/serialVersionUID"
-		title="SUID: Declare implements non-Serializable (compile)" comment="OK because not Serializable"
-		pr="41181">
-		<compile files="NonSerializableTest.java, DeclareImplements.aj" options="-Xlint:warning"/>
-	</ajc-test>
- 
- 	<ajc-test dir="bugs/serialVersionUID"
-		title="SUID: Declare implements Serializable (compile)" comment="OK because adding Serializable"
-		pr="41181">
-		<compile files="NonSerializableTest.java, DeclareImplementsSerializable.aj" options="-Xlint:warning"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs/serialVersionUID"
-		title="SUID: Declare implements (weave)" comment="Warning because of added interface" pr="41181">
-		<compile files="Test.java, Util.java" />
-        <run class="Test"/>
-		<compile files="injar.jar, DeclareImplements.aj" options="-Xlint:warning">
-            <message kind="warning" line="3"/>
-		</compile>
-        <run class="Util" options="-fail"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs/serialVersionUID" title="SUID: Priviliged aspect" pr="41181">
-		<compile files="Test.java, Util.java"/>
-        <run class="Test"/>
-		<compile files="Test.java, Util.java, PrivilegedAspect.aj" options="-Xlint:warning">
-            <message kind="warning" line="0"/>
-		</compile>
-        <run class="Util" options="-fail"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs/serialVersionUID"
-		title="SUID: Perthis aspect"
-		comment="Warning because added of added interface MightHaveAspect. Added field is private transient"
-		pr="41181">
-		<compile files="Test.java, Util.java" />
-        <run class="Test"/>
-		<compile files="Test.java, Util.java, PerThisAspect.aj" options="-Xlint:warning">
-            <message kind="warning" line="0"/>
-		</compile>
-        <run class="Util" options="-fail"/>
-	</ajc-test>
-    
-
diff --git a/tests/src/test/java/org/aspectj/systemtest/serialVerUID/serialVerUID.xml b/tests/src/test/java/org/aspectj/systemtest/serialVerUID/serialVerUID.xml
deleted file mode 100644
index 20bfa889d..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/serialVerUID/serialVerUID.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[
-<!ENTITY tests SYSTEM "../tests/src/org/aspectj/systemtest/serialVerUID/serialVerUID-tests.xml">
-]>
-<!-- SUID Tests -->
-
-<suite>
-
-&tests;
-
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/tracing/tracing.xml b/tests/src/test/java/org/aspectj/systemtest/tracing/tracing.xml
deleted file mode 100644
index 8a6409183..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/tracing/tracing.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
-
-<!-- Tracing Tests -->
-<suite>
-
-	<ajc-test dir="tracing" title="Tracing" keywords="tracing">
-        <compile
-        	files="TracingTest.java"
-        />
-        <ant file="ant.xml" target="Tracing" verbose="true">
-        	<stdout>
-                <line text="? TracingTest.main() trace="/>
-            </stdout>
-		</ant>      
-    </ajc-test>
-
-	<ajc-test dir="tracing" title="Default tracing" keywords="tracing">
-        <compile
-        	files="DefaultTracingTest.java"
-        />
-        <ant file="ant.xml" target="Default tracing" verbose="true">
-        	<stdout>
-                <line text="? DefaultTracingTest.main() trace=org.aspectj.weaver.tools.DefaultTrace"/>
-            </stdout>
-		</ant>        
-    </ajc-test>
-
-	<ajc-test dir="tracing" title="Trace messages" keywords="tracing">
-        <compile
-        	files="HelloWorld.java"
-        />
-        <compile
-        	files="IncludedAspect.aj, ExcludedAspect.aj"
-        />
-		<ant file="ant.xml" target="Trace messages" verbose="true">
-        	<stdout>
-                <line text="Hello World!"/>
-            </stdout>
-            <!-- 
-            	Always get info messages even without -verbose because output determined
-                by tracing infrastructure.
-                 
-                Duplicate warning and error messages: first through trace then message 
-                writer
-            -->
-        	<stderr>
-	  	    	<line text="info AspectJ Weaver Version"/>
-	  	    	<line text="info register classloader"/>
-	  	    	<line text="info using configuration"/>
-	  	    	<line text="info register aspect IncludedAspect"/>
-	  	    	<line text="warning aspect ExcludedAspect exluded"/>
-	  	    	<line text="warning aspect ExcludedAspect exluded"/>
-	  	    	<line text="info define aspect IncludedMissingAspect"/>
-	  	    	<line text="error Cannot find parent aspect"/>
-	  	    	<line text="error Cannot find parent aspect"/>
-	  	    	<line text="error Concrete-aspect 'IncludedMissingAspect' could not be registered"/>
-	  	    	<line text="error Concrete-aspect 'IncludedMissingAspect' could not be registered"/>
-	  	    	<line text="warning failure(s) registering aspects. Disabling weaver for class loader"/>
-	  	    	<line text="warning failure(s) registering aspects. Disabling weaver for class loader"/>
-            </stderr>
-        </ant>
-    </ajc-test>
-
-	<ajc-test dir="tracing" title="Trace everything" keywords="tracing">
-        <compile
-        	files="HelloWorld.java"
-        />
-        <compile files="Aspect.aj" options="-outxml -1.4"/>
-		<ant file="ant.xml" target="Trace everything" verbose="true">
-        	<stdout>
-                <line text="Hello World!"/>
-            </stdout>
-        </ant>
-    </ajc-test>
-
-	<ajc-test dir="tracing" title="JDK 1.4 tracing" keywords="tracing">
-        <compile
-        	files="HelloWorld.java"
-        />
-        <compile files="Aspect.aj" options="-outxml -1.4"/>
-		<ant file="ant.xml" target="JDK 1.4 tracing" verbose="true">
-        	<stdout>
-                <line text="Hello World!"/>
-            </stdout>
-        </ant>
-    </ajc-test>
-
-	<ajc-test dir="tracing" title="Tracing file System Property" keywords="tracing">
-        <compile
-        	files="HelloWorld.java"
-        />
-        <compile files="Aspect.aj" options="-outxml -1.4"/>
-		<ant file="ant.xml" target="Tracing file System Property" verbose="true">
-        	<stdout>
-                <line text="Hello World!"/>
-            </stdout>
-        </ant>
-    </ajc-test>
-</suite>
diff --git a/tests/src/test/java/org/aspectj/systemtest/xlint/xlint-tests.xml b/tests/src/test/java/org/aspectj/systemtest/xlint/xlint-tests.xml
deleted file mode 100644
index 4bbf23841..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/xlint/xlint-tests.xml
+++ /dev/null
@@ -1,267 +0,0 @@
-<!-- XLint Tests -->
-
-   <!-- .................................... -Xlint tests -->
-    <!-- ............... positive -Xlint tests -->
-    
-    <ajc-test dir="bugs/lazyTjpXLintWarning"
-		title="no XLint warning: thisJoinPoint potentially lazy and nothing stopping it">
-		<compile options="-Xlint:warning" files="Scenario1.aj"/>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/lazyTjpXLintWarning"
-		title="XLint warning: thisJoinPoint potentially lazy but stopped by around advice which doesn't use tjp">
-		<compile options="-Xlint:warning" files="Scenario2.aj">
-			<message kind="warning" line="21" text="can not implement lazyTjp on this joinpoint method-execution(void Test.main(java.lang.String[])) because around advice is used [Xlint:canNotImplementLazyTjp]"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/lazyTjpXLintWarning"
-		title="no XLint warning: thisJoinPoint not lazy (no if PCD) but would have been stopped anyway by around advice">
-		<compile options="-Xlint:warning" files="Scenario3.aj">
-			<message kind="warning" line="14" text="can not build thisJoinPoint lazily for this advice since it has no suitable guard [Xlint:noGuardForLazyTjp]"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/lazyTjpXLintWarning" title="no XLint warning: thisJoinPoint cannot be built lazily">
-		<compile options="-Xlint:warning" files="Scenario4.aj">
-			<message kind="warning" line="9" text="can not build thisJoinPoint lazily for this advice since it has no suitable guard"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/lazyTjpXLintWarning"
-		title="XLint warning: thisJoinPoint potentially lazy but stopped by around advice which uses tjp">
-		<compile options="-Xlint:warning" files="Scenario5.aj">
-			<message kind="warning" line="22" text="can not implement lazyTjp on this joinpoint method-execution(void Test.main(java.lang.String[])) because around advice is used [Xlint:canNotImplementLazyTjp]"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/lazyTjpXLintWarning"
-		title="check for xlazytjp warning if actually supplied">
-		<compile options="-XlazyTjp -Xlint:warning" files="Scenario1.aj">
-		  <message kind="warning" text="-XlazyTjp should no longer be used, build tjps lazily is now the default"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/lazyTjpXLintWarning"
-		title="lazytjp: warning when around advice uses tjp">
-		<compile options="-Xlint:warning" files="LazyTjpTest1.java">
-			<message kind="warning" line="4" text="can not implement lazyTjp on this joinpoint method-execution(void LazyTjpTest1.test2()) because around advice is used [Xlint:canNotImplementLazyTjp]"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/lazyTjpXLintWarning"
-		title="lazytjp: warning when if missing on before advice">
-		<compile options="-Xlint:warning" files="LazyTjpTest2.java">
-		  <message kind="warning" line="16" text="can not build thisJoinPoint lazily for this advice since it has no suitable guard"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/lazyTjpXLintWarning"
-		title="lazytjp: warning when if missing on after advice">
-		<compile options="-Xlint:warning" files="LazyTjpTest3.java">
-		  <message kind="warning" line="17" text="can not build thisJoinPoint lazily for this advice since it has no suitable guard"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/lazyTjpXLintWarning"
-		title="lazytjp: multiple clashing advice preventing lazytjp">
-		<compile options="-Xlint:warning" files="LazyTjpTest4.java">
-		  <message kind="warning" line="13" text="can not build thisJoinPoint lazily for this advice since it has no suitable guard"/>
-		  <message kind="warning" line="3"  text="can not implement lazyTjp at joinpoint method-execution(void LazyTjpTest4.test1()) because of advice conflicts, see secondary locations to find conflicting advice"/>
-		  <message kind="warning" line="17" text="can not build thisJoinPoint lazily for this advice since it has no suitable guard"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/lazyTjpXLintWarning"
-		title="lazytjp: interfering before and around">
-		<compile options="-Xlint:warning" files="LazyTjpTest5.java">
-		  <message kind="warning" line="3" text="can not implement lazyTjp at joinpoint method-execution(void LazyTjpTest5.test1()) because of advice conflicts, see secondary locations to find conflicting advice"/>
-		  <message kind="warning" line="13" text="can not build thisJoinPoint lazily for this advice since it has no suitable guard"/>
-		</compile>
-	</ajc-test>
-    
-    <ajc-test dir="options" 
-      title="options -Xlint args()" 
-      keywords="lint">
-        <compile files="XLintTypeArgsPCD.java">
-            <message kind="warning" line="10"/>
-        </compile>
-    </ajc-test>
- 
-    <ajc-test dir="options" 
-      title="options declare field on bad type">
-        <compile files="XLintTypeDeclareField.java" options="!eclipse">
-            <message kind="error" line="10"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="options" 
-      title="options declare method on bad type">
-        <compile files="XLintTypeDeclareMethod.java" options="!eclipse">
-            <message kind="error" line="10"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="options" 
-      title="options -Xlint declare parent" 
-      keywords="lint">
-        <compile files="XLintTypeDeclareParent.java">
-            <message kind="warning" line="10"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="options" 
-      title="options -Xlint target()" 
-      keywords="lint">
-        <compile files="XLintTypeTargetPCD.java">
-            <message kind="warning" line="10"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="options" 
-      title="options -Xlint this()" 
-      keywords="lint">
-        <compile files="XLintTypeThisPCD.java">
-            <message kind="warning" line="10"/>
-        </compile>
-    </ajc-test>
-
-    <!-- ............... negative -Xlint tests -->
-    <ajc-test dir="options" 
-      title="options negative -Xlint args()" 
-      keywords="lint">
-        <compile files="XLintTypeArgsPCD.java" options="-Xlint:ignore"/>
-    </ajc-test>
-    
-    <ajc-test dir="options" 
-      title="options negative -Xlint declare parent" 
-      keywords="lint">
-        <compile files="XLintTypeDeclareParent.java" options="-Xlint:ignore"/>
-    </ajc-test>
-    
-    <ajc-test dir="options" 
-      title="options negative -Xlint target()" 
-      keywords="lint">
-        <compile files="XLintTypeTargetPCD.java" options="-Xlint:ignore"/>
-    </ajc-test>
-    
-    <ajc-test dir="options" 
-      title="options negative -Xlint this()" 
-      keywords="lint">
-        <compile files="XLintTypeThisPCD.java" options="-Xlint:ignore"/>
-    </ajc-test>
-
-       
-    <ajc-test dir="new"
-      title="unmatched type name in a declare parents should result in a warning in -Xlint mode"
-      keywords="tofix">
-        <compile options="-Xlint" files="MissingTypeInDeclareParents.java">
-            <message kind="warning" line="20"/>
-        </compile>
-        <run class="MissingTypeInDeclareParents"/>
-    </ajc-test>
-   
-       
-	<!-- The correct behavior of this program is to produce an Xlint
-	     warning for the lack of access to the needed type, and then
-	     to generate code with link errors that will throw a NoSuchMethodError
-	     when run.
-	-->
-    <ajc-test dir="bugs" pr="906"
-      title="privileged access to code outside the control of the compiler">
-        <compile files="PrivilegeBeyondScope.java" options="-Xlint:warning">
-		  <message kind="warning" line="23"/>
-        </compile>
-    </ajc-test>    
-
-   <ajc-test dir="bugs" pr="37739"
-   	 title="Unexpected Xlint:unresolvableMember warning with withincode">
-        <compile files="CatchSig.java">
-        </compile>
-        <run class="CatchSig"/>
-    </ajc-test>
- 
- 
-    <ajc-test dir="harness" 
-        title="valid XLintWarningTest file, default level of warning">
-        <compile files="XLintWarningTest.java" options="-1.4">
-        	<message kind="warning" line="5"
-        		 text="Xlint:invalidAbsoluteTypeName"/> 
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="harness" 
-        title="XLint:ignore suppresses XLint warnings">
-        <compile files="XLintWarningTest.java" options="-Xlint:ignore"/>
-    </ajc-test>
-
-     <ajc-test dir="harness" 
-        title="XLint:error promotes XLint warnings to error">
-        <compile files="XLintWarningTest.java" options="-Xlint:error">
-        	<message kind="error" line="5" 
-        		text="Xlint:invalidAbsoluteTypeName"/> 
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs" pr="49250"
-      title="alias getCause for getWrappedThrowable in SoftException">
-        <compile files="GetCauseOnSoftException.java" options="-Xlint:warning">
-        </compile>
-        <run vm="1.3" class="GetCauseOnSoftException"/>
-    </ajc-test>
-
-	<ajc-test dir="bugs"
-		title="XLint warning for call PCD's using subtype of defining type"
-		pr="41952"
-		>
-		<compile 
-			files="DeclaringTypeWarning.java"
-			options="-1.3" >
-			<message kind="warning" line="6" text="declaring type">
-				<source line="12" file="DeclaringTypeWarning.java" />
-			</message>
-			<message kind="warning" line="6"  text="declaring type">
-				<source line="14" file="DeclaringTypeWarning.java" />
-			</message>			
-		</compile>
-		</ajc-test>
-
-   <ajc-test dir="bugs"
-		title="XLint warning for call PCD's using subtype of defining type (-1.3 -Xlint:ignore)"
-		pr="41952"
-		>
-		<compile
-			options="-Xlint:ignore,-1.3" 
-			files="DeclaringTypeWarning.java" >
-		</compile>
-	</ajc-test>
-
-<!--	
-   <ajc-test dir="bugs/seven/lint" title="7 lint warnings" pr="91719">
-  <compile options="-1.5" files="Main.java">
-   <message kind="warning" line="31"  text="no match for this type name: java.xxx.Object [Xlint:invalidAbsoluteTypeName]">
-   </message> 
-   <message kind="warning" line="34"  text="no match for this type name: java.lang.Xxx [Xlint:invalidAbsoluteTypeName]">
-   </message>
-   <message kind="warning" line="41"  text="no match for this type name: java.lang.Xxx [Xlint:invalidAbsoluteTypeName]">
-   </message>
-   <message kind="warning" line="69"  text="this affected type is not exposed to the weaver: java.lang.Object [Xlint:typeNotExposedToWeaver]">
-   </message>
-   <message kind="warning" line="87"  text="does not match because declaring type is java.lang.Object, if match desired use target(Car) [Xlint:unmatchedSuperTypeInCall]">
-   </message>
-   <message kind="warning" line="92"  text="advice defined in XlintTest has not been applied [Xlint:adviceDidNotMatch]">
-   </message>
-   <message kind="warning" line="157"  text="no interface constructor-execution join point - use java.util.List+ for implementing classes [Xlint:noInterfaceCtorJoinpoint]">
-   </message>
-  </compile>
-  </ajc-test>
--->
-
-    <ajc-test dir="harness" 
-        title="Two Xlint warnings wth cflow?">
-        <compile files="XLintcflow.java" options="-1.5">
-        	<message kind="warning" line="4"  text="advice defined in A has not been applied [Xlint:adviceDidNotMatch]"/>
-        </compile>
-    </ajc-test>
-	
- 
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/xlint/xlint.xml b/tests/src/test/java/org/aspectj/systemtest/xlint/xlint.xml
deleted file mode 100644
index efe2a0014..000000000
--- a/tests/src/test/java/org/aspectj/systemtest/xlint/xlint.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[
-<!ENTITY tests SYSTEM "../tests/src/org/aspectj/systemtest/xlint/xlint-tests.xml">
-]>
-<!-- XLint Tests -->
-
-<suite>
-
-&tests;
-
-</suite>
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/testing/Harness.java b/tests/src/test/java/org/aspectj/testing/Harness.java
index e21f924f1..cfa587bbc 100644
--- a/tests/src/test/java/org/aspectj/testing/Harness.java
+++ b/tests/src/test/java/org/aspectj/testing/Harness.java
@@ -1,39 +1,39 @@
-/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * This file is part of the compiler and core tools for the AspectJ(tm)
- * programming language; see http://aspectj.org
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * either http://www.mozilla.org/MPL/ or http://aspectj.org/MPL/.
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is AspectJ.
- *
- * The Initial Developer of the Original Code is Xerox Corporation. Portions
- * created by Xerox Corporation are Copyright (C) 1999-2002 Xerox Corporation.
- * All Rights Reserved.
- *
- * Contributor(s):
- */
-package org.aspectj.testing;
-
-/**
- * @see org.aspectj.testing.drivers.Harness
- */
-public class Harness {
-
-	private Harness() {}
-
-    /**
-     * @see org.aspectj.testing.drivers.Harness#main(String[])
-     */
-	public static void main(String[] args) throws Exception {
-        org.aspectj.testing.drivers.Harness.main(args);
-	}
-}
+///* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// *
+// * This file is part of the compiler and core tools for the AspectJ(tm)
+// * programming language; see http://aspectj.org
+// *
+// * The contents of this file are subject to the Mozilla Public License
+// * Version 1.1 (the "License"); you may not use this file except in
+// * compliance with the License. You may obtain a copy of the License at
+// * either http://www.mozilla.org/MPL/ or http://aspectj.org/MPL/.
+// *
+// * Software distributed under the License is distributed on an "AS IS" basis,
+// * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+// * for the specific language governing rights and limitations under the
+// * License.
+// *
+// * The Original Code is AspectJ.
+// *
+// * The Initial Developer of the Original Code is Xerox Corporation. Portions
+// * created by Xerox Corporation are Copyright (C) 1999-2002 Xerox Corporation.
+// * All Rights Reserved.
+// *
+// * Contributor(s):
+// */
+//package org.aspectj.testing;
+//
+///**
+// * @see org.aspectj.testing.drivers.Harness
+// */
+//public class Harness {
+//
+//	private Harness() {}
+//
+//    /**
+//     * @see org.aspectj.testing.drivers.Harness#main(String[])
+//     */
+//	public static void main(String[] args) throws Exception {
+//        org.aspectj.testing.drivers.Harness.main(args);
+//	}
+//}
diff --git a/tests/src/test/java/org/aspectj/testing/Utils.java b/tests/src/test/java/org/aspectj/testing/Utils.java
index 92e0ed833..524ac7186 100644
--- a/tests/src/test/java/org/aspectj/testing/Utils.java
+++ b/tests/src/test/java/org/aspectj/testing/Utils.java
@@ -17,9 +17,9 @@ import org.aspectj.apache.bcel.classfile.JavaClass;
 import org.aspectj.apache.bcel.classfile.Method;
 import org.aspectj.apache.bcel.util.ClassPath;
 import org.aspectj.apache.bcel.util.SyntheticRepository;
-import org.aspectj.apache.bcel.verifier.VerificationResult;
-import org.aspectj.apache.bcel.verifier.Verifier;
-import org.aspectj.apache.bcel.verifier.VerifierFactory;
+//import org.aspectj.apache.bcel.verifier.VerificationResult;
+//import org.aspectj.apache.bcel.verifier.Verifier;
+//import org.aspectj.apache.bcel.verifier.VerifierFactory;
 import org.aspectj.tools.ajc.Ajc;
 
 /**
@@ -29,45 +29,45 @@ public class Utils {
 	
 	private final static boolean debugVerification=false;
 	
-	/**
-	 * Performs verification of a class - the supplied class is expected to exist in the sandbox
-	 * directory so typically this is called after a small compile step has been invoked to build it.
-	 * @param ajc 
-	 */
-	public static String verifyClass(Ajc ajc, String clazzname) {
-		JavaClass jc = null;
-		try {
-			jc = getClassFrom(ajc.getSandboxDirectory().getAbsolutePath(),clazzname);
-		} catch (ClassNotFoundException cnfe) {
-			return "Could not find "+clazzname+" in the sandbox: "+ajc.getSandboxDirectory();
-		}
-		if (jc==null) return "Could not find class "+clazzname;
-		Repository.setRepository(jc.getRepository());
-		Verifier v = VerifierFactory.getVerifier("mypackage.MyAspect"); 
-		VerificationResult vr = v.doPass1();
-		if (debugVerification) System.err.println(vr);
-		
-		if (vr.getStatus()!=VerificationResult.VERIFIED_OK)
-			return "Verification not ok: "+vr;
-		vr = v.doPass2();
-		if (debugVerification) System.err.println(vr);
-		if (vr.getStatus()!=VerificationResult.VERIFIED_OK)
-			return "Verification not ok: "+vr;
-		Method[] ms = jc.getMethods();
-		for (int i = 0; i < ms.length; i++) {
-			if (debugVerification) System.err.println("Pass3a for "+ms[i]);
-			vr = v.doPass3a(i);
-			if (debugVerification) System.err.println(vr);		
-			if (vr.getStatus()!=VerificationResult.VERIFIED_OK)
-				return "Verification not ok: "+vr;
-			if (debugVerification) System.err.println("Pass3b for "+ms[i]);
-			vr = v.doPass3b(i);
-			if (debugVerification) System.err.println(vr);
-			if (vr.getStatus()!=VerificationResult.VERIFIED_OK)
-				return "Verification not ok: "+vr;
-		}
-		return null;
-	}
+//	/**
+//	 * Performs verification of a class - the supplied class is expected to exist in the sandbox
+//	 * directory so typically this is called after a small compile step has been invoked to build it.
+//	 * @param ajc 
+//	 */
+//	public static String verifyClass(Ajc ajc, String clazzname) {
+//		JavaClass jc = null;
+//		try {
+//			jc = getClassFrom(ajc.getSandboxDirectory().getAbsolutePath(),clazzname);
+//		} catch (ClassNotFoundException cnfe) {
+//			return "Could not find "+clazzname+" in the sandbox: "+ajc.getSandboxDirectory();
+//		}
+//		if (jc==null) return "Could not find class "+clazzname;
+//		Repository.setRepository(jc.getRepository());
+//		Verifier v = VerifierFactory.getVerifier("mypackage.MyAspect"); 
+//		VerificationResult vr = v.doPass1();
+//		if (debugVerification) System.err.println(vr);
+//		
+//		if (vr.getStatus()!=VerificationResult.VERIFIED_OK)
+//			return "Verification not ok: "+vr;
+//		vr = v.doPass2();
+//		if (debugVerification) System.err.println(vr);
+//		if (vr.getStatus()!=VerificationResult.VERIFIED_OK)
+//			return "Verification not ok: "+vr;
+//		Method[] ms = jc.getMethods();
+//		for (int i = 0; i < ms.length; i++) {
+//			if (debugVerification) System.err.println("Pass3a for "+ms[i]);
+//			vr = v.doPass3a(i);
+//			if (debugVerification) System.err.println(vr);		
+//			if (vr.getStatus()!=VerificationResult.VERIFIED_OK)
+//				return "Verification not ok: "+vr;
+//			if (debugVerification) System.err.println("Pass3b for "+ms[i]);
+//			vr = v.doPass3b(i);
+//			if (debugVerification) System.err.println(vr);
+//			if (vr.getStatus()!=VerificationResult.VERIFIED_OK)
+//				return "Verification not ok: "+vr;
+//		}
+//		return null;
+//	}
 	
 	public static JavaClass getClassFrom(String frompath,String clazzname) throws ClassNotFoundException {
 		SyntheticRepository repos = createRepos(frompath);
diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc10x/ajc10x-tests.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc10x/ajc10x-tests.xml
index 56ee8f6e4..e69de29bb 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc10x/ajc10x-tests.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/ajc10x/ajc10x-tests.xml
@@ -1,2013 +0,0 @@
-<!-- AspectJ v1.0.x Tests -->
-
-
-    <ajc-test dir="new"
-      title="properly make choice between cast and parenthesis in parser"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="JoinPointFields.java"/>
-        <run class="JoinPointFields"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="96"
-      title="field from implemented interface not found in advice"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="FieldFromImplementsNotFound.java"/>
-        <run class="FieldFromImplementsNotFound"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="make sure advice affects introduced methods and constructors"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AdviceOnIntroduced.java"/>
-        <run class="AdviceOnIntroduced"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="new around construct"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AroundAdvice.java"/>
-        <run class="AroundAdvice"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="65" title="aspect redefines a parameter"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AspectRedefinesParam.java"/>
-        <run class="AspectRedefinesParam"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="introducing extends and implements"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="HierarchyIntroductions.java"/>
-        <run class="HierarchyIntroductions"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="104" title="(related) aspect on interface"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AspectOnInterface.java"/>
-        <run class="AspectOnInterface"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="106" title="advice and package visibility"
-      keywords="from-resolved_10x">
-        <compile
-          files="packagevisibility/PackagesAndAdvice.java,packagevisibility/testPackage/Class1.java,packagevisibility/testPackage/Class2.java"
-          options="-Xlint:ignore"/>
-        <run class="packagevisibility.PackagesAndAdvice"/>
-    </ajc-test>
-    
-    <ajc-test dir="new" pr="106" title="advice and package visibility"
-      keywords="from-resolved_10x">
-        <compile
-          files="packagevisibility/PackagesAndAdviceCf.java,packagevisibility/testPackage/Class1.java,packagevisibility/testPackage/Class2.java"
-          options="-Xlint:error">
-        <message kind="error" line="29"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" title="advice on implied empty constructor"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AdviceOnEmptyConstructor.java"/>
-        <run class="AdviceOnEmptyConstructor"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="advice on * *(..) not mapping to initializers"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="InitializerAdvice.java"/>
-        <run class="InitializerAdvice"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="three type declarations in the scope of an advice"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="TypeDeclInAdvice.java"/>
-        <run class="TypeDeclInAdvice"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="129"
-      title="introduction fails on class with an inner class that extends or implements something"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="IntroductionFailsWithInnerClass.java"/>
-        <run class="IntroductionFailsWithInnerClass"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="126"
-      title="checks that methods are introduced on the topmost class implemented"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="TopmostImplements.java"/>
-        <run class="TopmostImplements"/>
-    </ajc-test>
-
-    <ajc-test dir="new/arndAdvRet" pr="140"
-      title="a couple different returns from around advice"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="member finally advice paired with signature advice"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="TryErrors.java"/>
-        <run class="TryErrors"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="aspect of eachobject(instanceof(Interface))"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AspectOfInterface.java"/>
-        <run class="AspectOfInterface"/>
-    </ajc-test>
-
-    <ajc-test dir="new/finalMemInit" pr="162"
-      title="final member initialization broken with JDK before 1.1.8"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="new/packageNameClash" pr="205"
-      title="same package and var name clash in preprocessed code when aspectOf is used"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="otherpkg/Driver.java,pkg/Aspect1.java,pkg/Class1.java"/>
-        <run class="otherpkg.Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="new/adviceOnStaticMeth" pr="221"
-      title="and PR#201 advice on static methods fails javac compile with this"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="non-static advice on inner class defined inside of method body"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="MethodInner.java"/>
-        <run class="MethodInner"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="simple single-threaded eachcflow test (includes aspectOf)"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Client.java"/>
-        <run class="Client"/>
-    </ajc-test>
-
-    <ajc-test dir="new/scopeTypingBug" pr="191"
-      title="bad type resolution when var reassigned in same scope"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="242"
-      title="generating the right throws clause for call-site advice (and around)"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="ComputedThrows.java"/>
-        <run class="ComputedThrows"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="246"
-      title="advice on calls to static methods using several syntax"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="StaticCalls.java"/>
-        <run class="StaticCalls"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="248"
-      title=", PR#249, PR#250 advice on constructor sites"
-      keywords="from-resolved_10x">
-        <compile files="NewSiteAdvice.java" options="-1.4 -Xlint:ignore"/>
-        <run class="NewSiteAdvice"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="test after throwing advice in several ways"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AfterThrowing.java"/>
-        <run class="AfterThrowing"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="fancy name patterns for method names"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="WildNames.java"/>
-        <run class="WildNames"/>
-    </ajc-test>
-
-    <ajc-test dir="design/calls" title="calls: calls(...)"
-      keywords="from-resolved_10x">
-        <compile files="Simple.java" options="-Xlint:ignore -1.4"/>
-        <run class="Simple"/>
-    </ajc-test>
-
-    <ajc-test dir="new/extraThrows" pr="259"
-      title="throws Exception clause is unnecessarily added to Driver.main method"
-      keywords="from-resolved_10x">
-        <compile files="Driver.java" options="-Xlint:ignore -1.4"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="new/thisUsedInMain" pr="262"
-      title="javac fails when this is referenced in the static main method"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="new/badCast" pr="275"
-      title="and 276 cast error generated by ajc when type not in signature"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="285"
-      title="calls to methods to which we don't have source"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="ExternalCalls.java"/>
-        <run class="ExternalCalls"/>
-    </ajc-test>
-
-    <ajc-test dir="new/beforeNotRun" pr="265" title="more aspect inheritance"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="310"
-      title="around and calls with both calling and called this params"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AroundAndCalls.java"/>
-        <run class="AroundAndCalls"/>
-    </ajc-test>
-
-    <ajc-test dir="new/pointcutParameter" pr="290"
-      title="compiler crashes with eachobject and named pointcuts with parameters"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="new/unqualifiedPointcutName" pr="304"
-      title="lookup rules for unqualified pointcut names"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="321"
-      title="eachcflow only instantiated if the aspect has some advice in it"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="CFlowNoAdvice.java"/>
-        <run class="CFlowNoAdvice"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="309"
-      title="(DESIGN QUESTION) aspect of eachJVM advising its own initializer"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="EachJVMOnSelf.java"/>
-        <run class="EachJVMOnSelf"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="302"
-      title="after returning advice on calls to constructors"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AfterConstructorCalls.java"/>
-        <run class="AfterConstructorCalls"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Does annotating 'new' with a type work as desired?"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="ConstructorSignatures.java"/>
-        <run class="ConstructorSignatures"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Referring to inner classes as {super}.{inner} confused ajc."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="InnerClassNaming.java"/>
-        <run class="InnerClassNaming"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Advice on advice" keywords="from-resolved_10x">
-        <compile options="-1.4" files="AdviceOnAdvice.java"/>
-        <run class="AdviceOnAdvice"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Introductions on other introductions"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="IntroOnIntro.java"/>
-        <run class="IntroOnIntro"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Putting advice on array constructors."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Orleans.java"/>
-        <run class="Orleans"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="call points within block inner classes are doubled"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="DoubledCalls.java"/>
-        <run class="DoubledCalls"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Gets and sets with other advice"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Counting3.java"/>
-        <run class="Counting3"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Compiler can compile correct strictfp modifiers"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="StrictFpCompile.java"/>
-        <run class="StrictFpCompile"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="basic test of callsto pointcuts"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="CallsTo.java"/>
-        <run class="CallsTo"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="package wildcards in packages"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="pack/PackageWildcards.java"/>
-        <run class="pack.PackageWildcards"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="around advice on calls and receptions with lots of context"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AroundCalls.java"/>
-        <run class="AroundCalls"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="208"
-      title="! modifier and char in pointcut (no longer an error)"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="NotCharInPointcut.java"/>
-        <run class="NotCharInPointcut"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="308"
-      title="right number of aspect instances per cflow"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="CFlowObjects.java"/>
-        <run class="CFlowObjects"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="310" title="many this's into around advice on calls"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AroundCallsArgs.java"/>
-        <run class="AroundCallsArgs"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Ensures introduction methods can have advice placed on them"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Dominates.java"/>
-        <run class="Dominates"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="355"
-      title="No boolean appearing in the 'if' clause for around advice with eachJVM()"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="PR355.java"/>
-        <run class="PR355"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Order of super introductions."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="OrderOfExtendsPlusAndImplementsPlus.java"/>
-        <run class="OrderOfExtendsPlusAndImplementsPlus"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Ensuring backdoor methods are produced."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="BackdoorMethods.java"/>
-        <run class="BackdoorMethods"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="no duplicate advice methods in abstract aspects"
-      keywords="from-resolved_10x">
-        <compile
-          files="GeneratingDuplicateNamedAdviceMethodsInAbstractAspects.java"/>
-        <run class="GeneratingDuplicateNamedAdviceMethodsInAbstractAspects"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="no duplicate advice methods in abstract aspects extended"
-      keywords="from-resolved_10x">
-        <compile
-          files="GeneratingDuplicateNamedAdviceMethodsInAbstractAspectsWithExtendedAspect.java"/>
-        <run class="GeneratingDuplicateNamedAdviceMethodsInAbstractAspectsWithExtendedAspect"
-        />
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Putting after-constructor advice on the wrong types implementing the same interface."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AfterAdviceOnConstructorsOnTheWrongType.java"/>
-        <run class="AfterAdviceOnConstructorsOnTheWrongType"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Instantiating non-static inner classes in advice."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="NonstaticInnerClassesInAspects.java"/>
-        <run class="NonstaticInnerClassesInAspects"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="316" title="Referring to pointcut in of clauses"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="ReferringToPointcutsInAspect_PR316.java"/>
-        <run class="ReferringToPointcutsInAspect_PR316"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="191"
-      title="Confused referring to instance variables and locals"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="ScopesAndFields_PR191.java"/>
-        <run class="ScopesAndFields_PR191"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Parsing C+ expressions without parens in super introductions."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="ParsingSubtypesIntroductions.java"/>
-        <run class="ParsingSubtypesIntroductions"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Introducing methods on classes that implements inner-interfaces with +implements."
-      keywords="from-resolved_10x">
-        <compile files="IntroducingMethodsOnPlusImplementedInterfaces.java" options="-Xlint:ignore -1.4"/>
-        <run class="IntroducingMethodsOnPlusImplementedInterfaces"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="464"
-      title="Methods with the same name are generated when abstract aspects extend another abstract aspect."
-      keywords="from-resolved_10x">
-        <compile
-          files="AbstractAspectsExtendingAbstractAspectsGeneratesMethodsWithTheSameName_PR464.java"/>
-        <run class="AbstractAspectsExtendingAbstractAspectsGeneratesMethodsWithTheSameName_PR464"
-        />
-    </ajc-test>
-
-    <ajc-test dir="new" title="Making sure final variables stay final."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="RemovingFinals.java"/>
-        <run class="RemovingFinals"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Problem resolving meta-joinpoint names with around advice on methods called from around advice."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AroundAdviceOnMethodsCalledInAroundAdvice.java"/>
-        <run class="AroundAdviceOnMethodsCalledInAroundAdvice"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Make sure that names of lifted local classes are right when referenced in call-site advice"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="CallsAndLocalClasses.java"/>
-        <run class="CallsAndLocalClasses"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="matching for throws clause"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="ThrowsMatching.java"/>
-        <run class="ThrowsMatching"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="basic test of declare soft"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="DeclareSoft.java"/>
-        <run class="DeclareSoft"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="advice on calls to constructors of anonymous inners and access to context"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="NewAnonymous.java"/>
-        <run class="NewAnonymous"/>
-    </ajc-test>
-
-    <ajc-test dir="new/innerAspectAccess" pr="211"
-      title="inner aspects can't access outer pointcuts"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="implements and extends are introduced before methods and fields"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="IntroOrder.java"/>
-        <run class="IntroOrder"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="a static/inner aspect of a inner class of an aspect is pulled to the top level as static"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="StaticInnerAspect.java"/>
-        <run class="StaticInnerAspect"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Crashes with privileged aspect."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Privileged.java"/>
-        <run class="Privileged"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="join points exist in the execution of field initializers"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="FieldInitializerJoinPoints.java"/>
-        <run class="FieldInitializerJoinPoints"/>
-    </ajc-test>
-
-    <ajc-test dir="new/privilegedAspects" title="privileged aspects"
-      keywords="from-resolved_10x">
-        <compile
-          files="main/Main.java,fish/PrivateClass.java,fish/B.java,fowl/C.java,fowl/D.java"/>
-        <run class="main.Main"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="advice on field gets in privileged aspects"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AdviceOnPrivileged.java"/>
-        <run class="AdviceOnPrivileged"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Two anonymous classes in the same scope"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="TwoAnonymous.java"/>
-        <run class="TwoAnonymous"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="basic tests for initializer and staticinitializer PCDs"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="InitializerTest.java"/>
-        <run class="InitializerTest"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="98"
-      title="introduction of an initializer into a class"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="IntroductionOfInitializer.java"/>
-        <run class="IntroductionOfInitializer"/>
-    </ajc-test>
-
-    <ajc-test dir="new/access"
-      title="some method accessibility tests, particularly package-protected and inheritance"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Test1.java,pc/C.java,psub/SubC.java,psub/A.java"/>
-        <run class="Test1"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="fairly monotonous (and non-covering) tests for expanded dot patterns"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="ExpandedDotDotPattern.java"/>
-        <run class="ExpandedDotDotPattern"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="field patterns and subtyping"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="FieldPatterns.java"/>
-        <run class="FieldPatterns"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Checking formal matching as in Roeder's bug in 0.7b10"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="FormalMatching.java"/>
-        <run class="FormalMatching"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Introducing synchronized methods on interfaces."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="SynchronizedMethodsOnInterfaces.java"/>
-        <run class="SynchronizedMethodsOnInterfaces"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="The pointcut params (..,int..) is not recognizing (Object,int,Object)."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Params.java"/>
-        <run class="Params"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="calls advice on array objects causes error in code generation"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="CallsToArray.java"/>
-        <run class="CallsToArray"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="join points in field initializers aren't showing up."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="NonexistentFieldInitializers.java"/>
-        <run class="NonexistentFieldInitializers"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="318" title="Handlers problem"
-      keywords="from-resolved_10x">
-        <compile files="PR318.java" options="-Xlint:ignore -1.4"/>
-        <run class="PR318"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="work nicely with inner class method look-up rules and call-site advice"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="InnerMethods.java"/>
-        <run class="InnerMethods"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="strictfp modifier allowed on advice"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="StrictFPAdvice.java"/>
-        <run class="StrictFPAdvice"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="415"
-      title="No argthis was being created for calls advice."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="PR415.java"/>
-        <run class="PR415"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Ensuring no advice with instanceof(..) is run on static methods."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="StaticMethodsShouldNotReceiveInstanceofAdvice.java"/>
-        <run class="StaticMethodsShouldNotReceiveInstanceofAdvice"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Null pointer on gets advice showing the case causing the error"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="NullPointerOnGetsSimple.java"/>
-        <run class="NullPointerOnGetsSimple"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="try to make sure that dynamic JoinPoint objects aren't generated when used inside of if (false) { ... }"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="IfdefsAndAdvice.java"/>
-        <run class="IfdefsAndAdvice"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="within and withincode (doesn't all work due to local class name issues)"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="WithinInners.java"/>
-        <run class="WithinInners"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="around advice on calls within inner classes (including protected method calls)"
-      keywords="from-resolved_10x">
-        <compile files="AroundInnerCalls13.java" options="-1.3"/>
-        <run class="AroundInnerCalls13"/>
-    </ajc-test>
-
-	<ajc-test dir="new"
-      title="around advice on calls within inner classes (including protected method calls)"
-      keywords="from-resolved_10x">
-        <compile files="AroundInnerCalls.java" options="-1.4"/>
-        <run class="AroundInnerCalls"/>
-    </ajc-test>
-    
-    <ajc-test dir="new" title="Arguments to runNext should be final when needed"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Finals.java"/>
-        <run class="Finals"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Method introductions"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="MethodIntroductions.java"/>
-        <run class="MethodIntroductions"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Putting an introduced method on each interface"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="IntroducedMethodsOnEachInterface.java"/>
-        <run class="IntroducedMethodsOnEachInterface"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Extending interfaces"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="BindingInterfaces.java"/>
-        <run class="BindingInterfaces"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Introducing private methods on interfaces"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="IntroducingPrivateMethodsOnInterfaces.java"/>
-        <run class="IntroducingPrivateMethodsOnInterfaces"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Issuing errors for assigning variables thisJoinPoint -- not assigning thisJoinPoint."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="ThisJoinPointAssignments.java"/>
-        <run class="ThisJoinPointAssignments"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Static references inside of introduced bodies get bound correctly."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="StaticIntroducedReferences.java"/>
-        <run class="StaticIntroducedReferences"/>
-    </ajc-test>
-
-    <ajc-test dir="new/cflowObjectCreations" pr="307"
-      title="cflow and object creations [of eachcflow]"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="new/twofiles"
-      title="Doesn't import MightHaveAspect when compiling with more than 1 file. [eachobject]"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="TheObject.java,TheAspect.java"/>
-        <run class="TheObject"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="436"
-      title="test binding to formals in calls to constructors (binding to null) (eachobject !!! now misnamed)"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="BindingThisInsteadOfFormal.java"/>
-        <run class="BindingThisInsteadOfFormal"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="After advice isn't being woven into after throwing advice"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AfterThrowingNotWoven.java"/>
-        <run class="AfterThrowingNotWoven"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Throwing an EmptyStackException."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="EmptyStack.java"/>
-        <run class="EmptyStack"/>
-    </ajc-test>
-
-	<ajc-test dir="new/perThis"
-	    title="check that MightHaveAspect interface is created correctly for an aspect in deep package"
-	    keywords="from-resolved_10x">
-	      <compile options="-1.4" files="p/EachObjectTarget.java,the/deep/pkg/EachObjectInDeepPackage.java"/>
-	      <run class="p.EachObjectTarget"/>
-	</ajc-test>
-  
-    <ajc-test dir="new" title="Defines clfow$ajc0 more once. [eachcflow]"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Binkley.java"/>
-        <run class="Binkley"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Various calls, receptions, and callsto tests [callsto]"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="CallsReceptionsCallsto.java"/>
-        <run class="CallsReceptionsCallsto"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="320"
-      title="Was throwing exception, now just an error. [eachobject]"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="PR320.java"/>
-        <run class="PR320"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="different version of aspect inheritance, particularly empty pointcuts and abstract cflows [eachcflow]"
-      keywords="from-resolved_10x,fail-unimplemented">
-        <compile options="-1.4" files="AspectInheritance.java"/>
-        <run class="AspectInheritance"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="339"
-      title="set advice on member initing throwing exception [eachobject]"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="PR339.java"/>
-        <run class="PR339"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="417"
-      title="Testing class names with same name's with difference case as package. [eachobject]"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="test/TraceAspect.java,test/Test.java"/>
-        <run class="test.Test"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Null pointer on gets advice with coverage [painful]"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="NullPointerOnGets.java"/>
-        <run class="NullPointerOnGets"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Basic test for cflow pointcuts [eachcflow]"
-      keywords="from-resolved_10x">
-        <compile files="CFlowPoints.java" options="-Xlint:ignore -1.4"/>
-        <run class="CFlowPoints"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Crashing when looking up the type of array members."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="ArrayCasts.java"/>
-        <run class="ArrayCasts"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="PostfixExprs to various synthetic things are fixed correctly [eachobject]"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Fixes.java"/>
-        <run class="Fixes"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Dave Binkley's problem with eachcflowroot. [eachcflow]"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Binkley2.java"/>
-        <run class="Binkley2"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="105" title="advice on an inherited method"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AdviceOnInheritedMethod.java"/>
-        <run class="AdviceOnInheritedMethod"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="114"
-      title=", PR#115 checks the ordering of catch clauses"
-      keywords="from-resolved_10x">
-        <compile files="OrderOfCatches.java" options="-Xlint:ignore -1.4"/>
-        <run class="OrderOfCatches"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="various declared exception permutations"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="DeclaredExcs.java"/>
-        <run class="DeclaredExcs"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="ordering of advice kinds as well as cflow and dominates"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AdviceOrdering.java"/>
-        <run class="AdviceOrdering"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="241"
-      title="advice on default constructor for a class only referenced via reflection"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="OddConstructors.java"/>
-        <run class="OddConstructors"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="289"
-      title="calling and called this params in calls points"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="CallsParams.java"/>
-        <run class="CallsParams"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="322"
-      title="primitive parameters coercable to Object just like return values are"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="ObjectForInt.java"/>
-        <run class="ObjectForInt"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="join points in static/dynamic initializers aren't showing up."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="NonexistentInitializers.java"/>
-        <run class="NonexistentInitializers"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Gets and sets on a number of variables (field access ???)"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Gets.java"/>
-        <run class="Gets"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Joinpoints are showing up on intermediate call sites"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Counting1.java"/>
-        <run class="Counting1"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Reception based on strictfp modifier"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="StrictFpReceptions.java"/>
-        <run class="StrictFpReceptions"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="353"
-      title="Subclasses that do not redefine a method are not being handled correctly"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="PR353b.java"/>
-        <run class="PR353b"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="making sure that super calls are bound to the right methods"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="SupersAndInterfaces.java"/>
-        <run class="SupersAndInterfaces"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="317"
-      title="inheritance, around advice and abstract pointcuts [eachobject] (still)"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="OverridingPointcuts.java"/>
-        <run class="OverridingPointcuts"/>
-    </ajc-test>
-
-    <ajc-test dir="new/foemmel"
-      title="Priviledged aspect methods are missing for privates. [eachobject]"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="TheAspect.java,TheObject.java">
-        </compile>
-        <run class="TheObject"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="exceptions thrown and caught in advice, particularly try+proceed"
-      keywords="from-resolved_10x">
-        <compile files="TryAndProceed.java" options="-Xlint:ignore -1.4"/>
-        <run class="TryAndProceed"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="Not and And operators in pointcuts not working"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="NotAndPointcut.java"/>
-        <run class="NotAndPointcut"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Member initializers should run before the current class constructor"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="MemberInitializationsAfterExplicitConstructorCalls.java"/>
-        <run class="MemberInitializationsAfterExplicitConstructorCalls"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Coverage tests for Member initializers should run before the current class constructor and after super"
-      keywords="from-resolved_10x">
-        <compile
-          files="MemberInitializationsAfterExplicitConstructorCallsCoverage.java"/>
-        <run class="MemberInitializationsAfterExplicitConstructorCallsCoverage"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="thisJoinPoint{Static} not visible in if() pcd of named pointcut"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="IfPCDExprJoinPointVisibleCE.java"/>
-        <run class="IfPCDExprJoinPointVisibleCE"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="pcd if() expression visibility at compile-time  (minimal operation)"
-      keywords="from-resolved_10x">
-        <compile files="IfPCDExprVisibility.java" options="-Xlint:ignore -1.4"/>
-        <run class="IfPCDExprVisibility"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="pcd if() NPE in compiler when unwinding assignment in pcd if(expr)"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="IfPCDExprAssignUnparseFailure.java"/>
-        <run class="IfPCDExprAssignUnparseFailure"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="pcd if() dup methods produced when pointcut after advice etc (javac)"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="IfPCDDupMethod.java"/>
-        <run class="IfPCDDupMethod"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="pcd if() variants: [anonymous, named] x [execution, call, callTyped, get, set, initializations] x [before, after, around]"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="IfPCDAdviceMethods.java"/>
-        <run class="IfPCDAdviceMethods"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="476" title="initialization order with this"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="InitializationOrder.java"/>
-        <run class="InitializationOrder"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="496"
-      title="!within and !this handling for callee-side call points"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="NotThis.java"/>
-        <run class="NotThis"/>
-    </ajc-test>
-
-    <ajc-test dir="new/innerInterfaces" pr="494"
-      title="private inner interfaces and bytecode visibility"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="p/Driver.java,p/InnerTest.java,other/Test.java"/>
-        <run class="p.Driver"/>
-    </ajc-test>
-
-	<!-- This has a complicated set of expected join points.
-	     This test should be borken up into more manageable chunks
-	     and more carefully analyzed for correctness in the future.
-	-->
-    <ajc-test dir="new" pr="490"
-      title="elaborated into testing of around on all join points"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AroundAll.java"/>
-        <run class="AroundAll"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="type name hygiene when code comes from aspects in different packages"
-      keywords="from-resolved_10x">
-        <compile options="-1.4"
-          files="typeNameConflicts/Driver.java,typeNameConflicts/p1/C.java,typeNameConflicts/aspects/A.java"/>
-        <run class="typeNameConflicts.Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="cflowbelow dependencies (from Chris Dutchyn)"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="CflowBelowTest.java"/>
-        <run class="CflowBelowTest"/>
-    </ajc-test>
-
-   <ajc-test dir="new" pr="493"
-      title="Compiler incorrectly flagging *1 (non-alphabetic start to signature pattern)"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="NonAlphaSignaturePatternCE.java"/>
-        <run class="NonAlphaSignaturePatternCE"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Unable to bind privately-introduced field name from introduced method in the same aspect"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="IntroducedFieldsNotBinding.java"/>
-        <run class="IntroducedFieldsNotBinding"/>
-    </ajc-test>
-
-    <ajc-test dir="new/anonInnerClass" pr="297"
-      title="anonymous inner class with aspect" keywords="from-resolved_10x">
-        <compile options="-1.4" files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="335"
-      title="Arguments are not being passed in to calls advice"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="PR335.java"/>
-        <run class="PR335"/>
-    </ajc-test>
-
-    <ajc-test dir="design/intro" title="interfaces as mixins with introduction"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Interfaces.java">
-        <message kind="error" text="can't override java.lang.String SubI.instanceField with java.lang.String SubC.instanceField visibility is reduced"/>
-        <message kind="error" text="can't override java.lang.String I.instanceField with java.lang.String C.instanceField visibility is reduced"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="design/intro" title="interfaces as mixins with introduction b"
-      keywords="from-resolved_10x">
-        <compile files="Interfaces.java" options="-Xset:itdVersion=1 -1.4"/>
-        <run class="Interfaces"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="functional modifiers work correctly with introduced members"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="IntroducedModifiers.java"/>
-        <run class="IntroducedModifiers"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="ExceptionInInitializerError accessing cflow in aspect initialization - before variants"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="CflowInitInAspectVariantsBefore.java"/>
-        <run class="CflowInitInAspectVariantsBefore"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="NoClassDefFoundError accessing cflow in aspect initialization - after variants"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="CflowInitInAspectVariantsAfter.java"/>
-        <run class="CflowInitInAspectVariantsAfter"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="InternalCompilerError in JpPlan when args alone"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="ArgsAlone.java"/>
-        <run class="ArgsAlone"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="527"
-      title="compile error using pcd if() with advice on introduced methods."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="PR527.java"/>
-        <run class="PR527"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="528"
-      title="compile errors boolean using cflow and unimplemented method using around advice on methods introduced by interface"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="PR528.java"/>
-        <run class="PR528"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="534" title="aspect as member of interface"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AspectInInterfaceCP.java"/>
-        <run class="AspectInInterfaceCP"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="535"
-      title="missing method name to synthetic invocation"
-      keywords="from-resolved_10x,new-messages-vary">
-        <compile options="-1.4" files="PR535.java"/>
-        <run class="PR535"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="536"
-      title="protected subclass impl of superclass method with default access and variants"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="RestrictingVisibilityCP.java"/>
-        <run class="RestrictingVisibilityCP"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="519" title="Exception planning advice"
-      keywords="from-resolved_10x">
-        <compile files="PR519.java" options="-Xlint:ignore -1.4"/>
-        <run class="PR519"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="521"
-      title="unreproduced bug with advice - probably UTR"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="PR520.java"/>
-        <run class="PR520"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="494"
-      title="introduced inner interfaces accessible inside aspect"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="IntroduceInnerInterfaceCP.java"/>
-        <run class="IntroduceInnerInterfaceCP"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="525"
-      title="validate (enclosing) join point and source locations"
-      keywords="from-resolved_10x">
-        <compile files="NegativeSourceLocation.java" options="-Xlint:ignore -1.4"/>
-        <run class="NegativeSourceLocation"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="544"
-      title="advice formals are just like method formals"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AdviceFormalsCp.java"/>
-        <run class="AdviceFormalsCp"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="544"
-      title="advice formals produce errors just like method formals"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AdviceFormalsCf.java">
-            <message kind="error" line="28"/>
-            <message kind="error" line="29"/>
-            <message kind="error" line="36"/>
-            <message kind="error" line="37"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="advice throws clauses must be compatible with joinpoints they apply to"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AdviceThrowsCp.java"/>
-        <run class="AdviceThrowsCp"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="570"
-      title="potential method conflicts with introductions and interfaces and PR#561"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="MethodConflictsCP.java"/>
-        <run class="MethodConflictsCP"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="570"
-      title="illegal method conflicts with introductions and interfaces and PR#561"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="MethodConflictsCF.java">
-            <message kind="error" line="8"/>
-            <message kind="error" line="20"/>
-            <message kind="error" line="28"/>
-        </compile>
-    </ajc-test>  
-
-    <ajc-test dir="new" title="AspectOf available for different aspect types"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AspectOf.java"/>
-        <run class="AspectOf"/>
-    </ajc-test>
-
-    <ajc-test dir="new/privilegedAspects" pr="35593"
-      title="access to all members of class and inner class from privileged aspect"
-      keywords="from-resolved_10x">
-        <compile options="-1.4"
-          files="driver/PrivilegedAspect.java,util/Util.java,pack/DefaultTarget.java,pack/PublicTarget.java"/>
-        <run class="driver.PrivilegedAspect"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="cflow alone with around produces compiler bcg StackOverflowError"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="CflowAlone.java"/>
-        <run class="CflowAlone"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="get/set join points run for complex assignment operators (+=, etc.) (working)"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AssignOps.java"/>
-        <run class="AssignOps"/>
-    </ajc-test>
-
-    <ajc-test dir="new/introTypeMissing"
-      title="this available in introduced field initializers"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="ThisInIntroFieldInit.java"/>
-        <run class="ThisInIntroFieldInit"/>
-    </ajc-test>
-
-    <ajc-test dir="new/introTypeMissing"
-      title="Introduced type unavailable to cast expressions in introduced methods"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Cast.java,TargetClass.java,Util.java"/>
-        <run class="Cast"/>
-    </ajc-test>
-
-    <ajc-test dir="new/introTypeMissing"
-      title="Introduced type unavailable to qualified new expressions in introduced methods"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Inner.java,TargetClass.java,Util.java"/>
-        <run class="Inner"/>
-    </ajc-test>
-
-    <ajc-test dir="new/introTypeMissing"
-      title="Introduced type unavailable to cast expressions in introduced field initializers"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="CastInFieldInit.java,TargetClass.java,Util.java"/>
-        <run class="CastInFieldInit"/>
-    </ajc-test>
-
-    <ajc-test dir="new/introTypeMissing"
-      title="Aspect type unavailable to qualified new expressions in body of introduced methods"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AspectInIntroducedMethod.java"/>
-        <run class="AspectInIntroducedMethod"/>
-    </ajc-test>
-
-
-    <ajc-test dir="new/introTypeMissing"
-      title="Introduced type unavailable to qualified new expressions in introduced field initializers"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="InnerInFieldInit.java,TargetClass.java,Util.java"/>
-        <run class="InnerInFieldInit"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="595"
-      title="variable slots and finally/catch causing verify errors"
-      keywords="from-resolved_10final,from-resolved_10x">
-        <compile options="-1.4" files="AfterFinally.java"/>
-        <run class="AfterFinally"/>
-    </ajc-test>
-
- 
-    <ajc-test dir="new" pr="590"
-      title="after advice on static method with pcd if() using result"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="PR590.java">
-            <message kind="error" line="20"/>
-            <message kind="error" line="23"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="590"
-      title="after advice on static method with pcd if() using result through pointcut"
-      keywords="from-resolved_10x">
-        <compile files="PR590a.java" options="-Xlint:ignore -1.4">
-            <message kind="error" line="29"/>
-            <message kind="error" line="31"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new/PR600" pr="600"
-      title="AbstractMethodError for introduced methods (order 1)"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Main.java,My_error.java,A.java,B.java,C.java"/>
-        <run class="Main"/>
-    </ajc-test>
-
-    <ajc-test dir="new/PR600" pr="600"
-      title="AbstractMethodError for introduced methods (order 2)"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Main.java,My_error.java,C.java,A.java,B.java"/>
-        <run class="Main"/>
-    </ajc-test>
-
-    <ajc-test dir="new/PR600" pr="600"
-      title="AbstractMethodError for introduced methods (order 3)"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="My_error.java,A.java,B.java,C.java,Main.java"/>
-        <run class="Main"/>
-    </ajc-test>
-
-    <ajc-test dir="new/PR600" pr="600"
-      title="AbstractMethodError for introduced methods (order 4)"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="A.java,B.java,C.java,Main.java,My_error.java"/>
-        <run class="Main"/>
-    </ajc-test>
-
-    <ajc-test dir="new/PR600" pr="600"
-      title="AbstractMethodError for introduced methods (order 5)"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="A.java,B.java,Main.java,C.java,My_error.java"/>
-        <run class="Main"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="declare error and abstract pointcuts"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AbstractDeclare.java">
-            <message kind="error" line="3"/>
-            <message kind="error" line="4"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new/runtime"
-      title="Exercise runtime classes (optionally in 1.1 VM)"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AllRuntime.java,TesterDriver.java"/>
-        <run class="TesterDriver"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="VerifyError after around advice falls off end of tryCatch"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="TryOffEnd.java">
-            <message kind="warning" line="13"/>
-            <message kind="warning" line="21"/>
-        </compile>
-        <run class="TryOffEnd"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="635" title="Named within pointcuts failing"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="NamedWithinPointcuts.java"/>
-        <run class="NamedWithinPointcuts"/>
-    </ajc-test>
-
-    <ajc-test dir="new/subaspects" pr="647"
-      title="aspect with private abstract pointcut" 
-   keywords="from-resolved_10x,fail-unimplemented">
-        <compile options="-1.4" files="PrivatePointcutCE.java">
-            <message kind="error" line="5"/>
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="new/subaspects" pr="647"
-      title="concrete aspect unable to access abstract package-private pointcut in parent for overriding"
-      keywords="from-resolved_10x"
-       comment="XXX getting error - confirm line numbers">
-        <compile options="-1.4" files="parent/ParentCE.java,child/ChildCE.java">
-            <message kind="error" file="child/ChildCE.java" line="32" text="pointcut 'parent.ParentCE.define()' is not visible"/>
-            <message kind="error" file="child/ChildCE.java" line="21"/>
-            <message kind="error" file="parent/ParentCE.java" line="10"/>
-            <message kind="error" file="parent/ParentCE.java" line="12"/>
-            <message kind="error" file="parent/ParentCE.java" line="22"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new/subaspects" pr="647"
-      title="inner, outer, and outside-package subaspects of an aspect with abstract protected-, public-, and default-access pointcuts"
-      keywords="from-resolved_10x">
-        <compile
-          files="parent/SubAspectVisibility.java,parent/ForeignChildHelper.java,child/ForeignChildAspect.java"/>
-        <run class="parent.SubAspectVisibility"/>
-    </ajc-test>
-
-    <ajc-test dir="new/subaspects" pr="647"
-      title="inner subaspects of an aspect with private pointcut"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="parent/PrivatePointcut.java"/>
-        <run class="parent.PrivatePointcut"/>
-    </ajc-test>
-
-    <ajc-test dir="new/subaspects" pr="647"
-      title="outer subaspects of an aspect with private pointcut"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="parent/PrivatePointcutOuterClass.java"/>
-        <run class="parent.PrivatePointcutOuterClass"/>
-    </ajc-test>
-
-    <ajc-test dir="new/subaspects" pr="647"
-      title="abstract aspect used statically should not cause instantiation of advice or pointcut"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AbstractAspectUsedStatically.java"/>
-        <run class="AbstractAspectUsedStatically"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="private inner interface accessible in scope when declared on outer class"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="DeclareAccess.java"/>
-        <run class="DeclareAccess"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="accessing protected superclass members in and outside CCC from body of method introduction"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="SuperInIntroduction.java"/>
-        <run class="SuperInIntroduction"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="accessing private superclass members from body of method introduction"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="SuperInIntroductionCE.java">
-            <message kind="error" line="25"/>
-            <message kind="error" line="26"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" title="simple test for around and casting"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AroundCasting.java"/>
-        <run class="AroundCasting"/>
-    </ajc-test>
-
-    <ajc-test dir="new/aroundinner" pr="620"
-      title="aroundInner 1 - around advice inner Thread subclass running proceed but not writing field"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="ThreadNoField.java,Common.java"/>
-        <run class="ThreadNoField"/>
-    </ajc-test>
-
-    <ajc-test dir="new/aroundinner" pr="620"
-      title="aroundInner 2 - around advice inner Runnable running proceed and writing method-final proxy"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Proxy.java,Common.java"/>
-        <run class="Proxy"/>
-    </ajc-test>
-
-    <ajc-test dir="new/aroundinner" pr="620"
-      title="aroundInner 3 - around advice inner class running proceed and writing field"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Minimal.java,Common.java"/>
-        <run class="Minimal"/>
-    </ajc-test>
-
-    <ajc-test dir="new/aroundinner" pr="620"
-      title="aroundInner 4 - around advice inner Thread subclass running proceed and writing field"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="ThreadSub.java,Common.java"/>
-        <run class="ThreadSub"/>
-    </ajc-test>
-
-    <ajc-test dir="new/aroundinner" pr="620"
-      title="aroundInner 5 - around advice inner Runnable (subinterface) running proceed and writing field introduced on subinterface"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="RunnableSub.java,Common.java"/>
-        <run class="RunnableSub"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="636"
-      title="Named local class closing over proceed invocation"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="LocalClassClosingOverProceed.java"/>
-        <run class="LocalClassClosingOverProceed"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="beautiful recursive computation of factorial with around is now supported"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="CircularAdvice.java"/>
-        <run class="CircularAdvice"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="632"
-      title="multi-dispatch not used for named pcd references"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="MultiDispatchCf.java">
-            <message kind="error" line="54"/>
-            <message kind="error" line="57"/>
-            <message kind="error" line="60"/>
-            <message kind="error" line="71"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="632"
-      title="multi-dispatch implemented through around + args"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="MultiDispatchCp.java"/>
-        <run class="MultiDispatchCp"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="unrecognized aspect should not net Cloneable and Serializable warnings"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="UnrecognizedAspectCE.java">
-            <message kind="error" line="3"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="unreachable code generated by around advice on the execution of void methods"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AroundVoid.java"/>
-        <run class="AroundVoid"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="654"
-      title="Overriding method implementations using introduction on interfaces"
-      keywords="from-resolved_10x,fail-unimplemented">
-        <compile files="IntroductionsOverriding.java" options="-Xlint:ignore -1.4" />
-        <run class="IntroductionsOverriding"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="654"
-      title="more coverage for around and concrete methods on interfaces"
-      keywords="from-resolved_10x">
-        <compile files="MultiAndAround.java" options="-Xlint:ignore -1.4"/>
-        <run class="MultiAndAround"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="invalid number and type of proceed arguments"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="InvalidProceedArgsCE.java">
-            <message kind="error" line="10"/>
-            <message kind="error" line="15"/>
-            <message kind="error" line="17"/>
-            <message kind="error" line="20"/>
-            <message kind="error" line="22"/>
-            <message kind="error" line="27"/>
-            <message kind="error" line="29"/>
-            <message kind="error" line="31"/>
-            <message kind="error" line="37"/>
-            <message kind="error" line="39"/>
-            <message kind="error" line="43"/>
-            <message kind="error" line="46"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="694" title="after returning advice order"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="Cricket.java"/>
-        <run class="Cricket"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="694" title="after returning advice param"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AfterReturningParam.java"/>
-        <run class="AfterReturningParam"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="695"
-      title="! and declaring types with callee-side call join points"
-      keywords="from-resolved_10x">
-        <compile files="NotAndDeclaringTypes.java" options="-Xlint:ignore -1.4"/>
-        <run class="NotAndDeclaringTypes"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="479"
-      title=". Binding the wrong arguments in withincode(..)."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="BindingArgumentsInWithincode.java"/>
-        <run class="BindingArgumentsInWithincode"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="479"
-      title=". Matching arguments in cflow correctly."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="MatchingArgumentsInCflow.java"/>
-        <run class="MatchingArgumentsInCflow"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="480"
-      title=". Binding variables with numbers in their name with pertarget(..)'s."
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="PerTargetAndVariablesWithNumbersInTheirNames.java"/>
-        <run class="PerTargetAndVariablesWithNumbersInTheirNames"/>
-    </ajc-test>
-
-
-    <ajc-test dir="new" pr="554"
-      title="second arg in formal on shared joinpoint with pcd if() causes verify error ??"
-      keywords="from-resolved_10rc3">
-        <compile options="-1.4" files="PR554.java"/>
-        <run class="PR554"/>
-    </ajc-test>
-
-    <ajc-test dir="new/privilegedAspects" pr="555"
-      title="access to private members from privileged aspect"
-      keywords="from-resolved_10rc3">
-        <compile
-          files="driver/PR555.java,util/Util.java,pack/DefaultTarget.java"/>
-        <run class="driver.PR555"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="555"
-      title="inner classes of privileged aspects cannot see target class private members"
-      keywords="from-resolved_10rc3">
-        <compile options="-1.4" files="InnerClassInPrivilegedAspect.java"/>
-        <run class="InnerClassInPrivilegedAspect"/>
-    </ajc-test>
-
-    <ajc-test dir="new/packageAccessPR556" pr="556"
-      title="aspects should get package access outside the file"
-      keywords="from-resolved_10rc3">
-        <compile files="base1/p/C1.java,base2/p/C2.java" options="-Xlint:ignore -1.4"/>
-        <run class="p.C1"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="559"
-      title="subclass advice not run for join points selected by superclass cflow-based pointcuts"
-      keywords="from-resolved_10rc3">
-        <compile options="-1.4" files="PR559.java"/>
-        <run class="PR559"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="559"
-      title="more issues with abstract aspects and cflow pointcuts"
-      keywords="from-resolved_10rc3,fail-unimplemented">
-        <compile options="-1.4" files="AbstractCflows.java"/>
-        <run class="AbstractCflows"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="560"
-      title="compile fails for aspect derived from percflow base aspect unless pointcut excludes base aspect and subaspects"
-      keywords="from-resolved_10rc3">
-        <compile options="-1.4" files="PR560.java"/>
-        <run class="PR560"/>
-    </ajc-test>
-
-
-    <ajc-test dir="new" pr="573"
-      title="pertarget stack overflow getting name of anonymous (Interface) class"
-      keywords="from-resolved_10rc3">
-        <compile options="-1.4" files="PR573.java"/>
-        <run class="PR573"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="573"
-      title="pertarget stack overflow getting name of anonymous (Object) class"
-      keywords="from-resolved_10rc3">
-        <compile options="-1.4" files="PR573_1.java"/>
-        <run class="PR573_1"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="573"
-      title="pertarget runtime stack overflow (getting name of anonymous (Object) class?)"
-      keywords="from-resolved_10rc3">
-        <compile options="-1.4" files="PR573_2.java"/>
-        <run class="PR573_2"/>
-    </ajc-test>
-
-     <ajc-test dir="new" pr="685"
-      title="subaspect method declaration on superaspect inner interface (names)"
-      keywords="from-resolved_104">
-        <compile options="-1.4" files="InnerInterfaceNames.java"/>
-        <run class="InnerInterfaceNames"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="685"
-      title="subaspect method declaration on superaspect inner interface (access)"
-      keywords="from-resolved_104">
-        <compile options="-1.4" files="InnerInterfaceAccess.java"/>
-        <run class="InnerInterfaceAccess"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="685"
-      title="subaspect method declaration on superaspect inner interface (types)"
-      keywords="from-resolved_104">
-        <compile options="-1.4" files="InnerInterfaceTypes.java,InnerInterfaceTypesHelper.java"/>
-        <run class="InnerInterfaceTypes"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="691" title="around AST type XXX"
-      keywords="from-resolved_104">
-        <compile options="-1.4" files="PR691.java"/>
-        <run class="PR691"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="687"
-      title="around all execution with double assignment in initializer (simple)"
-      keywords="from-resolved_104">
-        <compile options="-1.4" files="AroundDoubleAssignment.java"/>
-        <run class="AroundDoubleAssignment"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="687"
-      title="around all execution with double assignment in initializer (coverage)"
-      keywords="from-resolved_104">
-        <compile options="-1.4" files="AroundDoubleAssignmentC.java"/>
-        <run class="AroundDoubleAssignmentC"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="changing this in around's proceed reported by Rich Price"
-      keywords="from-resolved_104">
-        <compile files="AroundChangeThis.java" options="-1.4 -Xlint:ignore"/>
-        <run class="AroundChangeThis"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="548"
-      title="default package for aspect introductions is not the current package"
-      keywords="from-resolved_10rc3,from-resolved_104">
-        <compile
-          files="introductionPackage/two/C.java,introductionPackage/one/C.java,introductionPackage/one/Aspect.java,introductionPackage/one/TestAspect.java"/>
-        <run class="one.TestAspect"/>
-    </ajc-test>
-
-    <ajc-test dir="new/PR569" pr="569"
-      title="anon class written to wrong directory" 
-   keywords="from-resolved_104,from-resolved_104">
-        <compile options="-1.4" files="a/IntroAnon.java,a/MyInterface.java,b/Dest.java"/>
-        <run class="a.IntroAnon"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="603"
-      title="unqualified transitive pointcut references not resolved"
-      keywords="from-resolved_104">
-        <compile options="-1.4" files="PointcutQualification.java"/>
-        <run class="PointcutQualification"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="603"
-      title="unqualified transitive pointcut references not resolved - 2"
-      keywords="from-resolved_104">
-        <compile options="-1.4" files="PointcutQualification2.java"/>
-        <run class="PointcutQualification2"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="619"
-      title="direct use outside aspect of defined abstract pointcut"
-      keywords="from-resolved_104">
-        <compile options="-1.4" files="AbstractPointcutAccess.java"/>
-        <run class="AbstractPointcutAccess"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="619"
-      title="direct use outside aspect of undefined abstract pointcut"
-      keywords="from-resolved_104">
-        <compile options="-1.4" files="AbstractPointcutAccessCE.java">
-            <message kind="error" line="9"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="619"
-      title="indirect use outside aspect of undefined abstract pointcut"
-      keywords="from-resolved_104">
-        <compile options="-1.4" files="AbstractPointcutIndirectCE.java">
-            <message kind="error" line="9"/>
-            <message kind="error" line="5"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="658"
-      title="simple call join point tests for JoinPoint SourceLocation context"
-      keywords="from-resolved_104">
-        <compile options="-1.4" files="SourceLocationCall.java"/>
-        <run class="SourceLocationCall"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="661"
-      title="!target with second advice on casted call"
-      keywords="from-resolved_104">
-        <compile options="-1.4" files="CallNotTarget.java"/>
-        <run class="CallNotTarget"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="666" title="name binding in around cflow"
-      keywords="from-resolved_104">
-        <compile options="-1.4" files="AroundCall.java"/>
-        <run class="AroundCall"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="660" title="name binding in around cflow - 2"
-      keywords="from-resolved_104">
-        <compile options="-1.4" files="ArgsInCflow2.java"/>
-        <run class="ArgsInCflow2"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="677"
-      title="around name-binding in cflows using factorial"
-      keywords="from-resolved_104">
-        <compile options="-1.4" files="FactorialCflow.java"/>
-        <run class="FactorialCflow"/>
-    </ajc-test>
-
-     <ajc-test dir="new" title="replacing this or target in around advice"
-      keywords="from-resolved_104">
-        <compile options="-1.4" files="TargetObjectReplacement.java"/>
-        <run class="TargetObjectReplacement"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="after returning from initialization and after executing constructor"
-      keywords="from-resolved_104">
-        <compile options="-1.4" files="ConstructorExecInit.java"/>
-        <run class="ConstructorExecInit"/>
-    </ajc-test>
-    
-    <ajc-test dir="new"
-      title="after returning from initialization causes ExceptionInInitializer in aspect">
-        <compile options="-1.4" files="ConstructorExecInitFails.java"/>
-        <run class="ConstructorExecInitFails"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="659"
-      title="name binding in before cflow containing cflowbelow"
-      keywords="from-resolved_104">
-        <compile files="ArgsInCflow.java" options="!eclipse -1.4">
-            <message kind="error" line="29"/>
-            <message kind="error" line="32"/>
-        </compile>
-    </ajc-test>
-
-
-     <ajc-test dir="new/pr728" pr="728" title="file order in type searching"
-      keywords="from-resolved_105">
-        <compile options="-1.4" files="AnotherClass.java,Interface.java"/>
-        <run class="AnotherClass"/>
-    </ajc-test>
-
- 
-    <ajc-test dir="new" title="simple declare warning (NPE)"
-      keywords="from-resolved_105">
-        <compile options="-1.4" files="DeclareWarningMain.java">
-            <message kind="warning" line="4"/>
-        </compile>
-        <run class="DeclareWarningMain"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="755"
-      title="ajc dies on cflow into field init anon class see knownbugs.txt"
-      keywords="from-resolved_105">
-        <compile files="CflowOfFieldInitAnonMethods.java" options="!eclipse -1.4">
-        </compile>
-        <run class="CflowOfFieldInitAnonMethods" options="!eclipse"/>
-    </ajc-test>
-
- 
-    <ajc-test dir="new" pr="757" title="Incrementing interface-introduced field"
-      keywords="from-resolved_105">
-        <compile options="-1.4" files="IntroducedFieldInc.java"/>
-        <run class="IntroducedFieldInc"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="The dynamic type, not the static one, should be used in if pcds"
-      keywords="from-resolved_105">
-        <compile options="-1.4" files="StaticTypeInIf.java"/>
-        <run class="StaticTypeInIf"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="bad interaction with after returning, around and void methods (from Rich Price)"
-      keywords="from-resolved_105">
-        <compile options="-1.4" files="AfterReturningResult.java"/>
-        <run class="AfterReturningResult"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="type pattern matching for inner classes (from Ken Horn)"
-      keywords="from-resolved_105">
-        <compile options="-1.4" files="TypePat.java"/>
-        <run class="test.TypePat"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="771" title="static initializer member name"
-      keywords="from-resolved_105">
-        <compile options="-1.4" files="StaticInitName.java"/>
-        <run class="StaticInitName"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="770" title="cflow pcd syntax error"
-      keywords="from-resolved_105">
-        <compile options="-1.4" files="IllegalCflowCE.java">
-            <message kind="error" line="4"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="764"
-      title="binding args with indeterminate prefix and suffix"
-      keywords="from-resolved_105">
-        <compile options="-1.4" files="IndeterminateArgs.java"/>
-        <run class="IndeterminateArgs"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="764"
-      title="check arg types with indeterminate prefix and suffix"
-      keywords="from-resolved_105">
-        <compile options="-1.4" files="IndeterminateArgType.java"/>
-        <run class="IndeterminateArgType"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="764"
-      title="testing and binding args with single indeterminate prefix and suffix"
-      keywords="from-resolved_105">
-        <compile options="-1.4" files="IndeterminateArg.java"/>
-        <run class="IndeterminateArg"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="764"
-      title="binding handler args with indeterminate prefix and suffix"
-      keywords="from-resolved_105">
-        <compile options="-1.4" files="IndeterminateHandlerArg.java"/>
-        <run class="IndeterminateHandlerArg"/>
-    </ajc-test>
-
-
- 	<ajc-test dir="new/nolang" pr="762"
-	  title="Compiling java.lang.Object with ajc yields non-verifying bytecode"
-	  keywords="from-resolved_105"
-	   comment="XXX weak/bad test">
-	    <compile options="-1.4" files="java/lang/Object.java,java/lang/String.java">
-	    </compile>
-	</ajc-test>
-
-    <ajc-test dir="new"
-      title="method-local class defined in around return statement"
-      keywords="from-resolved_105">
-        <compile options="-1.4" files="MethodLocalAroundReturns.java"/>
-        <run class="MethodLocalAroundReturns"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="CE expected for assignment to arg in if pcd"
-      keywords="from-resolved_105">
-        <compile options="-1.4" files="IfPCDAssignmentCE.java">
-            <message kind="error" line="16"/>
-            <message kind="error" line="20"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" title="advising field get/sets when accessing via super"
-      keywords="from-resolved_105">
-        <compile options="-1.4" files="SuperField.java"/>
-        <run class="SuperField"/>
-    </ajc-test>
-
-    <ajc-test dir="new" title="accessing private members in outer types"
-      keywords="from-resolved_105">
-        <compile options="-1.4" files="FieldInnerAccess.java"/>
-        <run class="FieldInnerAccess"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="29934"
-      title="can't apply around advice to the execution of around advice"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="CflowCycles.java"/>
-        <run class="CflowCycles"/>
-    </ajc-test>
-    
-    <ajc-test dir="new"
-      title="incompatible advice throws clause are a compile-time error"
-      keywords="from-resolved_10x">
-        <compile options="-1.4" files="AdviceThrowsCf.java">
-            <message kind="error" line="13"/>
-            <message kind="error" line="28"/>
-            <message kind="error" line="47"/>
-            <message kind="error" line="48"/>
-            <message kind="error" line="50"/>
-            
-            <message kind="error" line="70"/>
-            <message kind="error" line="74"/>
-            <message kind="error" line="76"/>
-            <message kind="error" line="78"/>
-            
-            <message kind="error" line="85"/>
-        </compile>
-    </ajc-test>
-
diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc10x/ajc10x.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc10x/ajc10x.xml
index 90198331d..6ad5cdf59 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc10x/ajc10x.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/ajc10x/ajc10x.xml
@@ -1,9 +1,2013 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[
-<!ENTITY tests SYSTEM "../tests/src/org/aspectj/systemtest/ajc10x/ajc10x-tests.xml">
-]>
+<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
+<suite>
+    <ajc-test dir="new"
+      title="properly make choice between cast and parenthesis in parser"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="JoinPointFields.java"/>
+        <run class="JoinPointFields"/>
+    </ajc-test>
 
-<!-- AspectJ v1.0.x Tests -->
+    <ajc-test dir="new" pr="96"
+      title="field from implemented interface not found in advice"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="FieldFromImplementsNotFound.java"/>
+        <run class="FieldFromImplementsNotFound"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="make sure advice affects introduced methods and constructors"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="AdviceOnIntroduced.java"/>
+        <run class="AdviceOnIntroduced"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="new around construct"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="AroundAdvice.java"/>
+        <run class="AroundAdvice"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="65" title="aspect redefines a parameter"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="AspectRedefinesParam.java"/>
+        <run class="AspectRedefinesParam"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="introducing extends and implements"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="HierarchyIntroductions.java"/>
+        <run class="HierarchyIntroductions"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="104" title="(related) aspect on interface"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="AspectOnInterface.java"/>
+        <run class="AspectOnInterface"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="106" title="advice and package visibility"
+      keywords="from-resolved_10x">
+        <compile
+          files="packagevisibility/PackagesAndAdvice.java,packagevisibility/testPackage/Class1.java,packagevisibility/testPackage/Class2.java"
+          options="-Xlint:ignore"/>
+        <run class="packagevisibility.PackagesAndAdvice"/>
+    </ajc-test>
+    
+    <ajc-test dir="new" pr="106" title="advice and package visibility"
+      keywords="from-resolved_10x">
+        <compile
+          files="packagevisibility/PackagesAndAdviceCf.java,packagevisibility/testPackage/Class1.java,packagevisibility/testPackage/Class2.java"
+          options="-Xlint:error">
+        <message kind="error" line="29"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="new" title="advice on implied empty constructor"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="AdviceOnEmptyConstructor.java"/>
+        <run class="AdviceOnEmptyConstructor"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="advice on * *(..) not mapping to initializers"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="InitializerAdvice.java"/>
+        <run class="InitializerAdvice"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="three type declarations in the scope of an advice"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="TypeDeclInAdvice.java"/>
+        <run class="TypeDeclInAdvice"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="129"
+      title="introduction fails on class with an inner class that extends or implements something"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="IntroductionFailsWithInnerClass.java"/>
+        <run class="IntroductionFailsWithInnerClass"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="126"
+      title="checks that methods are introduced on the topmost class implemented"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="TopmostImplements.java"/>
+        <run class="TopmostImplements"/>
+    </ajc-test>
+
+    <ajc-test dir="new/arndAdvRet" pr="140"
+      title="a couple different returns from around advice"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="member finally advice paired with signature advice"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="TryErrors.java"/>
+        <run class="TryErrors"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="aspect of eachobject(instanceof(Interface))"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="AspectOfInterface.java"/>
+        <run class="AspectOfInterface"/>
+    </ajc-test>
+
+    <ajc-test dir="new/finalMemInit" pr="162"
+      title="final member initialization broken with JDK before 1.1.8"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="new/packageNameClash" pr="205"
+      title="same package and var name clash in preprocessed code when aspectOf is used"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="otherpkg/Driver.java,pkg/Aspect1.java,pkg/Class1.java"/>
+        <run class="otherpkg.Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="new/adviceOnStaticMeth" pr="221"
+      title="and PR#201 advice on static methods fails javac compile with this"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="non-static advice on inner class defined inside of method body"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="MethodInner.java"/>
+        <run class="MethodInner"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="simple single-threaded eachcflow test (includes aspectOf)"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="Client.java"/>
+        <run class="Client"/>
+    </ajc-test>
+
+    <ajc-test dir="new/scopeTypingBug" pr="191"
+      title="bad type resolution when var reassigned in same scope"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="242"
+      title="generating the right throws clause for call-site advice (and around)"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="ComputedThrows.java"/>
+        <run class="ComputedThrows"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="246"
+      title="advice on calls to static methods using several syntax"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="StaticCalls.java"/>
+        <run class="StaticCalls"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="248"
+      title=", PR#249, PR#250 advice on constructor sites"
+      keywords="from-resolved_10x">
+        <compile files="NewSiteAdvice.java" options="-1.4 -Xlint:ignore"/>
+        <run class="NewSiteAdvice"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="test after throwing advice in several ways"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="AfterThrowing.java"/>
+        <run class="AfterThrowing"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="fancy name patterns for method names"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="WildNames.java"/>
+        <run class="WildNames"/>
+    </ajc-test>
+
+    <ajc-test dir="design/calls" title="calls: calls(...)"
+      keywords="from-resolved_10x">
+        <compile files="Simple.java" options="-Xlint:ignore -1.4"/>
+        <run class="Simple"/>
+    </ajc-test>
+
+    <ajc-test dir="new/extraThrows" pr="259"
+      title="throws Exception clause is unnecessarily added to Driver.main method"
+      keywords="from-resolved_10x">
+        <compile files="Driver.java" options="-Xlint:ignore -1.4"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="new/thisUsedInMain" pr="262"
+      title="javac fails when this is referenced in the static main method"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="new/badCast" pr="275"
+      title="and 276 cast error generated by ajc when type not in signature"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="285"
+      title="calls to methods to which we don't have source"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="ExternalCalls.java"/>
+        <run class="ExternalCalls"/>
+    </ajc-test>
+
+    <ajc-test dir="new/beforeNotRun" pr="265" title="more aspect inheritance"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="310"
+      title="around and calls with both calling and called this params"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="AroundAndCalls.java"/>
+        <run class="AroundAndCalls"/>
+    </ajc-test>
+
+    <ajc-test dir="new/pointcutParameter" pr="290"
+      title="compiler crashes with eachobject and named pointcuts with parameters"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="new/unqualifiedPointcutName" pr="304"
+      title="lookup rules for unqualified pointcut names"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="321"
+      title="eachcflow only instantiated if the aspect has some advice in it"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="CFlowNoAdvice.java"/>
+        <run class="CFlowNoAdvice"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="309"
+      title="(DESIGN QUESTION) aspect of eachJVM advising its own initializer"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="EachJVMOnSelf.java"/>
+        <run class="EachJVMOnSelf"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="302"
+      title="after returning advice on calls to constructors"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="AfterConstructorCalls.java"/>
+        <run class="AfterConstructorCalls"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="Does annotating 'new' with a type work as desired?"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="ConstructorSignatures.java"/>
+        <run class="ConstructorSignatures"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="Referring to inner classes as {super}.{inner} confused ajc."
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="InnerClassNaming.java"/>
+        <run class="InnerClassNaming"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="Advice on advice" keywords="from-resolved_10x">
+        <compile options="-1.4" files="AdviceOnAdvice.java"/>
+        <run class="AdviceOnAdvice"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="Introductions on other introductions"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="IntroOnIntro.java"/>
+        <run class="IntroOnIntro"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="Putting advice on array constructors."
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="Orleans.java"/>
+        <run class="Orleans"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="call points within block inner classes are doubled"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="DoubledCalls.java"/>
+        <run class="DoubledCalls"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="Gets and sets with other advice"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="Counting3.java"/>
+        <run class="Counting3"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="Compiler can compile correct strictfp modifiers"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="StrictFpCompile.java"/>
+        <run class="StrictFpCompile"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="basic test of callsto pointcuts"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="CallsTo.java"/>
+        <run class="CallsTo"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="package wildcards in packages"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="pack/PackageWildcards.java"/>
+        <run class="pack.PackageWildcards"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="around advice on calls and receptions with lots of context"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="AroundCalls.java"/>
+        <run class="AroundCalls"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="208"
+      title="! modifier and char in pointcut (no longer an error)"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="NotCharInPointcut.java"/>
+        <run class="NotCharInPointcut"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="308"
+      title="right number of aspect instances per cflow"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="CFlowObjects.java"/>
+        <run class="CFlowObjects"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="310" title="many this's into around advice on calls"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="AroundCallsArgs.java"/>
+        <run class="AroundCallsArgs"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="Ensures introduction methods can have advice placed on them"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="Dominates.java"/>
+        <run class="Dominates"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="355"
+      title="No boolean appearing in the 'if' clause for around advice with eachJVM()"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="PR355.java"/>
+        <run class="PR355"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="Order of super introductions."
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="OrderOfExtendsPlusAndImplementsPlus.java"/>
+        <run class="OrderOfExtendsPlusAndImplementsPlus"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="Ensuring backdoor methods are produced."
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="BackdoorMethods.java"/>
+        <run class="BackdoorMethods"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="no duplicate advice methods in abstract aspects"
+      keywords="from-resolved_10x">
+        <compile
+          files="GeneratingDuplicateNamedAdviceMethodsInAbstractAspects.java"/>
+        <run class="GeneratingDuplicateNamedAdviceMethodsInAbstractAspects"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="no duplicate advice methods in abstract aspects extended"
+      keywords="from-resolved_10x">
+        <compile
+          files="GeneratingDuplicateNamedAdviceMethodsInAbstractAspectsWithExtendedAspect.java"/>
+        <run class="GeneratingDuplicateNamedAdviceMethodsInAbstractAspectsWithExtendedAspect"
+        />
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="Putting after-constructor advice on the wrong types implementing the same interface."
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="AfterAdviceOnConstructorsOnTheWrongType.java"/>
+        <run class="AfterAdviceOnConstructorsOnTheWrongType"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="Instantiating non-static inner classes in advice."
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="NonstaticInnerClassesInAspects.java"/>
+        <run class="NonstaticInnerClassesInAspects"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="316" title="Referring to pointcut in of clauses"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="ReferringToPointcutsInAspect_PR316.java"/>
+        <run class="ReferringToPointcutsInAspect_PR316"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="191"
+      title="Confused referring to instance variables and locals"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="ScopesAndFields_PR191.java"/>
+        <run class="ScopesAndFields_PR191"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="Parsing C+ expressions without parens in super introductions."
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="ParsingSubtypesIntroductions.java"/>
+        <run class="ParsingSubtypesIntroductions"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="Introducing methods on classes that implements inner-interfaces with +implements."
+      keywords="from-resolved_10x">
+        <compile files="IntroducingMethodsOnPlusImplementedInterfaces.java" options="-Xlint:ignore -1.4"/>
+        <run class="IntroducingMethodsOnPlusImplementedInterfaces"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="464"
+      title="Methods with the same name are generated when abstract aspects extend another abstract aspect."
+      keywords="from-resolved_10x">
+        <compile
+          files="AbstractAspectsExtendingAbstractAspectsGeneratesMethodsWithTheSameName_PR464.java"/>
+        <run class="AbstractAspectsExtendingAbstractAspectsGeneratesMethodsWithTheSameName_PR464"
+        />
+    </ajc-test>
+
+    <ajc-test dir="new" title="Making sure final variables stay final."
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="RemovingFinals.java"/>
+        <run class="RemovingFinals"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="Problem resolving meta-joinpoint names with around advice on methods called from around advice."
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="AroundAdviceOnMethodsCalledInAroundAdvice.java"/>
+        <run class="AroundAdviceOnMethodsCalledInAroundAdvice"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="Make sure that names of lifted local classes are right when referenced in call-site advice"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="CallsAndLocalClasses.java"/>
+        <run class="CallsAndLocalClasses"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="matching for throws clause"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="ThrowsMatching.java"/>
+        <run class="ThrowsMatching"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="basic test of declare soft"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="DeclareSoft.java"/>
+        <run class="DeclareSoft"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="advice on calls to constructors of anonymous inners and access to context"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="NewAnonymous.java"/>
+        <run class="NewAnonymous"/>
+    </ajc-test>
+
+    <ajc-test dir="new/innerAspectAccess" pr="211"
+      title="inner aspects can't access outer pointcuts"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="implements and extends are introduced before methods and fields"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="IntroOrder.java"/>
+        <run class="IntroOrder"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="a static/inner aspect of a inner class of an aspect is pulled to the top level as static"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="StaticInnerAspect.java"/>
+        <run class="StaticInnerAspect"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="Crashes with privileged aspect."
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="Privileged.java"/>
+        <run class="Privileged"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="join points exist in the execution of field initializers"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="FieldInitializerJoinPoints.java"/>
+        <run class="FieldInitializerJoinPoints"/>
+    </ajc-test>
+
+    <ajc-test dir="new/privilegedAspects" title="privileged aspects"
+      keywords="from-resolved_10x">
+        <compile
+          files="main/Main.java,fish/PrivateClass.java,fish/B.java,fowl/C.java,fowl/D.java"/>
+        <run class="main.Main"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="advice on field gets in privileged aspects"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="AdviceOnPrivileged.java"/>
+        <run class="AdviceOnPrivileged"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="Two anonymous classes in the same scope"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="TwoAnonymous.java"/>
+        <run class="TwoAnonymous"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="basic tests for initializer and staticinitializer PCDs"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="InitializerTest.java"/>
+        <run class="InitializerTest"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="98"
+      title="introduction of an initializer into a class"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="IntroductionOfInitializer.java"/>
+        <run class="IntroductionOfInitializer"/>
+    </ajc-test>
+
+    <ajc-test dir="new/access"
+      title="some method accessibility tests, particularly package-protected and inheritance"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="Test1.java,pc/C.java,psub/SubC.java,psub/A.java"/>
+        <run class="Test1"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="fairly monotonous (and non-covering) tests for expanded dot patterns"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="ExpandedDotDotPattern.java"/>
+        <run class="ExpandedDotDotPattern"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="field patterns and subtyping"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="FieldPatterns.java"/>
+        <run class="FieldPatterns"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="Checking formal matching as in Roeder's bug in 0.7b10"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="FormalMatching.java"/>
+        <run class="FormalMatching"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="Introducing synchronized methods on interfaces."
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="SynchronizedMethodsOnInterfaces.java"/>
+        <run class="SynchronizedMethodsOnInterfaces"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="The pointcut params (..,int..) is not recognizing (Object,int,Object)."
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="Params.java"/>
+        <run class="Params"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="calls advice on array objects causes error in code generation"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="CallsToArray.java"/>
+        <run class="CallsToArray"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="join points in field initializers aren't showing up."
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="NonexistentFieldInitializers.java"/>
+        <run class="NonexistentFieldInitializers"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="318" title="Handlers problem"
+      keywords="from-resolved_10x">
+        <compile files="PR318.java" options="-Xlint:ignore -1.4"/>
+        <run class="PR318"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="work nicely with inner class method look-up rules and call-site advice"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="InnerMethods.java"/>
+        <run class="InnerMethods"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="strictfp modifier allowed on advice"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="StrictFPAdvice.java"/>
+        <run class="StrictFPAdvice"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="415"
+      title="No argthis was being created for calls advice."
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="PR415.java"/>
+        <run class="PR415"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="Ensuring no advice with instanceof(..) is run on static methods."
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="StaticMethodsShouldNotReceiveInstanceofAdvice.java"/>
+        <run class="StaticMethodsShouldNotReceiveInstanceofAdvice"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="Null pointer on gets advice showing the case causing the error"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="NullPointerOnGetsSimple.java"/>
+        <run class="NullPointerOnGetsSimple"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="try to make sure that dynamic JoinPoint objects aren't generated when used inside of if (false) { ... }"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="IfdefsAndAdvice.java"/>
+        <run class="IfdefsAndAdvice"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="within and withincode (doesn't all work due to local class name issues)"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="WithinInners.java"/>
+        <run class="WithinInners"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="around advice on calls within inner classes (including protected method calls)"
+      keywords="from-resolved_10x">
+        <compile files="AroundInnerCalls13.java" options="-1.3"/>
+        <run class="AroundInnerCalls13"/>
+    </ajc-test>
+
+	<ajc-test dir="new"
+      title="around advice on calls within inner classes (including protected method calls)"
+      keywords="from-resolved_10x">
+        <compile files="AroundInnerCalls.java" options="-1.4"/>
+        <run class="AroundInnerCalls"/>
+    </ajc-test>
+    
+    <ajc-test dir="new" title="Arguments to runNext should be final when needed"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="Finals.java"/>
+        <run class="Finals"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="Method introductions"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="MethodIntroductions.java"/>
+        <run class="MethodIntroductions"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="Putting an introduced method on each interface"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="IntroducedMethodsOnEachInterface.java"/>
+        <run class="IntroducedMethodsOnEachInterface"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="Extending interfaces"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="BindingInterfaces.java"/>
+        <run class="BindingInterfaces"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="Introducing private methods on interfaces"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="IntroducingPrivateMethodsOnInterfaces.java"/>
+        <run class="IntroducingPrivateMethodsOnInterfaces"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="Issuing errors for assigning variables thisJoinPoint -- not assigning thisJoinPoint."
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="ThisJoinPointAssignments.java"/>
+        <run class="ThisJoinPointAssignments"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="Static references inside of introduced bodies get bound correctly."
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="StaticIntroducedReferences.java"/>
+        <run class="StaticIntroducedReferences"/>
+    </ajc-test>
+
+    <ajc-test dir="new/cflowObjectCreations" pr="307"
+      title="cflow and object creations [of eachcflow]"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="new/twofiles"
+      title="Doesn't import MightHaveAspect when compiling with more than 1 file. [eachobject]"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="TheObject.java,TheAspect.java"/>
+        <run class="TheObject"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="436"
+      title="test binding to formals in calls to constructors (binding to null) (eachobject !!! now misnamed)"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="BindingThisInsteadOfFormal.java"/>
+        <run class="BindingThisInsteadOfFormal"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="After advice isn't being woven into after throwing advice"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="AfterThrowingNotWoven.java"/>
+        <run class="AfterThrowingNotWoven"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="Throwing an EmptyStackException."
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="EmptyStack.java"/>
+        <run class="EmptyStack"/>
+    </ajc-test>
+
+	<ajc-test dir="new/perThis"
+	    title="check that MightHaveAspect interface is created correctly for an aspect in deep package"
+	    keywords="from-resolved_10x">
+	      <compile options="-1.4" files="p/EachObjectTarget.java,the/deep/pkg/EachObjectInDeepPackage.java"/>
+	      <run class="p.EachObjectTarget"/>
+	</ajc-test>
+  
+    <ajc-test dir="new" title="Defines clfow$ajc0 more once. [eachcflow]"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="Binkley.java"/>
+        <run class="Binkley"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="Various calls, receptions, and callsto tests [callsto]"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="CallsReceptionsCallsto.java"/>
+        <run class="CallsReceptionsCallsto"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="320"
+      title="Was throwing exception, now just an error. [eachobject]"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="PR320.java"/>
+        <run class="PR320"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="different version of aspect inheritance, particularly empty pointcuts and abstract cflows [eachcflow]"
+      keywords="from-resolved_10x,fail-unimplemented">
+        <compile options="-1.4" files="AspectInheritance.java"/>
+        <run class="AspectInheritance"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="339"
+      title="set advice on member initing throwing exception [eachobject]"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="PR339.java"/>
+        <run class="PR339"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="417"
+      title="Testing class names with same name's with difference case as package. [eachobject]"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="test/TraceAspect.java,test/Test.java"/>
+        <run class="test.Test"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="Null pointer on gets advice with coverage [painful]"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="NullPointerOnGets.java"/>
+        <run class="NullPointerOnGets"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="Basic test for cflow pointcuts [eachcflow]"
+      keywords="from-resolved_10x">
+        <compile files="CFlowPoints.java" options="-Xlint:ignore -1.4"/>
+        <run class="CFlowPoints"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="Crashing when looking up the type of array members."
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="ArrayCasts.java"/>
+        <run class="ArrayCasts"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="PostfixExprs to various synthetic things are fixed correctly [eachobject]"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="Fixes.java"/>
+        <run class="Fixes"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="Dave Binkley's problem with eachcflowroot. [eachcflow]"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="Binkley2.java"/>
+        <run class="Binkley2"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="105" title="advice on an inherited method"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="AdviceOnInheritedMethod.java"/>
+        <run class="AdviceOnInheritedMethod"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="114"
+      title=", PR#115 checks the ordering of catch clauses"
+      keywords="from-resolved_10x">
+        <compile files="OrderOfCatches.java" options="-Xlint:ignore -1.4"/>
+        <run class="OrderOfCatches"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="various declared exception permutations"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="DeclaredExcs.java"/>
+        <run class="DeclaredExcs"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="ordering of advice kinds as well as cflow and dominates"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="AdviceOrdering.java"/>
+        <run class="AdviceOrdering"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="241"
+      title="advice on default constructor for a class only referenced via reflection"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="OddConstructors.java"/>
+        <run class="OddConstructors"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="289"
+      title="calling and called this params in calls points"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="CallsParams.java"/>
+        <run class="CallsParams"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="322"
+      title="primitive parameters coercable to Object just like return values are"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="ObjectForInt.java"/>
+        <run class="ObjectForInt"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="join points in static/dynamic initializers aren't showing up."
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="NonexistentInitializers.java"/>
+        <run class="NonexistentInitializers"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="Gets and sets on a number of variables (field access ???)"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="Gets.java"/>
+        <run class="Gets"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="Joinpoints are showing up on intermediate call sites"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="Counting1.java"/>
+        <run class="Counting1"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="Reception based on strictfp modifier"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="StrictFpReceptions.java"/>
+        <run class="StrictFpReceptions"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="353"
+      title="Subclasses that do not redefine a method are not being handled correctly"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="PR353b.java"/>
+        <run class="PR353b"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="making sure that super calls are bound to the right methods"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="SupersAndInterfaces.java"/>
+        <run class="SupersAndInterfaces"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="317"
+      title="inheritance, around advice and abstract pointcuts [eachobject] (still)"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="OverridingPointcuts.java"/>
+        <run class="OverridingPointcuts"/>
+    </ajc-test>
+
+    <ajc-test dir="new/foemmel"
+      title="Priviledged aspect methods are missing for privates. [eachobject]"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="TheAspect.java,TheObject.java">
+        </compile>
+        <run class="TheObject"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="exceptions thrown and caught in advice, particularly try+proceed"
+      keywords="from-resolved_10x">
+        <compile files="TryAndProceed.java" options="-Xlint:ignore -1.4"/>
+        <run class="TryAndProceed"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="Not and And operators in pointcuts not working"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="NotAndPointcut.java"/>
+        <run class="NotAndPointcut"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="Member initializers should run before the current class constructor"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="MemberInitializationsAfterExplicitConstructorCalls.java"/>
+        <run class="MemberInitializationsAfterExplicitConstructorCalls"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="Coverage tests for Member initializers should run before the current class constructor and after super"
+      keywords="from-resolved_10x">
+        <compile
+          files="MemberInitializationsAfterExplicitConstructorCallsCoverage.java"/>
+        <run class="MemberInitializationsAfterExplicitConstructorCallsCoverage"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="thisJoinPoint{Static} not visible in if() pcd of named pointcut"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="IfPCDExprJoinPointVisibleCE.java"/>
+        <run class="IfPCDExprJoinPointVisibleCE"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="pcd if() expression visibility at compile-time  (minimal operation)"
+      keywords="from-resolved_10x">
+        <compile files="IfPCDExprVisibility.java" options="-Xlint:ignore -1.4"/>
+        <run class="IfPCDExprVisibility"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="pcd if() NPE in compiler when unwinding assignment in pcd if(expr)"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="IfPCDExprAssignUnparseFailure.java"/>
+        <run class="IfPCDExprAssignUnparseFailure"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="pcd if() dup methods produced when pointcut after advice etc (javac)"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="IfPCDDupMethod.java"/>
+        <run class="IfPCDDupMethod"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="pcd if() variants: [anonymous, named] x [execution, call, callTyped, get, set, initializations] x [before, after, around]"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="IfPCDAdviceMethods.java"/>
+        <run class="IfPCDAdviceMethods"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="476" title="initialization order with this"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="InitializationOrder.java"/>
+        <run class="InitializationOrder"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="496"
+      title="!within and !this handling for callee-side call points"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="NotThis.java"/>
+        <run class="NotThis"/>
+    </ajc-test>
+
+    <ajc-test dir="new/innerInterfaces" pr="494"
+      title="private inner interfaces and bytecode visibility"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="p/Driver.java,p/InnerTest.java,other/Test.java"/>
+        <run class="p.Driver"/>
+    </ajc-test>
+
+	<!-- This has a complicated set of expected join points.
+	     This test should be borken up into more manageable chunks
+	     and more carefully analyzed for correctness in the future.
+	-->
+    <ajc-test dir="new" pr="490"
+      title="elaborated into testing of around on all join points"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="AroundAll.java"/>
+        <run class="AroundAll"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="type name hygiene when code comes from aspects in different packages"
+      keywords="from-resolved_10x">
+        <compile options="-1.4"
+          files="typeNameConflicts/Driver.java,typeNameConflicts/p1/C.java,typeNameConflicts/aspects/A.java"/>
+        <run class="typeNameConflicts.Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="cflowbelow dependencies (from Chris Dutchyn)"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="CflowBelowTest.java"/>
+        <run class="CflowBelowTest"/>
+    </ajc-test>
+
+   <ajc-test dir="new" pr="493"
+      title="Compiler incorrectly flagging *1 (non-alphabetic start to signature pattern)"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="NonAlphaSignaturePatternCE.java"/>
+        <run class="NonAlphaSignaturePatternCE"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="Unable to bind privately-introduced field name from introduced method in the same aspect"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="IntroducedFieldsNotBinding.java"/>
+        <run class="IntroducedFieldsNotBinding"/>
+    </ajc-test>
+
+    <ajc-test dir="new/anonInnerClass" pr="297"
+      title="anonymous inner class with aspect" keywords="from-resolved_10x">
+        <compile options="-1.4" files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="335"
+      title="Arguments are not being passed in to calls advice"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="PR335.java"/>
+        <run class="PR335"/>
+    </ajc-test>
+
+    <ajc-test dir="design/intro" title="interfaces as mixins with introduction"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="Interfaces.java">
+        <message kind="error" text="can't override java.lang.String SubI.instanceField with java.lang.String SubC.instanceField visibility is reduced"/>
+        <message kind="error" text="can't override java.lang.String I.instanceField with java.lang.String C.instanceField visibility is reduced"/>
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="design/intro" title="interfaces as mixins with introduction b"
+      keywords="from-resolved_10x">
+        <compile files="Interfaces.java" options="-Xset:itdVersion=1 -1.4"/>
+        <run class="Interfaces"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="functional modifiers work correctly with introduced members"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="IntroducedModifiers.java"/>
+        <run class="IntroducedModifiers"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="ExceptionInInitializerError accessing cflow in aspect initialization - before variants"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="CflowInitInAspectVariantsBefore.java"/>
+        <run class="CflowInitInAspectVariantsBefore"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="NoClassDefFoundError accessing cflow in aspect initialization - after variants"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="CflowInitInAspectVariantsAfter.java"/>
+        <run class="CflowInitInAspectVariantsAfter"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="InternalCompilerError in JpPlan when args alone"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="ArgsAlone.java"/>
+        <run class="ArgsAlone"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="527"
+      title="compile error using pcd if() with advice on introduced methods."
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="PR527.java"/>
+        <run class="PR527"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="528"
+      title="compile errors boolean using cflow and unimplemented method using around advice on methods introduced by interface"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="PR528.java"/>
+        <run class="PR528"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="534" title="aspect as member of interface"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="AspectInInterfaceCP.java"/>
+        <run class="AspectInInterfaceCP"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="535"
+      title="missing method name to synthetic invocation"
+      keywords="from-resolved_10x,new-messages-vary">
+        <compile options="-1.4" files="PR535.java"/>
+        <run class="PR535"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="536"
+      title="protected subclass impl of superclass method with default access and variants"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="RestrictingVisibilityCP.java"/>
+        <run class="RestrictingVisibilityCP"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="519" title="Exception planning advice"
+      keywords="from-resolved_10x">
+        <compile files="PR519.java" options="-Xlint:ignore -1.4"/>
+        <run class="PR519"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="521"
+      title="unreproduced bug with advice - probably UTR"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="PR520.java"/>
+        <run class="PR520"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="494"
+      title="introduced inner interfaces accessible inside aspect"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="IntroduceInnerInterfaceCP.java"/>
+        <run class="IntroduceInnerInterfaceCP"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="525"
+      title="validate (enclosing) join point and source locations"
+      keywords="from-resolved_10x">
+        <compile files="NegativeSourceLocation.java" options="-Xlint:ignore -1.4"/>
+        <run class="NegativeSourceLocation"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="544"
+      title="advice formals are just like method formals"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="AdviceFormalsCp.java"/>
+        <run class="AdviceFormalsCp"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="544"
+      title="advice formals produce errors just like method formals"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="AdviceFormalsCf.java">
+            <message kind="error" line="28"/>
+            <message kind="error" line="29"/>
+            <message kind="error" line="36"/>
+            <message kind="error" line="37"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="advice throws clauses must be compatible with joinpoints they apply to"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="AdviceThrowsCp.java"/>
+        <run class="AdviceThrowsCp"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="570"
+      title="potential method conflicts with introductions and interfaces and PR#561"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="MethodConflictsCP.java"/>
+        <run class="MethodConflictsCP"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="570"
+      title="illegal method conflicts with introductions and interfaces and PR#561"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="MethodConflictsCF.java">
+            <message kind="error" line="8"/>
+            <message kind="error" line="20"/>
+            <message kind="error" line="28"/>
+        </compile>
+    </ajc-test>  
+
+    <ajc-test dir="new" title="AspectOf available for different aspect types"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="AspectOf.java"/>
+        <run class="AspectOf"/>
+    </ajc-test>
+
+    <ajc-test dir="new/privilegedAspects" pr="35593"
+      title="access to all members of class and inner class from privileged aspect"
+      keywords="from-resolved_10x">
+        <compile options="-1.4"
+          files="driver/PrivilegedAspect.java,util/Util.java,pack/DefaultTarget.java,pack/PublicTarget.java"/>
+        <run class="driver.PrivilegedAspect"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="cflow alone with around produces compiler bcg StackOverflowError"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="CflowAlone.java"/>
+        <run class="CflowAlone"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="get/set join points run for complex assignment operators (+=, etc.) (working)"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="AssignOps.java"/>
+        <run class="AssignOps"/>
+    </ajc-test>
+
+    <ajc-test dir="new/introTypeMissing"
+      title="this available in introduced field initializers"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="ThisInIntroFieldInit.java"/>
+        <run class="ThisInIntroFieldInit"/>
+    </ajc-test>
+
+    <ajc-test dir="new/introTypeMissing"
+      title="Introduced type unavailable to cast expressions in introduced methods"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="Cast.java,TargetClass.java,Util.java"/>
+        <run class="Cast"/>
+    </ajc-test>
+
+    <ajc-test dir="new/introTypeMissing"
+      title="Introduced type unavailable to qualified new expressions in introduced methods"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="Inner.java,TargetClass.java,Util.java"/>
+        <run class="Inner"/>
+    </ajc-test>
+
+    <ajc-test dir="new/introTypeMissing"
+      title="Introduced type unavailable to cast expressions in introduced field initializers"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="CastInFieldInit.java,TargetClass.java,Util.java"/>
+        <run class="CastInFieldInit"/>
+    </ajc-test>
+
+    <ajc-test dir="new/introTypeMissing"
+      title="Aspect type unavailable to qualified new expressions in body of introduced methods"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="AspectInIntroducedMethod.java"/>
+        <run class="AspectInIntroducedMethod"/>
+    </ajc-test>
+
+
+    <ajc-test dir="new/introTypeMissing"
+      title="Introduced type unavailable to qualified new expressions in introduced field initializers"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="InnerInFieldInit.java,TargetClass.java,Util.java"/>
+        <run class="InnerInFieldInit"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="595"
+      title="variable slots and finally/catch causing verify errors"
+      keywords="from-resolved_10final,from-resolved_10x">
+        <compile options="-1.4" files="AfterFinally.java"/>
+        <run class="AfterFinally"/>
+    </ajc-test>
+
+ 
+    <ajc-test dir="new" pr="590"
+      title="after advice on static method with pcd if() using result"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="PR590.java">
+            <message kind="error" line="20"/>
+            <message kind="error" line="23"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="590"
+      title="after advice on static method with pcd if() using result through pointcut"
+      keywords="from-resolved_10x">
+        <compile files="PR590a.java" options="-Xlint:ignore -1.4">
+            <message kind="error" line="29"/>
+            <message kind="error" line="31"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="new/PR600" pr="600"
+      title="AbstractMethodError for introduced methods (order 1)"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="Main.java,My_error.java,A.java,B.java,C.java"/>
+        <run class="Main"/>
+    </ajc-test>
+
+    <ajc-test dir="new/PR600" pr="600"
+      title="AbstractMethodError for introduced methods (order 2)"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="Main.java,My_error.java,C.java,A.java,B.java"/>
+        <run class="Main"/>
+    </ajc-test>
+
+    <ajc-test dir="new/PR600" pr="600"
+      title="AbstractMethodError for introduced methods (order 3)"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="My_error.java,A.java,B.java,C.java,Main.java"/>
+        <run class="Main"/>
+    </ajc-test>
+
+    <ajc-test dir="new/PR600" pr="600"
+      title="AbstractMethodError for introduced methods (order 4)"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="A.java,B.java,C.java,Main.java,My_error.java"/>
+        <run class="Main"/>
+    </ajc-test>
+
+    <ajc-test dir="new/PR600" pr="600"
+      title="AbstractMethodError for introduced methods (order 5)"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="A.java,B.java,Main.java,C.java,My_error.java"/>
+        <run class="Main"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="declare error and abstract pointcuts"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="AbstractDeclare.java">
+            <message kind="error" line="3"/>
+            <message kind="error" line="4"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="new/runtime"
+      title="Exercise runtime classes (optionally in 1.1 VM)"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="AllRuntime.java,TesterDriver.java"/>
+        <run class="TesterDriver"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="VerifyError after around advice falls off end of tryCatch"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="TryOffEnd.java">
+            <message kind="warning" line="13"/>
+            <message kind="warning" line="21"/>
+        </compile>
+        <run class="TryOffEnd"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="635" title="Named within pointcuts failing"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="NamedWithinPointcuts.java"/>
+        <run class="NamedWithinPointcuts"/>
+    </ajc-test>
+
+    <ajc-test dir="new/subaspects" pr="647"
+      title="aspect with private abstract pointcut" 
+   keywords="from-resolved_10x,fail-unimplemented">
+        <compile options="-1.4" files="PrivatePointcutCE.java">
+            <message kind="error" line="5"/>
+        </compile>
+    </ajc-test>
+
+   <ajc-test dir="new/subaspects" pr="647"
+      title="concrete aspect unable to access abstract package-private pointcut in parent for overriding"
+      keywords="from-resolved_10x"
+       comment="XXX getting error - confirm line numbers">
+        <compile options="-1.4" files="parent/ParentCE.java,child/ChildCE.java">
+            <message kind="error" file="child/ChildCE.java" line="32" text="pointcut 'parent.ParentCE.define()' is not visible"/>
+            <message kind="error" file="child/ChildCE.java" line="21"/>
+            <message kind="error" file="parent/ParentCE.java" line="10"/>
+            <message kind="error" file="parent/ParentCE.java" line="12"/>
+            <message kind="error" file="parent/ParentCE.java" line="22"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="new/subaspects" pr="647"
+      title="inner, outer, and outside-package subaspects of an aspect with abstract protected-, public-, and default-access pointcuts"
+      keywords="from-resolved_10x">
+        <compile
+          files="parent/SubAspectVisibility.java,parent/ForeignChildHelper.java,child/ForeignChildAspect.java"/>
+        <run class="parent.SubAspectVisibility"/>
+    </ajc-test>
+
+    <ajc-test dir="new/subaspects" pr="647"
+      title="inner subaspects of an aspect with private pointcut"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="parent/PrivatePointcut.java"/>
+        <run class="parent.PrivatePointcut"/>
+    </ajc-test>
+
+    <ajc-test dir="new/subaspects" pr="647"
+      title="outer subaspects of an aspect with private pointcut"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="parent/PrivatePointcutOuterClass.java"/>
+        <run class="parent.PrivatePointcutOuterClass"/>
+    </ajc-test>
+
+    <ajc-test dir="new/subaspects" pr="647"
+      title="abstract aspect used statically should not cause instantiation of advice or pointcut"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="AbstractAspectUsedStatically.java"/>
+        <run class="AbstractAspectUsedStatically"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="private inner interface accessible in scope when declared on outer class"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="DeclareAccess.java"/>
+        <run class="DeclareAccess"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="accessing protected superclass members in and outside CCC from body of method introduction"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="SuperInIntroduction.java"/>
+        <run class="SuperInIntroduction"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="accessing private superclass members from body of method introduction"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="SuperInIntroductionCE.java">
+            <message kind="error" line="25"/>
+            <message kind="error" line="26"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="new" title="simple test for around and casting"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="AroundCasting.java"/>
+        <run class="AroundCasting"/>
+    </ajc-test>
+
+    <ajc-test dir="new/aroundinner" pr="620"
+      title="aroundInner 1 - around advice inner Thread subclass running proceed but not writing field"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="ThreadNoField.java,Common.java"/>
+        <run class="ThreadNoField"/>
+    </ajc-test>
+
+    <ajc-test dir="new/aroundinner" pr="620"
+      title="aroundInner 2 - around advice inner Runnable running proceed and writing method-final proxy"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="Proxy.java,Common.java"/>
+        <run class="Proxy"/>
+    </ajc-test>
+
+    <ajc-test dir="new/aroundinner" pr="620"
+      title="aroundInner 3 - around advice inner class running proceed and writing field"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="Minimal.java,Common.java"/>
+        <run class="Minimal"/>
+    </ajc-test>
+
+    <ajc-test dir="new/aroundinner" pr="620"
+      title="aroundInner 4 - around advice inner Thread subclass running proceed and writing field"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="ThreadSub.java,Common.java"/>
+        <run class="ThreadSub"/>
+    </ajc-test>
+
+    <ajc-test dir="new/aroundinner" pr="620"
+      title="aroundInner 5 - around advice inner Runnable (subinterface) running proceed and writing field introduced on subinterface"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="RunnableSub.java,Common.java"/>
+        <run class="RunnableSub"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="636"
+      title="Named local class closing over proceed invocation"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="LocalClassClosingOverProceed.java"/>
+        <run class="LocalClassClosingOverProceed"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="beautiful recursive computation of factorial with around is now supported"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="CircularAdvice.java"/>
+        <run class="CircularAdvice"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="632"
+      title="multi-dispatch not used for named pcd references"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="MultiDispatchCf.java">
+            <message kind="error" line="54"/>
+            <message kind="error" line="57"/>
+            <message kind="error" line="60"/>
+            <message kind="error" line="71"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="632"
+      title="multi-dispatch implemented through around + args"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="MultiDispatchCp.java"/>
+        <run class="MultiDispatchCp"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="unrecognized aspect should not net Cloneable and Serializable warnings"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="UnrecognizedAspectCE.java">
+            <message kind="error" line="3"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="unreachable code generated by around advice on the execution of void methods"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="AroundVoid.java"/>
+        <run class="AroundVoid"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="654"
+      title="Overriding method implementations using introduction on interfaces"
+      keywords="from-resolved_10x,fail-unimplemented">
+        <compile files="IntroductionsOverriding.java" options="-Xlint:ignore -1.4" />
+        <run class="IntroductionsOverriding"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="654"
+      title="more coverage for around and concrete methods on interfaces"
+      keywords="from-resolved_10x">
+        <compile files="MultiAndAround.java" options="-Xlint:ignore -1.4"/>
+        <run class="MultiAndAround"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="invalid number and type of proceed arguments"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="InvalidProceedArgsCE.java">
+            <message kind="error" line="10"/>
+            <message kind="error" line="15"/>
+            <message kind="error" line="17"/>
+            <message kind="error" line="20"/>
+            <message kind="error" line="22"/>
+            <message kind="error" line="27"/>
+            <message kind="error" line="29"/>
+            <message kind="error" line="31"/>
+            <message kind="error" line="37"/>
+            <message kind="error" line="39"/>
+            <message kind="error" line="43"/>
+            <message kind="error" line="46"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="694" title="after returning advice order"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="Cricket.java"/>
+        <run class="Cricket"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="694" title="after returning advice param"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="AfterReturningParam.java"/>
+        <run class="AfterReturningParam"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="695"
+      title="! and declaring types with callee-side call join points"
+      keywords="from-resolved_10x">
+        <compile files="NotAndDeclaringTypes.java" options="-Xlint:ignore -1.4"/>
+        <run class="NotAndDeclaringTypes"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="479"
+      title=". Binding the wrong arguments in withincode(..)."
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="BindingArgumentsInWithincode.java"/>
+        <run class="BindingArgumentsInWithincode"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="479"
+      title=". Matching arguments in cflow correctly."
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="MatchingArgumentsInCflow.java"/>
+        <run class="MatchingArgumentsInCflow"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="480"
+      title=". Binding variables with numbers in their name with pertarget(..)'s."
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="PerTargetAndVariablesWithNumbersInTheirNames.java"/>
+        <run class="PerTargetAndVariablesWithNumbersInTheirNames"/>
+    </ajc-test>
+
+
+    <ajc-test dir="new" pr="554"
+      title="second arg in formal on shared joinpoint with pcd if() causes verify error ??"
+      keywords="from-resolved_10rc3">
+        <compile options="-1.4" files="PR554.java"/>
+        <run class="PR554"/>
+    </ajc-test>
+
+    <ajc-test dir="new/privilegedAspects" pr="555"
+      title="access to private members from privileged aspect"
+      keywords="from-resolved_10rc3">
+        <compile
+          files="driver/PR555.java,util/Util.java,pack/DefaultTarget.java"/>
+        <run class="driver.PR555"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="555"
+      title="inner classes of privileged aspects cannot see target class private members"
+      keywords="from-resolved_10rc3">
+        <compile options="-1.4" files="InnerClassInPrivilegedAspect.java"/>
+        <run class="InnerClassInPrivilegedAspect"/>
+    </ajc-test>
+
+    <ajc-test dir="new/packageAccessPR556" pr="556"
+      title="aspects should get package access outside the file"
+      keywords="from-resolved_10rc3">
+        <compile files="base1/p/C1.java,base2/p/C2.java" options="-Xlint:ignore -1.4"/>
+        <run class="p.C1"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="559"
+      title="subclass advice not run for join points selected by superclass cflow-based pointcuts"
+      keywords="from-resolved_10rc3">
+        <compile options="-1.4" files="PR559.java"/>
+        <run class="PR559"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="559"
+      title="more issues with abstract aspects and cflow pointcuts"
+      keywords="from-resolved_10rc3,fail-unimplemented">
+        <compile options="-1.4" files="AbstractCflows.java"/>
+        <run class="AbstractCflows"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="560"
+      title="compile fails for aspect derived from percflow base aspect unless pointcut excludes base aspect and subaspects"
+      keywords="from-resolved_10rc3">
+        <compile options="-1.4" files="PR560.java"/>
+        <run class="PR560"/>
+    </ajc-test>
+
+
+    <ajc-test dir="new" pr="573"
+      title="pertarget stack overflow getting name of anonymous (Interface) class"
+      keywords="from-resolved_10rc3">
+        <compile options="-1.4" files="PR573.java"/>
+        <run class="PR573"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="573"
+      title="pertarget stack overflow getting name of anonymous (Object) class"
+      keywords="from-resolved_10rc3">
+        <compile options="-1.4" files="PR573_1.java"/>
+        <run class="PR573_1"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="573"
+      title="pertarget runtime stack overflow (getting name of anonymous (Object) class?)"
+      keywords="from-resolved_10rc3">
+        <compile options="-1.4" files="PR573_2.java"/>
+        <run class="PR573_2"/>
+    </ajc-test>
+
+     <ajc-test dir="new" pr="685"
+      title="subaspect method declaration on superaspect inner interface (names)"
+      keywords="from-resolved_104">
+        <compile options="-1.4" files="InnerInterfaceNames.java"/>
+        <run class="InnerInterfaceNames"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="685"
+      title="subaspect method declaration on superaspect inner interface (access)"
+      keywords="from-resolved_104">
+        <compile options="-1.4" files="InnerInterfaceAccess.java"/>
+        <run class="InnerInterfaceAccess"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="685"
+      title="subaspect method declaration on superaspect inner interface (types)"
+      keywords="from-resolved_104">
+        <compile options="-1.4" files="InnerInterfaceTypes.java,InnerInterfaceTypesHelper.java"/>
+        <run class="InnerInterfaceTypes"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="691" title="around AST type XXX"
+      keywords="from-resolved_104">
+        <compile options="-1.4" files="PR691.java"/>
+        <run class="PR691"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="687"
+      title="around all execution with double assignment in initializer (simple)"
+      keywords="from-resolved_104">
+        <compile options="-1.4" files="AroundDoubleAssignment.java"/>
+        <run class="AroundDoubleAssignment"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="687"
+      title="around all execution with double assignment in initializer (coverage)"
+      keywords="from-resolved_104">
+        <compile options="-1.4" files="AroundDoubleAssignmentC.java"/>
+        <run class="AroundDoubleAssignmentC"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="changing this in around's proceed reported by Rich Price"
+      keywords="from-resolved_104">
+        <compile files="AroundChangeThis.java" options="-1.4 -Xlint:ignore"/>
+        <run class="AroundChangeThis"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="548"
+      title="default package for aspect introductions is not the current package"
+      keywords="from-resolved_10rc3,from-resolved_104">
+        <compile
+          files="introductionPackage/two/C.java,introductionPackage/one/C.java,introductionPackage/one/Aspect.java,introductionPackage/one/TestAspect.java"/>
+        <run class="one.TestAspect"/>
+    </ajc-test>
+
+    <ajc-test dir="new/PR569" pr="569"
+      title="anon class written to wrong directory" 
+   keywords="from-resolved_104,from-resolved_104">
+        <compile options="-1.4" files="a/IntroAnon.java,a/MyInterface.java,b/Dest.java"/>
+        <run class="a.IntroAnon"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="603"
+      title="unqualified transitive pointcut references not resolved"
+      keywords="from-resolved_104">
+        <compile options="-1.4" files="PointcutQualification.java"/>
+        <run class="PointcutQualification"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="603"
+      title="unqualified transitive pointcut references not resolved - 2"
+      keywords="from-resolved_104">
+        <compile options="-1.4" files="PointcutQualification2.java"/>
+        <run class="PointcutQualification2"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="619"
+      title="direct use outside aspect of defined abstract pointcut"
+      keywords="from-resolved_104">
+        <compile options="-1.4" files="AbstractPointcutAccess.java"/>
+        <run class="AbstractPointcutAccess"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="619"
+      title="direct use outside aspect of undefined abstract pointcut"
+      keywords="from-resolved_104">
+        <compile options="-1.4" files="AbstractPointcutAccessCE.java">
+            <message kind="error" line="9"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="619"
+      title="indirect use outside aspect of undefined abstract pointcut"
+      keywords="from-resolved_104">
+        <compile options="-1.4" files="AbstractPointcutIndirectCE.java">
+            <message kind="error" line="9"/>
+            <message kind="error" line="5"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="658"
+      title="simple call join point tests for JoinPoint SourceLocation context"
+      keywords="from-resolved_104">
+        <compile options="-1.4" files="SourceLocationCall.java"/>
+        <run class="SourceLocationCall"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="661"
+      title="!target with second advice on casted call"
+      keywords="from-resolved_104">
+        <compile options="-1.4" files="CallNotTarget.java"/>
+        <run class="CallNotTarget"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="666" title="name binding in around cflow"
+      keywords="from-resolved_104">
+        <compile options="-1.4" files="AroundCall.java"/>
+        <run class="AroundCall"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="660" title="name binding in around cflow - 2"
+      keywords="from-resolved_104">
+        <compile options="-1.4" files="ArgsInCflow2.java"/>
+        <run class="ArgsInCflow2"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="677"
+      title="around name-binding in cflows using factorial"
+      keywords="from-resolved_104">
+        <compile options="-1.4" files="FactorialCflow.java"/>
+        <run class="FactorialCflow"/>
+    </ajc-test>
+
+     <ajc-test dir="new" title="replacing this or target in around advice"
+      keywords="from-resolved_104">
+        <compile options="-1.4" files="TargetObjectReplacement.java"/>
+        <run class="TargetObjectReplacement"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="after returning from initialization and after executing constructor"
+      keywords="from-resolved_104">
+        <compile options="-1.4" files="ConstructorExecInit.java"/>
+        <run class="ConstructorExecInit"/>
+    </ajc-test>
+    
+    <ajc-test dir="new"
+      title="after returning from initialization causes ExceptionInInitializer in aspect">
+        <compile options="-1.4" files="ConstructorExecInitFails.java"/>
+        <run class="ConstructorExecInitFails"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="659"
+      title="name binding in before cflow containing cflowbelow"
+      keywords="from-resolved_104">
+        <compile files="ArgsInCflow.java" options="!eclipse -1.4">
+            <message kind="error" line="29"/>
+            <message kind="error" line="32"/>
+        </compile>
+    </ajc-test>
+
+
+     <ajc-test dir="new/pr728" pr="728" title="file order in type searching"
+      keywords="from-resolved_105">
+        <compile options="-1.4" files="AnotherClass.java,Interface.java"/>
+        <run class="AnotherClass"/>
+    </ajc-test>
+
+ 
+    <ajc-test dir="new" title="simple declare warning (NPE)"
+      keywords="from-resolved_105">
+        <compile options="-1.4" files="DeclareWarningMain.java">
+            <message kind="warning" line="4"/>
+        </compile>
+        <run class="DeclareWarningMain"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="755"
+      title="ajc dies on cflow into field init anon class see knownbugs.txt"
+      keywords="from-resolved_105">
+        <compile files="CflowOfFieldInitAnonMethods.java" options="!eclipse -1.4">
+        </compile>
+        <run class="CflowOfFieldInitAnonMethods" options="!eclipse"/>
+    </ajc-test>
+
+ 
+    <ajc-test dir="new" pr="757" title="Incrementing interface-introduced field"
+      keywords="from-resolved_105">
+        <compile options="-1.4" files="IntroducedFieldInc.java"/>
+        <run class="IntroducedFieldInc"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="The dynamic type, not the static one, should be used in if pcds"
+      keywords="from-resolved_105">
+        <compile options="-1.4" files="StaticTypeInIf.java"/>
+        <run class="StaticTypeInIf"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="bad interaction with after returning, around and void methods (from Rich Price)"
+      keywords="from-resolved_105">
+        <compile options="-1.4" files="AfterReturningResult.java"/>
+        <run class="AfterReturningResult"/>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="type pattern matching for inner classes (from Ken Horn)"
+      keywords="from-resolved_105">
+        <compile options="-1.4" files="TypePat.java"/>
+        <run class="test.TypePat"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="771" title="static initializer member name"
+      keywords="from-resolved_105">
+        <compile options="-1.4" files="StaticInitName.java"/>
+        <run class="StaticInitName"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="770" title="cflow pcd syntax error"
+      keywords="from-resolved_105">
+        <compile options="-1.4" files="IllegalCflowCE.java">
+            <message kind="error" line="4"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="764"
+      title="binding args with indeterminate prefix and suffix"
+      keywords="from-resolved_105">
+        <compile options="-1.4" files="IndeterminateArgs.java"/>
+        <run class="IndeterminateArgs"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="764"
+      title="check arg types with indeterminate prefix and suffix"
+      keywords="from-resolved_105">
+        <compile options="-1.4" files="IndeterminateArgType.java"/>
+        <run class="IndeterminateArgType"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="764"
+      title="testing and binding args with single indeterminate prefix and suffix"
+      keywords="from-resolved_105">
+        <compile options="-1.4" files="IndeterminateArg.java"/>
+        <run class="IndeterminateArg"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="764"
+      title="binding handler args with indeterminate prefix and suffix"
+      keywords="from-resolved_105">
+        <compile options="-1.4" files="IndeterminateHandlerArg.java"/>
+        <run class="IndeterminateHandlerArg"/>
+    </ajc-test>
+
+
+ 	<ajc-test dir="new/nolang" pr="762"
+	  title="Compiling java.lang.Object with ajc yields non-verifying bytecode"
+	  keywords="from-resolved_105"
+	   comment="XXX weak/bad test">
+	    <compile options="-1.4" files="java/lang/Object.java,java/lang/String.java">
+	    </compile>
+	</ajc-test>
+
+    <ajc-test dir="new"
+      title="method-local class defined in around return statement"
+      keywords="from-resolved_105">
+        <compile options="-1.4" files="MethodLocalAroundReturns.java"/>
+        <run class="MethodLocalAroundReturns"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="CE expected for assignment to arg in if pcd"
+      keywords="from-resolved_105">
+        <compile options="-1.4" files="IfPCDAssignmentCE.java">
+            <message kind="error" line="16"/>
+            <message kind="error" line="20"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="new" title="advising field get/sets when accessing via super"
+      keywords="from-resolved_105">
+        <compile options="-1.4" files="SuperField.java"/>
+        <run class="SuperField"/>
+    </ajc-test>
+
+    <ajc-test dir="new" title="accessing private members in outer types"
+      keywords="from-resolved_105">
+        <compile options="-1.4" files="FieldInnerAccess.java"/>
+        <run class="FieldInnerAccess"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="29934"
+      title="can't apply around advice to the execution of around advice"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="CflowCycles.java"/>
+        <run class="CflowCycles"/>
+    </ajc-test>
+    
+    <ajc-test dir="new"
+      title="incompatible advice throws clause are a compile-time error"
+      keywords="from-resolved_10x">
+        <compile options="-1.4" files="AdviceThrowsCf.java">
+            <message kind="error" line="13"/>
+            <message kind="error" line="28"/>
+            <message kind="error" line="47"/>
+            <message kind="error" line="48"/>
+            <message kind="error" line="50"/>
+            
+            <message kind="error" line="70"/>
+            <message kind="error" line="74"/>
+            <message kind="error" line="76"/>
+            <message kind="error" line="78"/>
+            
+            <message kind="error" line="85"/>
+        </compile>
+    </ajc-test>
 
-<suite>
-&tests;
 </suite>
\ No newline at end of file
diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc11/ajc11-tests.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc11/ajc11-tests.xml
deleted file mode 100644
index 02b422bb8..000000000
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc11/ajc11-tests.xml
+++ /dev/null
@@ -1,850 +0,0 @@
-<!-- AspectJ v1.1.x Tests -->
-
-    <ajc-test dir="new" pr="853"
-      title="declare interface extends class">
-        <compile files="DeclareInterfaceExtendsClass.java">
-           <message kind="error" line="10"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="853"
-      title="declare interface implements class">
-        <compile files="DeclareInterfaceImplementsClass.java">
-           <message kind="error" line="10"/>
-        </compile>
-    </ajc-test>
-
-
-
-    <ajc-test dir="new" pr="823"
-      title="declaring a private method on an inner interface"
-      keywords="tofix">
-        <compile files="PrivateMethodOnInnerInterface.java"/>
-        <run class="PrivateMethodOnInnerInterface"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="829"
-      title="CE expected when declaring fields on arrays" keywords="tofix">
-        <compile files="ArrayFieldDeclarationCE.java">
-            <message kind="error" line="14"/>
-        </compile>
-    </ajc-test>
-
- 
-    <ajc-test dir="new" pr="883"
-      title="signature of handler join point">
-        <compile files="HandlerSignature.java"/>
-        <run class="HandlerSignature"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="885"
-      title="source locations within expressions">
-        <compile files="SourceLocationWithinExpr.java"/>
-        <run class="SourceLocationWithinExpr"/>
-    </ajc-test>
-    
-    
- 
-    <ajc-test dir="new" pr="888"
-      title="crashes given method in declared method">
-        <compile files="DeclareMethodCE.java">
-          <message kind="error" line="8"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="889"
-      title="after returning advice on interface constructor">
-        <compile files="AfterReturningInterfaceConstructor.java"/>
-        <run class="AfterReturningInterfaceConstructor"/>
-    </ajc-test>
-    
-    <ajc-test dir="new" pr="889"
-      title="after returning advice on interface constructor - error">
-        <compile files="AfterReturningInterfaceConstructorCE.java">
-        	<message kind="error" line="26"/>
-        	<message kind="warning" line="30"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs" pr="900"
-      title="after advice on static call join point">
-        <compile files="AfterStaticCall.java"/>
-        <run class="AfterStaticCall"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs" pr="901"
-      title="incompatible class change error"
-      comment="XXX Jim and Erik found/fixed this - need basis">
-        <compile files="IncompatibleClassChangeErrorBug.java"/>
-        <run class="IncompatibleClassChangeErrorBug"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs" pr="903"
-      title="simple cflow of method execution">
-        <compile files="ExecutionCflow.java"/>
-        <run class="ExecutionCflow"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs" pr="909"
-      title="using instance as class reference to constant field"
-      comment="XXX need to verify run">
-        <compile files="InstanceAsClassRefToConstant.java"/>
-    </ajc-test>
-
-   <ajc-test dir="new" pr="774"
-      title="interface self-reference in anonymous instance">
-        <compile files="AnonymousSelfReference.java"/>
-        <run class="AnonymousSelfReference"/>
-    </ajc-test>
-    
-    <ajc-test dir="new" pr="776"
-      title="self-reference from (aspect-declared) method-local class">
-        <compile files="MethodSelfReference.java"/>
-        <run class="MethodSelfReference"/>
-    </ajc-test>
-    
-    <ajc-test dir="new" title="expect CE for unterminated declare error">
-        <compile files="UnterminatedDeclareErrorCE.java">
-            <message kind="error" line="4"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="new"
-      title="expect CE for declaration collision between subaspects instead of domination order">
-        <compile files="DeclarationCollisionCE.java">
-            <message kind="error" line="10"/>
-            <message kind="error" line="20"/>
-            <message kind="error" line="27"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="new"
-      title="subtype pattern in dominates should pick out aspect subtypes">
-        <compile files="DominatesTypePattern.java"/>
-        <run class="DominatesTypePattern"/>
-    </ajc-test>
-    
-    <ajc-test dir="new"
-      title="subtype pattern in dominates will conflict with type pattern">
-        <compile files="DominatesTypePatternCE.java">
-        	<message kind="error" line="15"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="new" pr="827"
-      title="after returning advice on interface and implementation constructor"
-      keywords="tofix">
-        <compile files="AfterReturningConstructor.java"/>
-        <run class="AfterReturningConstructor"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="832"
-      title="after throwing advice with non-throwable formal">
-        <compile files="AfterThrowingNonThrowable.java">
-            <message kind="error" line="41"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="new" pr="829" title="declare array field using postfix"
-      keywords="tofix">
-        <compile files="ArrayFieldDeclaration.java">
-            <message kind="error" line="17"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="new" pr="851"
-      title="prohibit declaring new aspect constructor with arguments">
-        <compile files="DeclareAspectConstructorCE.java">
-          <message kind="error" line="10"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="851"
-      title="prohibit declaring only aspect constructor with arguments">
-        <compile files="DeclareOnlyAspectConstructorCE.java">
-          <message kind="error" line="10"/>
-        </compile>
-    </ajc-test>
-    
-	<!-- The follwing three idioms are allowed.  Within a declare parents,
-	     implements and extends can be used interchangably.  We could
-	     provide -Xlint style warnings for misuse.
-	-->
-
-    <ajc-test dir="new" pr="853"
-      title="declare class extends interface">
-        <compile files="DeclareClassExtendsInterface.java">
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="853"
-      title="declare class implements class">
-        <compile files="DeclareClassImplementsClass.java">
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="853"
-      title="declare interface implements interface">
-        <compile files="DeclareInterfaceImplementsInterface.java">
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="new"
-      title="if and cflow arg binding">
-        <compile files="CflowBinding.java">
-          <message kind="error" line="13"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs" pr="902"
-      title="circularity in declare dominates">
-        <compile files="CircularDominates.java">
-		  <message kind="error" line="18"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="28702" title="percflow code hangs compiler">
-        <compile files="CloseConnectionsCflow.java" options="-1.4">
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs" pr="28852"
-      title="Verification error tracing constructor that takes arguments">
-        <compile files="ConstructorArgTracing.java"/>
-        <run class="ConstructorArgTracing"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="29106" title="declared exceptions in inter-type decls">
-        <compile files="ExceptionsOnInters.java"/>
-        <run class="ExceptionsOnInters"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="28921"
-      title="Verify error on non-Throwable in declare soft">
-        <compile files="DeclareSoftCf.java" options="-Xlint:warning">
-		  <message kind="warning" line="28"/>
-		  <message kind="error" line="29"/>
-		  <!--message kind="warning"/-->
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="29113" title="inter-type fields with array types">
-        <compile files="InterFieldArrays.java"/>
-        <run class="InterFieldArrays"/>
-    </ajc-test>
-
-    
-    <ajc-test dir="new" pr="838"
-      title="checking around join point for advice return type - numeric">
-        <compile files="AroundNumericCastCE.java">
-            <message kind="error" line="11"/>
-            <message kind="error" line="17"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="836" title="void around advice without proceed">
-        <compile files="VoidAround.java">
-            <message kind="error" line="11"/>
-            <message kind="error" line="29"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="new/PR852" pr="852"
-      title="declaring method on superclass and subclass">
-        <compile files="aspectPack/Aspect.java,target/SubClass.java,target/SuperClass.java">
-          <dir-changes added="target.SubClass,target.SuperClass"/>
-        </compile>
-        <run class="aspectPack.Aspect"/>
-    </ajc-test>
-    
-    <ajc-test dir="new/finalfield" pr="28974"
-      title="introducing final fields (simple)">
-        <compile files="Introducer.java,Receiver.java,User1.java"/>
-        <run class="User1"/>
-    </ajc-test>
-
-    <ajc-test dir="new/finalfield" pr="28974"
-      title="introducing final fields and using as constants">
-        <compile files="Introducer.java,Receiver.java,User2.java"/>
-        <run class="User2"/>
-    </ajc-test>
-
-    <ajc-test dir="new/finalfield" pr="28974"
-      title="introducing final fields and checking errors">
-        <compile files="Introducer.java,Receiver.java,UserCf.java">
-            <message kind="error" line="6"/>        
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="29691"
-    		title="Static inner aspects cannot reference user defined pointcuts">
-        <compile files="PcdLookup.java" />
-        <run class="PcdLookup"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="29691"
-    		title="Static inner aspects cannot reference user defined pointcuts">
-        <compile files="SoftWithin.java" />
-        <run class="SoftWithin"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="29689"
-    		title="Declare precedence should not allow multiple * patterns">
-        <compile files="CircularPrecedence.java">
-            <message kind="error" line="14"/> 
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="29662"
-    		title="VerifyError on accessing objects not accessible to the weaver">
-        <compile files="AroundAccess.java">
-        </compile>
-        <run class="AroundAccess"/>
-    </ajc-test>
-    
-    <ajc-test dir="new" pr="804"
-      title="aspect static initializers should run before instance constructed"
-      keywords="tofix">
-        <compile files="AspectStaticInit.java"/>
-        <run class="AspectStaticInit"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="29959"
-            title="super call in intertype method declaration body causes VerifyError">
-        <compile files="SuperToIntro.java"/>
-        <run class="SuperToIntro"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs/crashes" pr="30168" 
-    		title="Error with certain combination of advice">
-        <compile files="test/Test3.java"/>
-        <run class="test.Test3"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs" pr="31423" 
-    		title="Pointcut adviceexecution() does not work">
-        <compile files="AdviceExec.java"/>
-        <run class="AdviceExec"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="30026" 
-    		title="problems with finalize call">
-        <compile files="Finalizer.java">
-            <message kind="error" line="22"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="33635" 
-    		title="Negation of if pointcut does not work">
-        <compile files="NotIf.java"/>
-        <run class="NotIf"/>
-    </ajc-test>
-    
-    
-    <ajc-test dir="bugs" pr="32463" 
-    		title="ajc reports error when encountering static declaration of nested classes">
-        <compile files="WeaveLocal.java"/>
-        <run class="WeaveLocal"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="32428" 
-    		title="can't use pointcuts defined in inner aspects ">
-        <compile files="InnerPointcut.java"/>
-        <run class="InnerPointcut"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs/interfaceNames" pr="32421" 
-    		title="can't resolve nested public interfaces (also PR#32399)">
-        <compile files="TransactionTest.java,sub/ExecutionMonitor.java,sub/ObserverProtocol.aj"/>
-        <run class="TransactionTest"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="34210" 
-    		title="thisJoinPoint.getArgs() causes IncompatibleClassChangeError">
-        <compile files="ThisJoinPointAndVerifier.java"/>
-        <run class="ThisJoinPointAndVerifier"/>
-    </ajc-test>
-    
-    <ajc-test dir="errors"  keywords="error"
-    		title="inter-type declaration of void field">
-        <compile files="VoidFieldDeclarationCE.java">
-			<message kind="error" line="7"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="binding"
-      title="no such constructor for proceed argument (error)">
-        <compile files="UnfoundConstructor.java">
-        	<message kind="error" line="25"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="new/declare" pr="31724"
-            title="omnibus declare warning context with no initializer/constructor">
-        <compile files="DeclareWarningEmpty.java">
-            <message kind="warning" line="3" text="2 - initialization(DeclareWarningEmpty)"/>
-            <message kind="warning" line="3" text="1 - staticinitialization(DeclareWarningEmpty)"/>
-        </compile>
-    </ajc-test>
-    
-
-    <ajc-test dir="new/declare" pr="31724"
-            title="omnibus declare warning context">
-        <compile files="DeclareWarning.java">
-            <message kind="warning" line="3" text="staticinitialization(DeclareWarning)"/>
-            <message kind="warning" line="12" text="call(DeclareWarning.new())"/>
-            <message kind="warning" line="13" text="get staticInt"/>
-            <message kind="warning" line="14" text="get instanceInt"/>
-            <message kind="warning" line="15" text="set staticInt"/>
-            <message kind="warning" line="16" text="set instanceInt"/>
-            <message kind="warning" line="17" text="call(void run())"/>
-            <message kind="warning" line="18" text="call(void irun())"/>
-            <message kind="warning" line="21" text="execution(void run())"/>
-            <message kind="warning" line="22" text="execution(void irun())"/>
-            <message kind="warning" line="23" text="execution(DeclareWarning.new())"/>
-            <message kind="warning" line="23" text="initialization(DeclareWarning)"/>
-            <message kind="warning" line="33" text="handler(OutOfMemoryError) &amp;&amp; within(DeclareWarning)"/>
-            <message kind="warning" line="36" text="handler(Error)"/>
-            <message kind="warning" line="39" text="handler(RuntimeException) &amp;&amp; withincode(DeclareWarning.new())"/>
-            <message kind="warning" line="72" text="adviceExecution() &amp;&amp; within(A)"/>
-        </compile>
-    </ajc-test>
-    
-    
-    <ajc-test dir="bugs" pr="34858"
-      title="cflow binding issues with ignoring state">
-        <compile files="CflowBinding.java"/>
-        <run class="CflowBinding"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs" pr="34858"
-      title="cflow binding -- original weaver crash">
-        <compile files="CflowBindingOrig.java"/>
-        <run class="CflowBindingOrig"/>
-    </ajc-test>
-    
-    <ajc-test dir="errors"  
-    		title="type not imported in around advice">
-        <compile files="TypeNotImportedInAroundCE.java">
-        	<message kind="error" line="10"/>
-        </compile>
-	</ajc-test>
-
-    <ajc-test dir="errors"  
-    		title="type not imported in aspect">
-        <compile files="TypeInAspectNotImportedCE.java">
-        	<message kind="error" line="6"/>
-        </compile>
-	</ajc-test>
-	
-    <ajc-test dir="errors"  keywords="error"
-    		title="class extending abstract aspect">
-        <compile files="ClassExtendingAbstractAspectCE.java">
-			<message kind="error" line="20"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs" pr="34925"
-      title="declare soft and throw statements">
-        <compile files="ConvertToUnchecked.java" options="-Xlint:ignore"/>
-        <run class="ConvertToUnchecked"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs/interAbstract"
-      title="inter-type declaration bug with abstract classes"
-      pr="36046">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs/interInherit" pr="35725"
-      title="Inter type declaration to base class not seen by derived class">
-        <compile files="a_impl/AImpl.java,a_impl/Af.java,a_intf/A.java,b_impl/BImpl.java,b_intf/B.java"/>
-        <run class="b_impl.BImpl"/>
-    </ajc-test>
-
-    <ajc-test dir="new/declareParents"
-      title="Declare parents with intermediate ancestor"
-      keywords="from-new">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-    
-    <ajc-test dir="new/declareParents" 
-      title="Declare parents removing ancestor"
-      keywords="from-new">
-        <compile files="IllegalAdoption.java">
-            <message kind="error" line="13"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs/interSpecials" title="IllegalAccessError while accessing introduced variable / 1.1rc1"
-      pr="36110">
-        <compile files="p1/C.java,p2/A1.java"/>
-        <run class="p2.A1"/>
-    </ajc-test>
-    
-    <ajc-test dir="new" pr="36736"
-      title="implemented abstract pointcut">
-        <compile files="AbstractImplementedPointcut.java">
-            <message kind="error" line="14"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="new/verifyError" pr="36673"
-      title="privileged aspect main verify error">
-        <compile files="Privilege.java"/>
-        <run class="Privilege"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="36564"
-      title="Internal compiler error with thisJoinPoint.getStaticPart()">
-        <compile files="tjpStaticPart/Test.java,tjpStaticPart/Exceptions.java" options="-Xlint:ignore"/>
-        <run class="tjpStaticPart.Test"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="29665"
-      title="Inconsistant stack height with around">
-        <compile files="StackError.java" options="-Xlint:ignore"/>
-        <run class="StackError"/>
-    </ajc-test>
-    
-
-	<ajc-test dir="bugs/messyAround" pr="36056"
-      title="Ajc 1.1 rc1 java.lang.VerifyError with messy arounds">
-        <compile files="aspects/Trace.aj,cap/OptionList.java,DebugTrace.aj">
-            <message kind="warning" line="102"/>
-        	<message kind="warning" line="124"/>
-        	<message kind="warning" line="138"/>
-        </compile>
-        <run class="cap.OptionList"/>
-    </ajc-test>  
-
-    <ajc-test dir="new"
-      title="try/finally in around advice (same as ...messy arounds?)">
-        <compile files="TryFinallyInAround.java"/>
-        <run class="TryFinallyInAround"/>
-    </ajc-test>
-    
-    <ajc-test dir="new" pr="36778"
-      title="advise join points in subclass of empty interface">
-        <compile files="EmptyInterface.java"/>
-        <run class="EmptyInterface"/>
-    </ajc-test>
-    
-    <ajc-test dir="new" pr="36778"
-      title="can't put around advice on interface static initializer"
-      comment="this tests for a nice message given a compiler limitation">
-        <compile files="EmptyInterfaceCE.java" options="-1.4">
-        	<message kind="error" line="20"/>
-        	<message kind="error" line="23"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="36803"
-      title="cflow concretization causing assertion failure">
-        <compile files="CflowConcrete.java" options="-1.4"/>
-        <run class="CflowConcrete"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs" title="lame error message: negation doesn't allow binding"
-      pr="30663">
-        <compile files="BadBindingError.java">
-            <message kind="error" line="7"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs/interSpecials" pr="36936"
-      title="Error when introducing members of type Class">
-        <compile files="Trg.java,Asp.java"/>
-        <run class="Trg"/>
-    </ajc-test>
-    
-    <ajc-test dir="new"
-      comment="this is a pureJava test, but we always want to run it"
-      title="arrays via Class.forName()">
-        <compile files="ClassForName.java"/>
-        <run class="ClassForName"/>
-    </ajc-test>
-
-   <ajc-test dir="bugs/inlineAround" pr="37152"
-      title="perthis and inline arounds">
-        <compile files="aspect1/Base.java,aspect2/Concrete.java,p1/Main.java">
-        </compile>
-        <run class="p1.Main"/>
-    </ajc-test>
-    
-   <ajc-test dir="bugs" pr="37325"  
-      title="Weaver fails with NPE for very large source files ">
-        <compile files="LongFile.java"/>
-        <run class="LongFile"/>
-    </ajc-test>   
-
-     <ajc-test dir="harness" keywords="command-line-error"
-      title="CLE: no sources">
-        <compile badInput="true">
-            <message kind="error" text="no sources"/>
-            <message kind="abort" text="Usage"/>
-        </compile>
-    </ajc-test>
- 
-    <ajc-test dir="harness" 
-    	keywords="command-line-error,knownLimitation-ajctaskCompiler,knownLimitation-ajdeCompiler"
-    	comment="ajde omits usage"
-      title="CLE: bad filename">
-        <compile  badInput="true" files="NoSuchFile.java">
-            <message kind="error" text="NoSuchFile.java"/>
-            <message kind="abort" text="Usage"/>
-        </compile>
-    </ajc-test>
-    
-     <ajc-test dir="harness" keywords="command-line-error"
-    	comment="XXX test skipped - harness ignores -sourceroot option"
-      title="CLE: no dir specified for sourceroots">
-        <compile badInput="true" files="ErrorTest.java" 
-        	options="-sourceroots">
-            <message kind="error" text="no sources specified"/>
-            <message kind="error" text="bad sourceroot"/>
-            <message kind="abort" text="Usage"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="harness" keywords="command-line-error,knownLimitation-ajdeCompiler"
-    	comment="ajde has same errors, different wording"
-      title="CLE: no sourceroot specified for incremental">
-        <compile badInput="true" options="-incremental">
-            <message kind="error" text="no sources specified"/>
-            <message kind="error" text="specify a source root"/>
-            <message kind="abort" text="Usage"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="harness" keywords="command-line-error,knownLimitation-ajdeCompiler"
-    	comment="ajde has same errors, different wording"
-      title="CLE: file specified with incremental">
-        <compile badInput="true" files="ErrorTest.java"
-        	options="-incremental">
-            <message kind="error" text="incremental mode only handles source files using -sourceroots"/>
-            <message kind="error" text="no sources specified"/>
-            <message kind="error" text="specify a source root"/>
-            <message kind="abort" text="Usage"/>
-        </compile>
-    </ajc-test>
-    
-  
-    <ajc-test dir="bugs" pr="37304"
-   	 title="public static fields being ignored">
-        <compile files="FinalFields.java"/>
-        <run class="FinalFields"/>
-    </ajc-test>
- 
-      
-    <!-- This doesn't actually reproduce the bug, but no test case has been submitted
-         that does so this is here as a place-holder and to verify that we're mostly
-         working.
-    -->
-    <ajc-test dir="bugs/accessMethods" pr="38212"
-   	 title="can not resolve this member warning">
-        <compile files="p1/Base.java,p2/Derived.java"/>
-        <run class="p2.Derived"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="38345"
-   	 title="try switch VerifyError, InconsistentStackHeight">
-        <compile files="TrySwitch.java"/>
-        <run class="TrySwitch"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="39458"
-   	 title="Compiler crash in ajc 1.1 - terrible error for inaccessible constructor">
-        <compile files="NewVoid.java">
-            <message kind="error" line="17"/>        
-            <message kind="error" line="20"/>        
-            <message kind="error" line="21"/>
-                  
-            <message kind="error" line="28"/>        
-            <message kind="warning" line="29"/>        
-            <message kind="warning" line="30"/>            
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="39458"
-   	 title="Compiler crash in ajc 1.1 - terrible error for inaccessible constructor - 1.7">
-        <compile files="NewVoid.java">
-            <message kind="error" line="17"/>        
-            <message kind="error" line="20"/>        
-            <message kind="error" line="21"/>
-                  
-            <message kind="error" line="28"/>        
-            <message kind="warning" line="29"/>        
-            <message kind="error" line="30"/>            
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="39460"
-   	 title="Missing import crashes compiler">
-        <compile files="MissingImport.java">      
-            <message kind="error" line="13" text="InvocationTargetException cannot be resolved to a type"/> 
-<!-- this error has 'gone' in e37 upgrade            <message kind="error" line="14" text="e cannot be resolved"/> -->
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="39479"
-   	 title="NPE in bcel.LazyMethodGen when delegating from one ctor to a second that includes a switch">
-        <compile files="NewSwitch.java"/>
-        <run class="NewSwitch"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs" pr="40109"
-   	 title="switch statement in aspects crashes weaving">
-        <compile files="SwitchInAround.java"/>
-        <run class="SwitchInAround"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="39993"
-   	 title="ajc stack trace on declaring hashcode() method in aspect">
-        <compile files="OverridingInterfaceObjectMethod.java"/>
-        <run class="OverridingInterfaceObjectMethod"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs"
-   	 title="using super in method introduced on interface with multiple supertypes">
-        <compile files="MultipleSuperCf.java">
-        	<message kind="error" line="14"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs/cflowAndJar" pr="39462"
-   	 title="Compiler crashes in jar and cflow (with no .jar)">
-        <compile files="TestAspect.aj,Test.java,AbstractAspect.aj">
-        	<message kind="warning" line="16"/>
-        </compile>
-        <run class="Test"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs/cflowAndJar" pr="39462"
-   	 title="Compiler crashes in jar and cflow (with .jar)"
-   	 comment="make lib.jar with ajc -outjar lib.jar AbstractAspect.aj">
-        <compile files="TestAspect.aj,Test.java" aspectpath="lib.jar">
-        	<message kind="warning" line="16"/>
-        </compile>
-        <run class="Test"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="40589"
-   	 title="Default method impl for interface causes internal exception.">
-        <compile files="CloneMethod.java"/>
-        <run class="CloneMethod"/>
-    </ajc-test>
-    
-	<ajc-test dir="errors"
-		title="compile error expected for abstract pointcut outside abstract aspect">
-		<compile files="AbstractPointcutCE.java">
-			<message kind="error" line="4" text="The type C must be an abstract class to define abstract methods"/>
-			<message kind="error" line="5"/>
-			<message kind="error" line="10"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs"
-		pr="40876"
-		title="subtype-qualified pointcut reference">
-		<compile files="PointcutLibraryTest.java"/>
-		<run class="PointcutLibraryTest"/>
-	</ajc-test>
-	
-	<ajc-test dir="bugs"
-		pr="40858"
-		comment="super is not permitted in pointcuts in 1.1"
-		title="weaver trace on mis-qualified pointcut reference">
-		<compile files="SuperPointcutCE.java">
-			<message kind="error" line="23"/>
-			<message kind="error" line="26"/>
-		</compile>
-	</ajc-test>
-
-	<ajc-test dir="bugs"
-		pr="40814"
-		title="compile error expected for interface pointcuts">
-		<compile files="AbstractPointcutCE.java">
-			<message kind="error" line="14" text="The type Concrete must be an abstract class to define abstract methods"/>
-			<message kind="error" line="7"/>
-			<message kind="error" line="11"/>		
-			<message kind="error" line="15"/>
-		</compile>
-	</ajc-test>
-
-	<ajc-test dir="bugs"
-		pr="40805" 
-		title="interface call signatures when declaring method in aspect">
-		<compile files="DeclareWarningAndInterfaceMethodCW.java">
-			<message kind="warning" line="27" text="call getSomething"/>
-			<message kind="warning" line="27" text="call ICanGetSomething.getSomething"/>
-			<message kind="warning" line="31" text="call getSomething"/>
-			<message kind="warning" line="31" text="call ICanGetSomething.getSomething"/>
-			<message kind="warning" line="33" text="call getSomething"/>
-			<message kind="warning" line="33" text="call ICanGetSomething.getSomething"/>
-			<message kind="warning" line="35" text="call getSomething"/>
-			<message kind="warning" line="35" text="call ICanGetSomething.getSomething"/>
-			<message kind="warning" line="38" text="call getSomething"/>
-			<message kind="warning" line="38" text="call ICanGetSomething.getSomething"/>
-		</compile>
-	</ajc-test>
- 
- 	<ajc-test dir="bugs"
-		pr="41175"
-		title="reflective check of declared exceptions from aspect-declared methods">
-		<compile files="DeclaredExceptions.java"/>
-		<run class="DeclaredExceptions"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs/throwsSignature"
-		pr="42539"
-		title="throw derivative pointcuts not advised">
-		<compile files="ExceptionBugTest.java,ExceptionAspect.java">
-		    <message line="5" kind="warning" text="throws both"/>
-		    <message line="5" kind="error" text="throws Exception"/>
-		    <message line="7" kind="warning" text="throws both"/>
-		</compile>
-	</ajc-test>
-	
-    <ajc-test dir="bugs" pr="42652"
-   	 title="perthis and signature bad interaction">
-        <compile files="InterPerCall.java" options="-1.4"/>
-        <run class="InterPerCall"/>
-    </ajc-test>
-    
-	<ajc-test dir="bugs/declareBinding"
-		pr="42740"
-		title="declare error fails on pointcuts composed from multiple classes">
-		<compile files="SampleExceptionHandling1.java">
-		    <message line="2" kind="error" text="no checked exceptions"/>
-		</compile>
-	</ajc-test>
-
-	<ajc-test dir="bugs/declareSoftWithin"
-		pr="42740"
-		title="declare error fails on pointcuts composed from multiple classes">
-		<compile files="aspects/Softener.aj,test/NoSoftener.java"/>
-		<run class="test.NoSoftener"/>
-	</ajc-test>
-	
-    <ajc-test dir="bugs" pr="42993"
-   	    title="Interaction between pointcut binding and declare parents">
-        <compile files="ParentsAndPointcuts.java"/>
-        <run class="ParentsAndPointcuts"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="43194"
-   	 title="Non-functional concretezation of ReferencePointcut">
-        <compile files="AdviceInteraction.java"/>
-        <run class="AdviceInteraction"/>
-    </ajc-test>
-
-	<ajc-test dir="bugs/extdirs" 
-		pr="42574"
-		title="zip and jar suffixes for extdirs entries">
-		<compile files="extdirs-src/main/Main.java"
-			extdirs="lib/lowercase"/>
-	</ajc-test>
- 
\ No newline at end of file
diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc11/ajc11.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc11/ajc11.xml
index 899dfe725..f4df43476 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc11/ajc11.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/ajc11/ajc11.xml
@@ -1,10 +1,851 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[
-<!ENTITY tests SYSTEM "../tests/src/org/aspectj/systemtest/ajc11/ajc11-tests.xml">
-]>
-<!-- AspectJ v1.1.x Tests -->
-
+<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
 <suite>
 
-&tests;
+    <ajc-test dir="new" pr="853"
+      title="declare interface extends class">
+        <compile files="DeclareInterfaceExtendsClass.java">
+           <message kind="error" line="10"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="853"
+      title="declare interface implements class">
+        <compile files="DeclareInterfaceImplementsClass.java">
+           <message kind="error" line="10"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="823"
+      title="declaring a private method on an inner interface"
+      keywords="tofix">
+        <compile files="PrivateMethodOnInnerInterface.java"/>
+        <run class="PrivateMethodOnInnerInterface"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="829"
+      title="CE expected when declaring fields on arrays" keywords="tofix">
+        <compile files="ArrayFieldDeclarationCE.java">
+            <message kind="error" line="14"/>
+        </compile>
+    </ajc-test>
+
+ 
+    <ajc-test dir="new" pr="883"
+      title="signature of handler join point">
+        <compile files="HandlerSignature.java"/>
+        <run class="HandlerSignature"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="885"
+      title="source locations within expressions">
+        <compile files="SourceLocationWithinExpr.java"/>
+        <run class="SourceLocationWithinExpr"/>
+    </ajc-test>
+    
+    
+ 
+    <ajc-test dir="new" pr="888"
+      title="crashes given method in declared method">
+        <compile files="DeclareMethodCE.java">
+          <message kind="error" line="8"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="889"
+      title="after returning advice on interface constructor">
+        <compile files="AfterReturningInterfaceConstructor.java"/>
+        <run class="AfterReturningInterfaceConstructor"/>
+    </ajc-test>
+    
+    <ajc-test dir="new" pr="889"
+      title="after returning advice on interface constructor - error">
+        <compile files="AfterReturningInterfaceConstructorCE.java">
+        	<message kind="error" line="26"/>
+        	<message kind="warning" line="30"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="bugs" pr="900"
+      title="after advice on static call join point">
+        <compile files="AfterStaticCall.java"/>
+        <run class="AfterStaticCall"/>
+    </ajc-test>
+
+    <ajc-test dir="bugs" pr="901"
+      title="incompatible class change error"
+      comment="XXX Jim and Erik found/fixed this - need basis">
+        <compile files="IncompatibleClassChangeErrorBug.java"/>
+        <run class="IncompatibleClassChangeErrorBug"/>
+    </ajc-test>
+
+    <ajc-test dir="bugs" pr="903"
+      title="simple cflow of method execution">
+        <compile files="ExecutionCflow.java"/>
+        <run class="ExecutionCflow"/>
+    </ajc-test>
+
+    <ajc-test dir="bugs" pr="909"
+      title="using instance as class reference to constant field"
+      comment="XXX need to verify run">
+        <compile files="InstanceAsClassRefToConstant.java"/>
+    </ajc-test>
+
+   <ajc-test dir="new" pr="774"
+      title="interface self-reference in anonymous instance">
+        <compile files="AnonymousSelfReference.java"/>
+        <run class="AnonymousSelfReference"/>
+    </ajc-test>
+    
+    <ajc-test dir="new" pr="776"
+      title="self-reference from (aspect-declared) method-local class">
+        <compile files="MethodSelfReference.java"/>
+        <run class="MethodSelfReference"/>
+    </ajc-test>
+    
+    <ajc-test dir="new" title="expect CE for unterminated declare error">
+        <compile files="UnterminatedDeclareErrorCE.java">
+            <message kind="error" line="4"/>
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="new"
+      title="expect CE for declaration collision between subaspects instead of domination order">
+        <compile files="DeclarationCollisionCE.java">
+            <message kind="error" line="10"/>
+            <message kind="error" line="20"/>
+            <message kind="error" line="27"/>
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="new"
+      title="subtype pattern in dominates should pick out aspect subtypes">
+        <compile files="DominatesTypePattern.java"/>
+        <run class="DominatesTypePattern"/>
+    </ajc-test>
+    
+    <ajc-test dir="new"
+      title="subtype pattern in dominates will conflict with type pattern">
+        <compile files="DominatesTypePatternCE.java">
+        	<message kind="error" line="15"/>
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="new" pr="827"
+      title="after returning advice on interface and implementation constructor"
+      keywords="tofix">
+        <compile files="AfterReturningConstructor.java"/>
+        <run class="AfterReturningConstructor"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="832"
+      title="after throwing advice with non-throwable formal">
+        <compile files="AfterThrowingNonThrowable.java">
+            <message kind="error" line="41"/>
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="new" pr="829" title="declare array field using postfix"
+      keywords="tofix">
+        <compile files="ArrayFieldDeclaration.java">
+            <message kind="error" line="17"/>
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="new" pr="851"
+      title="prohibit declaring new aspect constructor with arguments">
+        <compile files="DeclareAspectConstructorCE.java">
+          <message kind="error" line="10"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="851"
+      title="prohibit declaring only aspect constructor with arguments">
+        <compile files="DeclareOnlyAspectConstructorCE.java">
+          <message kind="error" line="10"/>
+        </compile>
+    </ajc-test>
+    
+	<!-- The follwing three idioms are allowed.  Within a declare parents,
+	     implements and extends can be used interchangably.  We could
+	     provide -Xlint style warnings for misuse.
+	-->
+
+    <ajc-test dir="new" pr="853"
+      title="declare class extends interface">
+        <compile files="DeclareClassExtendsInterface.java">
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="853"
+      title="declare class implements class">
+        <compile files="DeclareClassImplementsClass.java">
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="853"
+      title="declare interface implements interface">
+        <compile files="DeclareInterfaceImplementsInterface.java">
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="new"
+      title="if and cflow arg binding">
+        <compile files="CflowBinding.java">
+          <message kind="error" line="13"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="bugs" pr="902"
+      title="circularity in declare dominates">
+        <compile files="CircularDominates.java">
+		  <message kind="error" line="18"/>
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="bugs" pr="28702" title="percflow code hangs compiler">
+        <compile files="CloseConnectionsCflow.java" options="-1.4">
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="bugs" pr="28852"
+      title="Verification error tracing constructor that takes arguments">
+        <compile files="ConstructorArgTracing.java"/>
+        <run class="ConstructorArgTracing"/>
+    </ajc-test>
+    
+    <ajc-test dir="bugs" pr="29106" title="declared exceptions in inter-type decls">
+        <compile files="ExceptionsOnInters.java"/>
+        <run class="ExceptionsOnInters"/>
+    </ajc-test>
+    
+    <ajc-test dir="bugs" pr="28921"
+      title="Verify error on non-Throwable in declare soft">
+        <compile files="DeclareSoftCf.java" options="-Xlint:warning">
+		  <message kind="warning" line="28"/>
+		  <message kind="error" line="29"/>
+		  <!--message kind="warning"/-->
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="bugs" pr="29113" title="inter-type fields with array types">
+        <compile files="InterFieldArrays.java"/>
+        <run class="InterFieldArrays"/>
+    </ajc-test>
+
+    
+    <ajc-test dir="new" pr="838"
+      title="checking around join point for advice return type - numeric">
+        <compile files="AroundNumericCastCE.java">
+            <message kind="error" line="11"/>
+            <message kind="error" line="17"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="836" title="void around advice without proceed">
+        <compile files="VoidAround.java">
+            <message kind="error" line="11"/>
+            <message kind="error" line="29"/>
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="new/PR852" pr="852"
+      title="declaring method on superclass and subclass">
+        <compile files="aspectPack/Aspect.java,target/SubClass.java,target/SuperClass.java">
+          <dir-changes added="target.SubClass,target.SuperClass"/>
+        </compile>
+        <run class="aspectPack.Aspect"/>
+    </ajc-test>
+    
+    <ajc-test dir="new/finalfield" pr="28974"
+      title="introducing final fields (simple)">
+        <compile files="Introducer.java,Receiver.java,User1.java"/>
+        <run class="User1"/>
+    </ajc-test>
+
+    <ajc-test dir="new/finalfield" pr="28974"
+      title="introducing final fields and using as constants">
+        <compile files="Introducer.java,Receiver.java,User2.java"/>
+        <run class="User2"/>
+    </ajc-test>
+
+    <ajc-test dir="new/finalfield" pr="28974"
+      title="introducing final fields and checking errors">
+        <compile files="Introducer.java,Receiver.java,UserCf.java">
+            <message kind="error" line="6"/>        
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="bugs" pr="29691"
+    		title="Static inner aspects cannot reference user defined pointcuts">
+        <compile files="PcdLookup.java" />
+        <run class="PcdLookup"/>
+    </ajc-test>
+    
+    <ajc-test dir="bugs" pr="29691"
+    		title="Static inner aspects cannot reference user defined pointcuts">
+        <compile files="SoftWithin.java" />
+        <run class="SoftWithin"/>
+    </ajc-test>
+    
+    <ajc-test dir="bugs" pr="29689"
+    		title="Declare precedence should not allow multiple * patterns">
+        <compile files="CircularPrecedence.java">
+            <message kind="error" line="14"/> 
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="bugs" pr="29662"
+    		title="VerifyError on accessing objects not accessible to the weaver">
+        <compile files="AroundAccess.java">
+        </compile>
+        <run class="AroundAccess"/>
+    </ajc-test>
+    
+    <ajc-test dir="new" pr="804"
+      title="aspect static initializers should run before instance constructed"
+      keywords="tofix">
+        <compile files="AspectStaticInit.java"/>
+        <run class="AspectStaticInit"/>
+    </ajc-test>
+    
+    <ajc-test dir="bugs" pr="29959"
+            title="super call in intertype method declaration body causes VerifyError">
+        <compile files="SuperToIntro.java"/>
+        <run class="SuperToIntro"/>
+    </ajc-test>
+    
+    <ajc-test dir="bugs/crashes" pr="30168" 
+    		title="Error with certain combination of advice">
+        <compile files="test/Test3.java"/>
+        <run class="test.Test3"/>
+    </ajc-test>
+
+    <ajc-test dir="bugs" pr="31423" 
+    		title="Pointcut adviceexecution() does not work">
+        <compile files="AdviceExec.java"/>
+        <run class="AdviceExec"/>
+    </ajc-test>
+    
+    <ajc-test dir="bugs" pr="30026" 
+    		title="problems with finalize call">
+        <compile files="Finalizer.java">
+            <message kind="error" line="22"/>
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="bugs" pr="33635" 
+    		title="Negation of if pointcut does not work">
+        <compile files="NotIf.java"/>
+        <run class="NotIf"/>
+    </ajc-test>
+    
+    
+    <ajc-test dir="bugs" pr="32463" 
+    		title="ajc reports error when encountering static declaration of nested classes">
+        <compile files="WeaveLocal.java"/>
+        <run class="WeaveLocal"/>
+    </ajc-test>
+    
+    <ajc-test dir="bugs" pr="32428" 
+    		title="can't use pointcuts defined in inner aspects ">
+        <compile files="InnerPointcut.java"/>
+        <run class="InnerPointcut"/>
+    </ajc-test>
+
+    <ajc-test dir="bugs/interfaceNames" pr="32421" 
+    		title="can't resolve nested public interfaces (also PR#32399)">
+        <compile files="TransactionTest.java,sub/ExecutionMonitor.java,sub/ObserverProtocol.aj"/>
+        <run class="TransactionTest"/>
+    </ajc-test>
+    
+    <ajc-test dir="bugs" pr="34210" 
+    		title="thisJoinPoint.getArgs() causes IncompatibleClassChangeError">
+        <compile files="ThisJoinPointAndVerifier.java"/>
+        <run class="ThisJoinPointAndVerifier"/>
+    </ajc-test>
+    
+    <ajc-test dir="errors"  keywords="error"
+    		title="inter-type declaration of void field">
+        <compile files="VoidFieldDeclarationCE.java">
+			<message kind="error" line="7"/>
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="binding"
+      title="no such constructor for proceed argument (error)">
+        <compile files="UnfoundConstructor.java">
+        	<message kind="error" line="25"/>
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="new/declare" pr="31724"
+            title="omnibus declare warning context with no initializer/constructor">
+        <compile files="DeclareWarningEmpty.java">
+            <message kind="warning" line="3" text="2 - initialization(DeclareWarningEmpty)"/>
+            <message kind="warning" line="3" text="1 - staticinitialization(DeclareWarningEmpty)"/>
+        </compile>
+    </ajc-test>
+    
+
+    <ajc-test dir="new/declare" pr="31724"
+            title="omnibus declare warning context">
+        <compile files="DeclareWarning.java">
+            <message kind="warning" line="3" text="staticinitialization(DeclareWarning)"/>
+            <message kind="warning" line="12" text="call(DeclareWarning.new())"/>
+            <message kind="warning" line="13" text="get staticInt"/>
+            <message kind="warning" line="14" text="get instanceInt"/>
+            <message kind="warning" line="15" text="set staticInt"/>
+            <message kind="warning" line="16" text="set instanceInt"/>
+            <message kind="warning" line="17" text="call(void run())"/>
+            <message kind="warning" line="18" text="call(void irun())"/>
+            <message kind="warning" line="21" text="execution(void run())"/>
+            <message kind="warning" line="22" text="execution(void irun())"/>
+            <message kind="warning" line="23" text="execution(DeclareWarning.new())"/>
+            <message kind="warning" line="23" text="initialization(DeclareWarning)"/>
+            <message kind="warning" line="33" text="handler(OutOfMemoryError) &amp;&amp; within(DeclareWarning)"/>
+            <message kind="warning" line="36" text="handler(Error)"/>
+            <message kind="warning" line="39" text="handler(RuntimeException) &amp;&amp; withincode(DeclareWarning.new())"/>
+            <message kind="warning" line="72" text="adviceExecution() &amp;&amp; within(A)"/>
+        </compile>
+    </ajc-test>
+    
+    
+    <ajc-test dir="bugs" pr="34858"
+      title="cflow binding issues with ignoring state">
+        <compile files="CflowBinding.java"/>
+        <run class="CflowBinding"/>
+    </ajc-test>
+
+    <ajc-test dir="bugs" pr="34858"
+      title="cflow binding -- original weaver crash">
+        <compile files="CflowBindingOrig.java"/>
+        <run class="CflowBindingOrig"/>
+    </ajc-test>
+    
+    <ajc-test dir="errors"  
+    		title="type not imported in around advice">
+        <compile files="TypeNotImportedInAroundCE.java">
+        	<message kind="error" line="10"/>
+        </compile>
+	</ajc-test>
+
+    <ajc-test dir="errors"  
+    		title="type not imported in aspect">
+        <compile files="TypeInAspectNotImportedCE.java">
+        	<message kind="error" line="6"/>
+        </compile>
+	</ajc-test>
+	
+    <ajc-test dir="errors"  keywords="error"
+    		title="class extending abstract aspect">
+        <compile files="ClassExtendingAbstractAspectCE.java">
+			<message kind="error" line="20"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="bugs" pr="34925"
+      title="declare soft and throw statements">
+        <compile files="ConvertToUnchecked.java" options="-Xlint:ignore"/>
+        <run class="ConvertToUnchecked"/>
+    </ajc-test>
+    
+    <ajc-test dir="bugs/interAbstract"
+      title="inter-type declaration bug with abstract classes"
+      pr="36046">
+        <compile files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+    
+    <ajc-test dir="bugs/interInherit" pr="35725"
+      title="Inter type declaration to base class not seen by derived class">
+        <compile files="a_impl/AImpl.java,a_impl/Af.java,a_intf/A.java,b_impl/BImpl.java,b_intf/B.java"/>
+        <run class="b_impl.BImpl"/>
+    </ajc-test>
+
+    <ajc-test dir="new/declareParents"
+      title="Declare parents with intermediate ancestor"
+      keywords="from-new">
+        <compile files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+    
+    <ajc-test dir="new/declareParents" 
+      title="Declare parents removing ancestor"
+      keywords="from-new">
+        <compile files="IllegalAdoption.java">
+            <message kind="error" line="13"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="bugs/interSpecials" title="IllegalAccessError while accessing introduced variable / 1.1rc1"
+      pr="36110">
+        <compile files="p1/C.java,p2/A1.java"/>
+        <run class="p2.A1"/>
+    </ajc-test>
+    
+    <ajc-test dir="new" pr="36736"
+      title="implemented abstract pointcut">
+        <compile files="AbstractImplementedPointcut.java">
+            <message kind="error" line="14"/>
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="new/verifyError" pr="36673"
+      title="privileged aspect main verify error">
+        <compile files="Privilege.java"/>
+        <run class="Privilege"/>
+    </ajc-test>
+    
+    <ajc-test dir="bugs" pr="36564"
+      title="Internal compiler error with thisJoinPoint.getStaticPart()">
+        <compile files="tjpStaticPart/Test.java,tjpStaticPart/Exceptions.java" options="-Xlint:ignore"/>
+        <run class="tjpStaticPart.Test"/>
+    </ajc-test>
+    
+    <ajc-test dir="bugs" pr="29665"
+      title="Inconsistant stack height with around">
+        <compile files="StackError.java" options="-Xlint:ignore"/>
+        <run class="StackError"/>
+    </ajc-test>
+    
+
+	<ajc-test dir="bugs/messyAround" pr="36056"
+      title="Ajc 1.1 rc1 java.lang.VerifyError with messy arounds">
+        <compile files="aspects/Trace.aj,cap/OptionList.java,DebugTrace.aj">
+            <message kind="warning" line="102"/>
+        	<message kind="warning" line="124"/>
+        	<message kind="warning" line="138"/>
+        </compile>
+        <run class="cap.OptionList"/>
+    </ajc-test>  
+
+    <ajc-test dir="new"
+      title="try/finally in around advice (same as ...messy arounds?)">
+        <compile files="TryFinallyInAround.java"/>
+        <run class="TryFinallyInAround"/>
+    </ajc-test>
+    
+    <ajc-test dir="new" pr="36778"
+      title="advise join points in subclass of empty interface">
+        <compile files="EmptyInterface.java"/>
+        <run class="EmptyInterface"/>
+    </ajc-test>
+    
+    <ajc-test dir="new" pr="36778"
+      title="can't put around advice on interface static initializer"
+      comment="this tests for a nice message given a compiler limitation">
+        <compile files="EmptyInterfaceCE.java" options="-1.4">
+        	<message kind="error" line="20"/>
+        	<message kind="error" line="23"/>
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="bugs" pr="36803"
+      title="cflow concretization causing assertion failure">
+        <compile files="CflowConcrete.java" options="-1.4"/>
+        <run class="CflowConcrete"/>
+    </ajc-test>
+
+    <ajc-test dir="bugs" title="lame error message: negation doesn't allow binding"
+      pr="30663">
+        <compile files="BadBindingError.java">
+            <message kind="error" line="7"/>
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="bugs/interSpecials" pr="36936"
+      title="Error when introducing members of type Class">
+        <compile files="Trg.java,Asp.java"/>
+        <run class="Trg"/>
+    </ajc-test>
+    
+    <ajc-test dir="new"
+      comment="this is a pureJava test, but we always want to run it"
+      title="arrays via Class.forName()">
+        <compile files="ClassForName.java"/>
+        <run class="ClassForName"/>
+    </ajc-test>
+
+   <ajc-test dir="bugs/inlineAround" pr="37152"
+      title="perthis and inline arounds">
+        <compile files="aspect1/Base.java,aspect2/Concrete.java,p1/Main.java">
+        </compile>
+        <run class="p1.Main"/>
+    </ajc-test>
+    
+   <ajc-test dir="bugs" pr="37325"  
+      title="Weaver fails with NPE for very large source files ">
+        <compile files="LongFile.java"/>
+        <run class="LongFile"/>
+    </ajc-test>   
+
+     <ajc-test dir="harness" keywords="command-line-error"
+      title="CLE: no sources">
+        <compile badInput="true">
+            <message kind="error" text="no sources"/>
+            <message kind="abort" text="Usage"/>
+        </compile>
+    </ajc-test>
+ 
+    <ajc-test dir="harness" 
+    	keywords="command-line-error,knownLimitation-ajctaskCompiler,knownLimitation-ajdeCompiler"
+    	comment="ajde omits usage"
+      title="CLE: bad filename">
+        <compile  badInput="true" files="NoSuchFile.java">
+            <message kind="error" text="NoSuchFile.java"/>
+            <message kind="abort" text="Usage"/>
+        </compile>
+    </ajc-test>
+    
+     <ajc-test dir="harness" keywords="command-line-error"
+    	comment="XXX test skipped - harness ignores -sourceroot option"
+      title="CLE: no dir specified for sourceroots">
+        <compile badInput="true" files="ErrorTest.java" 
+        	options="-sourceroots">
+            <message kind="error" text="no sources specified"/>
+            <message kind="error" text="bad sourceroot"/>
+            <message kind="abort" text="Usage"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="harness" keywords="command-line-error,knownLimitation-ajdeCompiler"
+    	comment="ajde has same errors, different wording"
+      title="CLE: no sourceroot specified for incremental">
+        <compile badInput="true" options="-incremental">
+            <message kind="error" text="no sources specified"/>
+            <message kind="error" text="specify a source root"/>
+            <message kind="abort" text="Usage"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="harness" keywords="command-line-error,knownLimitation-ajdeCompiler"
+    	comment="ajde has same errors, different wording"
+      title="CLE: file specified with incremental">
+        <compile badInput="true" files="ErrorTest.java"
+        	options="-incremental">
+            <message kind="error" text="incremental mode only handles source files using -sourceroots"/>
+            <message kind="error" text="no sources specified"/>
+            <message kind="error" text="specify a source root"/>
+            <message kind="abort" text="Usage"/>
+        </compile>
+    </ajc-test>
+    
+  
+    <ajc-test dir="bugs" pr="37304"
+   	 title="public static fields being ignored">
+        <compile files="FinalFields.java"/>
+        <run class="FinalFields"/>
+    </ajc-test>
+ 
+      
+    <!-- This doesn't actually reproduce the bug, but no test case has been submitted
+         that does so this is here as a place-holder and to verify that we're mostly
+         working.
+    -->
+    <ajc-test dir="bugs/accessMethods" pr="38212"
+   	 title="can not resolve this member warning">
+        <compile files="p1/Base.java,p2/Derived.java"/>
+        <run class="p2.Derived"/>
+    </ajc-test>
+    
+    <ajc-test dir="bugs" pr="38345"
+   	 title="try switch VerifyError, InconsistentStackHeight">
+        <compile files="TrySwitch.java"/>
+        <run class="TrySwitch"/>
+    </ajc-test>
+    
+    <ajc-test dir="bugs" pr="39458"
+   	 title="Compiler crash in ajc 1.1 - terrible error for inaccessible constructor">
+        <compile files="NewVoid.java">
+            <message kind="error" line="17"/>        
+            <message kind="error" line="20"/>        
+            <message kind="error" line="21"/>
+                  
+            <message kind="error" line="28"/>        
+            <message kind="warning" line="29"/>        
+            <message kind="warning" line="30"/>            
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="bugs" pr="39458"
+   	 title="Compiler crash in ajc 1.1 - terrible error for inaccessible constructor - 1.7">
+        <compile files="NewVoid.java">
+            <message kind="error" line="17"/>        
+            <message kind="error" line="20"/>        
+            <message kind="error" line="21"/>
+                  
+            <message kind="error" line="28"/>        
+            <message kind="warning" line="29"/>        
+            <message kind="error" line="30"/>            
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="bugs" pr="39460"
+   	 title="Missing import crashes compiler">
+        <compile files="MissingImport.java">      
+            <message kind="error" line="13" text="InvocationTargetException cannot be resolved to a type"/> 
+<!-- this error has 'gone' in e37 upgrade            <message kind="error" line="14" text="e cannot be resolved"/> -->
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="bugs" pr="39479"
+   	 title="NPE in bcel.LazyMethodGen when delegating from one ctor to a second that includes a switch">
+        <compile files="NewSwitch.java"/>
+        <run class="NewSwitch"/>
+    </ajc-test>
+
+    <ajc-test dir="bugs" pr="40109"
+   	 title="switch statement in aspects crashes weaving">
+        <compile files="SwitchInAround.java"/>
+        <run class="SwitchInAround"/>
+    </ajc-test>
+    
+    <ajc-test dir="bugs" pr="39993"
+   	 title="ajc stack trace on declaring hashcode() method in aspect">
+        <compile files="OverridingInterfaceObjectMethod.java"/>
+        <run class="OverridingInterfaceObjectMethod"/>
+    </ajc-test>
+
+    <ajc-test dir="bugs"
+   	 title="using super in method introduced on interface with multiple supertypes">
+        <compile files="MultipleSuperCf.java">
+        	<message kind="error" line="14"/>
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="bugs/cflowAndJar" pr="39462"
+   	 title="Compiler crashes in jar and cflow (with no .jar)">
+        <compile files="TestAspect.aj,Test.java,AbstractAspect.aj">
+        	<message kind="warning" line="16"/>
+        </compile>
+        <run class="Test"/>
+    </ajc-test>
+
+    <ajc-test dir="bugs/cflowAndJar" pr="39462"
+   	 title="Compiler crashes in jar and cflow (with .jar)"
+   	 comment="make lib.jar with ajc -outjar lib.jar AbstractAspect.aj">
+        <compile files="TestAspect.aj,Test.java" aspectpath="lib.jar">
+        	<message kind="warning" line="16"/>
+        </compile>
+        <run class="Test"/>
+    </ajc-test>
+    
+    <ajc-test dir="bugs" pr="40589"
+   	 title="Default method impl for interface causes internal exception.">
+        <compile files="CloneMethod.java"/>
+        <run class="CloneMethod"/>
+    </ajc-test>
+    
+	<ajc-test dir="errors"
+		title="compile error expected for abstract pointcut outside abstract aspect">
+		<compile files="AbstractPointcutCE.java">
+			<message kind="error" line="4" text="The type C must be an abstract class to define abstract methods"/>
+			<message kind="error" line="5"/>
+			<message kind="error" line="10"/>
+		</compile>
+	</ajc-test>
+	
+	<ajc-test dir="bugs"
+		pr="40876"
+		title="subtype-qualified pointcut reference">
+		<compile files="PointcutLibraryTest.java"/>
+		<run class="PointcutLibraryTest"/>
+	</ajc-test>
+	
+	<ajc-test dir="bugs"
+		pr="40858"
+		comment="super is not permitted in pointcuts in 1.1"
+		title="weaver trace on mis-qualified pointcut reference">
+		<compile files="SuperPointcutCE.java">
+			<message kind="error" line="23"/>
+			<message kind="error" line="26"/>
+		</compile>
+	</ajc-test>
+
+	<ajc-test dir="bugs"
+		pr="40814"
+		title="compile error expected for interface pointcuts">
+		<compile files="AbstractPointcutCE.java">
+			<message kind="error" line="14" text="The type Concrete must be an abstract class to define abstract methods"/>
+			<message kind="error" line="7"/>
+			<message kind="error" line="11"/>		
+			<message kind="error" line="15"/>
+		</compile>
+	</ajc-test>
+
+	<ajc-test dir="bugs"
+		pr="40805" 
+		title="interface call signatures when declaring method in aspect">
+		<compile files="DeclareWarningAndInterfaceMethodCW.java">
+			<message kind="warning" line="27" text="call getSomething"/>
+			<message kind="warning" line="27" text="call ICanGetSomething.getSomething"/>
+			<message kind="warning" line="31" text="call getSomething"/>
+			<message kind="warning" line="31" text="call ICanGetSomething.getSomething"/>
+			<message kind="warning" line="33" text="call getSomething"/>
+			<message kind="warning" line="33" text="call ICanGetSomething.getSomething"/>
+			<message kind="warning" line="35" text="call getSomething"/>
+			<message kind="warning" line="35" text="call ICanGetSomething.getSomething"/>
+			<message kind="warning" line="38" text="call getSomething"/>
+			<message kind="warning" line="38" text="call ICanGetSomething.getSomething"/>
+		</compile>
+	</ajc-test>
+ 
+ 	<ajc-test dir="bugs"
+		pr="41175"
+		title="reflective check of declared exceptions from aspect-declared methods">
+		<compile files="DeclaredExceptions.java"/>
+		<run class="DeclaredExceptions"/>
+	</ajc-test>
+
+	<ajc-test dir="bugs/throwsSignature"
+		pr="42539"
+		title="throw derivative pointcuts not advised">
+		<compile files="ExceptionBugTest.java,ExceptionAspect.java">
+		    <message line="5" kind="warning" text="throws both"/>
+		    <message line="5" kind="error" text="throws Exception"/>
+		    <message line="7" kind="warning" text="throws both"/>
+		</compile>
+	</ajc-test>
+	
+    <ajc-test dir="bugs" pr="42652"
+   	 title="perthis and signature bad interaction">
+        <compile files="InterPerCall.java" options="-1.4"/>
+        <run class="InterPerCall"/>
+    </ajc-test>
+    
+	<ajc-test dir="bugs/declareBinding"
+		pr="42740"
+		title="declare error fails on pointcuts composed from multiple classes">
+		<compile files="SampleExceptionHandling1.java">
+		    <message line="2" kind="error" text="no checked exceptions"/>
+		</compile>
+	</ajc-test>
+
+	<ajc-test dir="bugs/declareSoftWithin"
+		pr="42740"
+		title="declare error fails on pointcuts composed from multiple classes">
+		<compile files="aspects/Softener.aj,test/NoSoftener.java"/>
+		<run class="test.NoSoftener"/>
+	</ajc-test>
+	
+    <ajc-test dir="bugs" pr="42993"
+   	    title="Interaction between pointcut binding and declare parents">
+        <compile files="ParentsAndPointcuts.java"/>
+        <run class="ParentsAndPointcuts"/>
+    </ajc-test>
+    
+    <ajc-test dir="bugs" pr="43194"
+   	 title="Non-functional concretezation of ReferencePointcut">
+        <compile files="AdviceInteraction.java"/>
+        <run class="AdviceInteraction"/>
+    </ajc-test>
+
+	<ajc-test dir="bugs/extdirs" 
+		pr="42574"
+		title="zip and jar suffixes for extdirs entries">
+		<compile files="extdirs-src/main/Main.java"
+			extdirs="lib/lowercase"/>
+	</ajc-test>
+ 
 
 </suite>
\ No newline at end of file
diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc120/ajc120-tests.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc120/ajc120-tests.xml
deleted file mode 100644
index 4b51a98dd..000000000
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc120/ajc120-tests.xml
+++ /dev/null
@@ -1,482 +0,0 @@
-<!-- AspectJ v1.2.0 Tests -->
-
-  	<ajc-test dir="bugs/concretizeNpe" pr="43033"
-		title="NPE in concretization error path"
-		keywords="poorErrorMessages">
-		<compile files="base/ExceptionHandling.java,model/ModelExceptionHandling.java">
-		<!--
-		  <message line="5" kind="error" text="pointcut base.ExceptionHandling.scope() is abstract"/>
-		  <message line="4" kind="error" text="inherited abstract pointcut base.ExceptionHandling.scope() is not made concrete"/>
-		  <message line="8" kind="error" text="inherited abstract pointcut base.ExceptionHandling.scope() is not made concrete"/>
-		  <message line="12" kind="error" />
-		  <message line="13" kind="error" />
-		-->
-		  <message line="12" kind="error" />		
-		  <message line="13" kind="error" />
-		</compile>
-	</ajc-test>
-
-	<ajc-test dir="bugs/privilege/packageProtected" pr="42711" 
-            title="priviledged aspects calling methods from advice"> 
-        <compile files="concern/ContextUser.java,concern/BaseTarget.java,core/Base.java" /> 
-    </ajc-test> 
-
-    <ajc-test dir="bugs" pr="49457"
-   	 title="No error on overloaded pointcuts in class">
-        <compile files="OverloadedPointcutsInClass.java">
-        	<message kind="error" line="3" text="duplicate pointcut name: pc1"/>
-        	<message kind="error" line="4" text="duplicate pointcut name: pc1"/>
-        	<message kind="error" line="6" text="duplicate pointcut name: pc2"/>
-        	<message kind="error" line="7" text="duplicate pointcut name: pc2"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="49457"
-   	 title="No error on overloaded pointcuts unless binding variables">
-        <compile files="OverloadedPointcutsInAspect.java">
-        	<message kind="error" line="15" text="duplicate pointcut name: pc"/>
-        	<message kind="error" line="16" text="duplicate pointcut name: pc"/>
-        	<message kind="error" line="18" text="incompatible type"/>
-        	<message kind="error" line="20" text="incompatible type"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs" pr="48522"
-      title="Declare soft softening other exception types">
-        <compile files="SofteningTooMuch.java">
- 	        <message kind="error" line="6" text="Unhandled exception"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="47754"
-      title="static method introduction on interfaces, should not be allowed">
-        <compile files="StaticInterfaceMethods.java">
-		  <message kind="error" line="7" text="methods in interfaces cannot be declared static"/>
-        </compile>
-    </ajc-test>
-
-	<ajc-test dir="bugs" pr="45184"
-      title="External pointcut refs not resolved if named pointcut used by declare">
-        <compile files="DeclareErrorNamedPointcutCE.java">
- 	        <message kind="error" line="10" text="ref"/>
-        </compile>
-    </ajc-test>
-
-	<ajc-test dir="bugs"
-		title="Appropriate message for 'after() thowing(Throwable th)' syntax error"
-		pr="49638"
-		>
-		<compile 
-			files="AfterThrowingAdviceSyntaxError.java" >
-			<message kind="error" line="21" />
-			<message kind="error" line="23" />
-		</compile>
-	</ajc-test>
-
-   <ajc-test dir="bugs/faultingInSource" pr="46671"
-      title="Ensure we don't look for source on the classpath when binary not found">
-        <compile files="SimpleTracing.java" classpath="." options="-verbose -1.4">
-		  <message kind="warning" line="4" text="no match for this type name: SampleClass"/>
-        </compile>
-    </ajc-test>   
-    
-   	<ajc-test dir="bugs" pr="46750" title="inner aspect containing declare soft">
-       <compile files="TestSoftening.java">
-       </compile>
-    </ajc-test>
-    
-     <ajc-test dir="bugs" pr="45663"
-      title="Bad parser error recovery in advice">
-        <compile files="ParserRecoveryTest.java">
-		  <message kind="error" line="7"/>
-        </compile>
-    </ajc-test>   
-    
-	<ajc-test dir="bugs" pr="45663"
-      title="Bad parser error recovery in java source">
-        <compile files="ParserRecoveryTestPureJava.java">
-		  <message kind="error" line="6"/>
-		  <message kind="error" line="8"/>
-        </compile>
-    </ajc-test>     
-    
-    <ajc-test dir="bugs" 
-		pr="46280"
-		title="compiler issues error on inner aspects when privilieged">
-        <compile files="PrivilegedParsing.java"/>
-        <run class="PrivilegedParsing"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs" pr="44586"
-      title="After throwing advice on ctors doesn't execute for inter-type decl field inits">
-        <compile files="AfterThrowingCtor.java" options="-Xlint:ignore">
-        </compile>
-  		<run class="AfterThrowingCtor"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs/abstractMethods" pr="49784"
-   	 title="Introduced abstract method on abstract class not implemented by subtype (single source file)">
-        <compile files="singlesource/C.java">
-        	<message kind="error" line="9"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs/abstractMethods" pr="49784"
-   	 title="Introduced abstract method on abstract class with introduced concrete method (single source file)">
-        <compile files="singlesource/C1.java"/>
-        <run class="C1"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs/abstractMethods" pr="49784"
-   	 title="Introduced abstract method on abstract class with existing concrete method (single source file)">
-        <compile files="singlesource/C2.java"/>
-        <run class="C2"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs/interAbstract" 
-		pr="49784"
-		title="aspect declares interface method (no modifiers)">
-        <compile files="InterfaceMethodDeclarationNone.java" >
-        	<message kind="error" line="32" text="requires a body" />
-        </compile>
-    </ajc-test>
-	
-	<ajc-test dir="bugs/interAbstract" 
-		pr="49784"
-		title="aspect declares interface method (abstract)">
-        <compile files="InterfaceMethodDeclarationAbstract.java">
-        	<message kind="error" line="40" text="abstract intertype method declaration 'int I.getInt()' on interface I must be declared public (compiler limitation)" />
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs/interAbstract" 
-		pr="49784"
-		comment="working in 1.1.1 - keep with others?"
-		title="aspect declares interface method (public abstract)">
-        <compile files="InterfaceMethodDeclarationFull.java" />
-        <run class="InterfaceMethodDeclarationFull"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs/interfaceDefinition" 
-    	pr="43972"
-    	title="Use class implementing interface via aspect (not woven together)">
-        <compile 
-        	files="pack/DefineInterface.java,
-        		   pack/InterfaceDefinition.java,
-        		   pack/MyInterface.java" options="-XnotReweavable"/>
-        <run class="pack.InterfaceDefinition"/>
-        <compile 
-        	includeClassesDir="true"
-        	files="Main.java">
-        	<message kind="error" line="3"/>
-       </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs/interfaceDefinition" 
-    	pr="43972"
-    	title="Use class implementing interface via aspect (weave all together)">
-        <compile 
-        	files="pack/DefineInterface.java,
-        		   pack/InterfaceDefinition.java,
-        		   pack/MyInterface.java,
-        		   Main.java"/>
-        <run class="pack.InterfaceDefinition"/>
-        <run class="Main"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs/interfaceDefinition" 
-    	pr="43972"
-    	title="Use class implementing interface via aspect (only one implementer)">
-        <compile 
-        	files="pack/DefineInterface.java,
-        		   pack/InterfaceDefinition.java,
-        		   pack/MyInterface.java"/>
-        <run class="pack.InterfaceDefinition"/>
-        <compile 
-        	includeClassesDir="true"
-        	files="Main1.java"/>
-        <run class="Main1"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs" pr="44587"
-      title="Erroneous exception conversion">
-        <compile files="ErroneousExceptionConversion.java">
-        </compile>
-        <run class="ErroneousExceptionConversion"/>
-    </ajc-test>
-    
-  <ajc-test dir="bugs" pr="34206"
-      title="before():execution(new(..)) does not throw NoAspectBoundException">
-        <compile files="ErroneousExceptionConversion1.java" options="-Xlint:ignore">
-        </compile>
-        <run class="ErroneousExceptionConversion1"/>
-    </ajc-test>
-
-	<ajc-test dir="bugs" pr="38824"
-	      title="Anomalous handling of inter-type declarations to abstract base classes in aspectj 1.1">
-	        <compile files="AbstractBaseAndInterTypeInterface.java">
-	        </compile>
-	</ajc-test>
-
-  <ajc-test dir="bugs/caseSensitivity" pr="42515"
-      title="NPE When compiling intertype declaration">
-        <compile files="uniqueId/Numbered.java,uniqueId/Bug.aj">
-		  <message kind="error" line="4"/>
-        </compile>
-  </ajc-test>   
-        
-    <ajc-test dir="bugs" 
-		pr="49295"
-		title="declare warning on subtype constructor">
-        <compile files="SubtypeConstructorCW.java" >
-			<message kind="warning" line="5" text="String as first"/>
-			<message kind="warning" line="10" text="String as first"/>
-        </compile>
-        <run class="SubtypeConstructorCW"/>
-    </ajc-test>
-        
-    <ajc-test dir="bugs" pr="50570"
-      title="CatchClauseSignature has broken operation">
-        <compile files="HandlerSig.java"/>
-        <run class="HandlerSig"/>
-    </ajc-test>
-    
-
-    <ajc-test dir="new" pr="42668"
-   	 title="after returning with parameter: matching rules">
-        <compile files="AfterReturningParamMatching.java" options="-1.4"/>
-        <run class="AfterReturningParamMatching"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs/binaryCompat" pr="50641"
-      title="binary compatibility of advice method names - expect no error">
-        <compile files="Main.java,TraceV1.aj" options="-1.4"/>
-        <run class="Main"/>
-        <compile files="TraceV2.aj" options="-1.4"/>
-        <run class="Main"/>
-    </ajc-test>
-   
-    <ajc-test dir="bugs/binaryCompat" pr="50641"
-      title="binary compatibility of advice method names - expect error">
-        <compile files="Main.java,TraceV1.aj" options="-1.4"/>
-        <run class="Main"/>
-        <compile files="TraceRE.aj" options="-1.4"/>
-        <run class="Main"/>
-    </ajc-test>
-    
-     <ajc-test dir="bugs/binaryCompat" pr="50641"
-      title="binary compatibility of advice method names - expect no error">
-        <compile files="Main.java,TraceWithInnerV1.aj" options="-1.4"/>
-        <run class="Main"/>
-        <compile files="TraceWithInnerV2.aj" options="-1.4"/>
-        <run class="Main"/>
-    </ajc-test>
-    
-	<ajc-test dir="bugs/protectedvf"
-		title="mail list VerifyError with protected access">
-		<compile files="main/Driver.java,main/p2/AbstractTest.aj,main/p1/ConcreteTest.aj"/>
-		<run class="main.Driver"/>
-	</ajc-test>
-	
-	<ajc-test dir="bugs" pr="51919"
-   	 title="Polymorphic ITD fails in CVS HEAD (From ajdt 1.1.6)">
-        <compile files="OverloadedITDNPE.java" />
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="51320"
-   	 title="ClasscastException on concretization of if(false)">
-        <compile files="DecwClassCastException.java">
-        
-         <!-- These are the illegal PCDs against a deow -->
-         <message kind="error" line="27" text="if() pointcut designator cannot be used"/>
-         <message kind="error" line="29" text="if() pointcut designator cannot be used"/>
-         
-         <message kind="error" line="31" text="cflow() pointcut designator cannot be used"/>
-         <message kind="error" line="33" text="cflow() pointcut designator cannot be used"/>
-         
-         <message kind="error" line="35" text="cflowbelow() pointcut designator cannot be used"/>
-         <message kind="error" line="37" text="cflowbelow() pointcut designator cannot be used"/>
-         
-         <message kind="error" line="39" text="this() pointcut designator cannot be used"/>
-         <message kind="error" line="41" text="this() pointcut designator cannot be used"/>
-         
-         <message kind="error" line="43" text="target() pointcut designator cannot be used"/>
-         <message kind="error" line="45" text="target() pointcut designator cannot be used"/>
-         
-         <message kind="error" line="47" text="args() pointcut designator cannot be used"/>
-         <message kind="error" line="49" text="args() pointcut designator cannot be used"/>
-         
-        </compile>
-    </ajc-test>
-	
-	 <ajc-test dir="bugs" pr="51320"
-   	 	title="ClasscastException on concretization of if(false)">
-        <compile files="DeclareSoftDynamicPCDs.java">
-        
-         <!-- These are the illegal PCDs against a deow -->
-         <message kind="error" line="27" text="if() pointcut designator cannot be used"/>
-         <message kind="error" line="29" text="if() pointcut designator cannot be used"/>
-         
-         <message kind="error" line="31" text="cflow() pointcut designator cannot be used"/>
-         <message kind="error" line="33" text="cflow() pointcut designator cannot be used"/>
-         
-         <message kind="error" line="35" text="cflowbelow() pointcut designator cannot be used"/>
-         <message kind="error" line="37" text="cflowbelow() pointcut designator cannot be used"/>
-         
-         <message kind="error" line="39" text="this() pointcut designator cannot be used"/>
-         <message kind="error" line="41" text="this() pointcut designator cannot be used"/>
-         
-         <message kind="error" line="43" text="target() pointcut designator cannot be used"/>
-         <message kind="error" line="45" text="target() pointcut designator cannot be used"/>
-         
-         <message kind="error" line="47" text="args() pointcut designator cannot be used"/>
-         <message kind="error" line="49" text="args() pointcut designator cannot be used"/>
-         
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs/abstractMethods" pr="49784"
-   	 title="Introduced abstract method on interface not implemented by subtype (weave altogether)">
-        <compile files="interface/C.java,interface/A.java,interface/B.java" />
-        <run class="C"/>
-    </ajc-test>
- 
-    
-   	<ajc-test dir="bugs/fieldsOnInterfaces"
-		pr="52107"
-		title="declare String field on interface">
-		<compile files="StringFieldOnInterface.java">
-			<message kind="warning" line="16" text="this affected type is not exposed"/>
-         	<message kind="warning" line="17" text="this affected type is not exposed"/>
-		</compile>	   
-	</ajc-test>
-
-	<ajc-test dir="bugs/fieldsOnInterfaces"
-		pr="52107"
-		title="declare int field on interface">
-		<compile files="IntFieldOnInterface.java">
-		<message kind="warning" line="27" text="this affected type is not exposed"/>
-         	<message kind="warning" line="28" text="this affected type is not exposed"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/fieldsOnInterfaces"
-		pr="52107"
-		title="declare Object field on interface">
-		<compile files="ObjectFieldOnInterface.java">
-			<message kind="warning" line="20" text="this affected type is not exposed"/>
-         	<message kind="warning" line="21" text="this affected type is not exposed"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs" pr="50776"
-   	 title="fail in compiling aspect with overriding method introduction with different throws clause ">
-        <compile files="IntertypeDifferentThrows.java" />
-    </ajc-test>
-    
-	<ajc-test dir="new" 
-		comment="in ajc 1.1.1, VerifyError Illegal use of nonvirtual function call"
-		title="super call in anonymous class created in around advice">
-        <compile files="SuperClosure.java" />
-        <run class="SuperClosure" />
-    </ajc-test>
-
-      <ajc-test dir="bugs" pr="44272"
-    		title="retitle warning to circular {advice} dependency at ...">
-        <compile files="CircularAdvicePrecedence.java" options="-1.4">
-            <message kind="error" line="4"/> 
-            <message kind="error" line="5"/> 
-            <message kind="error" line="6"/> 
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs"  pr="51322"
-    	title="Introduce Unknown Type to class causes Null pointer exception"  >
-        <compile files="Pr51322.java"> 
-        	<message kind="error" line="5"/>
-        </compile>
-    </ajc-test>
-	
-    <ajc-test dir="bugs"
-		title="Private members introduced via an interface are visible to the class"
-		pr="52928">
-		<compile
-			files="VisiblePrivateInterfaceITDs.java" >
-            <message kind="error" line="13"/>
-		</compile>
-	</ajc-test>
-	
-    <ajc-test dir="bugs/declarePrecedenceWithClasses" pr="53012"
-   	 title="declare precedence on a class should be a compile-time error">
-        <compile files="DeclarePrecedenceTestClass.java" >
-          <message kind="error" line="10" text="Non-aspect types can only be specified"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs/declarePrecedenceWithClasses" pr="53012"
-   	 title="declare precedence on a class should be a compile-time error">
-        <compile files="Priority.aj" />
-    </ajc-test>
-	
-    <ajc-test dir="bugs"
-    	pr="59440"
-		title="NPE when binary weaving a ctor ITD">
-        <compile files="CtorITD.aj">
-        	<message kind="error" line="2"/>
-        </compile>
-    </ajc-test>
-
-	<ajc-test dir="bugs"
-    	pr="59397"
-		title="NPE in compiler when using (an unusual) declare warning against a ctor ITD">
-        <compile files="DecwInitializationITD.java">
-        </compile>
-    </ajc-test>
-	
-   <ajc-test dir="bugs/compileOrdering" 
-		pr="59778"
-		title="InterTypeMethodDeclaration.java:104">
-        <compile files="B.java,D.java" >
-          <message kind="error" line="2" file="B.java"/>
-        </compile>
-        <compile files="D.java,B.java">
-          <message kind="error" line="2" file="B.java"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" 
-		pr="61538" title="nested uses of this() inside constructors not handled properly for initialization and preinitialization pointcuts">
-        <compile files="ConstructorMain.java"/>
-        <run class="ConstructorMain"/>
-    </ajc-test> 
-    
-    <ajc-test dir="bugs"
-		pr="61568" title="wrong variable binding in || pointcuts">
-        <compile files="DisjunctVarBinding.java">
-          <message kind="error" line="17" text="ambiguous binding of parameter(s) a, b across '||' in pointcut"/>
-        </compile>
-    </ajc-test>
- 
- 	<ajc-test dir="bugs" 
-		pr="60936" title="error message for constructor-execution pcd">
-        <compile files="InterfaceConstructor.java" options="-1.4">
-          <message kind="warning" line="10" text="no interface constructor-execution join point"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs"  pr="43714"
-    	title="weaving using an empty jar in -injars"  >
-        <compile files="notAJar.jar" outjar="outJar.jar"> 
-        	<message kind="warning" text="build config error: skipping missing, empty or corrupt inpath entry"/>
-        	<message kind="error" text="no sources specified"/>
-        	<message kind="fail"/>
-        </compile>
-    </ajc-test>
-	
-	 <ajc-test dir="bugs"  pr="43714"
-    	title="weaving using an empty jar in -aspectpath"  >
-        <compile files="WeaveLocal.java" aspectpath="notAJar.jar" outjar="outJar.jar" >         	
-        	<message kind="warning" text="build config error: skipping missing, empty or corrupt aspectpath entry"/>
-        </compile>
-    </ajc-test>
-    
\ No newline at end of file
diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc120/ajc120.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc120/ajc120.xml
index dade07154..19d991e1e 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc120/ajc120.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/ajc120/ajc120.xml
@@ -1,11 +1,487 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[
-<!ENTITY tests SYSTEM "../tests/src/org/aspectj/systemtest/ajc120/ajc120-tests.xml">
-]>
+<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
 
 <!-- AspectJ v1.2.0 Tests -->
 
 <suite>
 
-&tests;
+  	<ajc-test dir="bugs/concretizeNpe" pr="43033"
+		title="NPE in concretization error path"
+		keywords="poorErrorMessages">
+		<compile files="base/ExceptionHandling.java,model/ModelExceptionHandling.java">
+		<!--
+		  <message line="5" kind="error" text="pointcut base.ExceptionHandling.scope() is abstract"/>
+		  <message line="4" kind="error" text="inherited abstract pointcut base.ExceptionHandling.scope() is not made concrete"/>
+		  <message line="8" kind="error" text="inherited abstract pointcut base.ExceptionHandling.scope() is not made concrete"/>
+		  <message line="12" kind="error" />
+		  <message line="13" kind="error" />
+		-->
+		  <message line="12" kind="error" />		
+		  <message line="13" kind="error" />
+		</compile>
+	</ajc-test>
+
+	<ajc-test dir="bugs/privilege/packageProtected" pr="42711" 
+            title="priviledged aspects calling methods from advice"> 
+        <compile files="concern/ContextUser.java,concern/BaseTarget.java,core/Base.java" /> 
+    </ajc-test> 
+
+    <ajc-test dir="bugs" pr="49457"
+   	 title="No error on overloaded pointcuts in class">
+        <compile files="OverloadedPointcutsInClass.java">
+        	<message kind="error" line="3" text="duplicate pointcut name: pc1"/>
+        	<message kind="error" line="4" text="duplicate pointcut name: pc1"/>
+        	<message kind="error" line="6" text="duplicate pointcut name: pc2"/>
+        	<message kind="error" line="7" text="duplicate pointcut name: pc2"/>
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="bugs" pr="49457"
+   	 title="No error on overloaded pointcuts unless binding variables">
+        <compile files="OverloadedPointcutsInAspect.java">
+        	<message kind="error" line="15" text="duplicate pointcut name: pc"/>
+        	<message kind="error" line="16" text="duplicate pointcut name: pc"/>
+        	<message kind="error" line="18" text="incompatible type"/>
+        	<message kind="error" line="20" text="incompatible type"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="bugs" pr="48522"
+      title="Declare soft softening other exception types">
+        <compile files="SofteningTooMuch.java">
+ 	        <message kind="error" line="6" text="Unhandled exception"/>
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="bugs" pr="47754"
+      title="static method introduction on interfaces, should not be allowed">
+        <compile files="StaticInterfaceMethods.java">
+		  <message kind="error" line="7" text="methods in interfaces cannot be declared static"/>
+        </compile>
+    </ajc-test>
+
+	<ajc-test dir="bugs" pr="45184"
+      title="External pointcut refs not resolved if named pointcut used by declare">
+        <compile files="DeclareErrorNamedPointcutCE.java">
+ 	        <message kind="error" line="10" text="ref"/>
+        </compile>
+    </ajc-test>
+
+	<ajc-test dir="bugs"
+		title="Appropriate message for 'after() thowing(Throwable th)' syntax error"
+		pr="49638"
+		>
+		<compile 
+			files="AfterThrowingAdviceSyntaxError.java" >
+			<message kind="error" line="21" />
+			<message kind="error" line="23" />
+		</compile>
+	</ajc-test>
+
+   <ajc-test dir="bugs/faultingInSource" pr="46671"
+      title="Ensure we don't look for source on the classpath when binary not found">
+        <compile files="SimpleTracing.java" classpath="." options="-verbose -1.4">
+		  <message kind="warning" line="4" text="no match for this type name: SampleClass"/>
+        </compile>
+    </ajc-test>   
+    
+   	<ajc-test dir="bugs" pr="46750" title="inner aspect containing declare soft">
+       <compile files="TestSoftening.java">
+       </compile>
+    </ajc-test>
+    
+     <ajc-test dir="bugs" pr="45663"
+      title="Bad parser error recovery in advice">
+        <compile files="ParserRecoveryTest.java">
+		  <message kind="error" line="7"/>
+        </compile>
+    </ajc-test>   
+    
+	<ajc-test dir="bugs" pr="45663"
+      title="Bad parser error recovery in java source">
+        <compile files="ParserRecoveryTestPureJava.java">
+		  <message kind="error" line="6"/>
+		  <message kind="error" line="8"/>
+        </compile>
+    </ajc-test>     
+    
+    <ajc-test dir="bugs" 
+		pr="46280"
+		title="compiler issues error on inner aspects when privilieged">
+        <compile files="PrivilegedParsing.java"/>
+        <run class="PrivilegedParsing"/>
+    </ajc-test>
+
+    <ajc-test dir="bugs" pr="44586"
+      title="After throwing advice on ctors doesn't execute for inter-type decl field inits">
+        <compile files="AfterThrowingCtor.java" options="-Xlint:ignore">
+        </compile>
+  		<run class="AfterThrowingCtor"/>
+    </ajc-test>
+    
+    <ajc-test dir="bugs/abstractMethods" pr="49784"
+   	 title="Introduced abstract method on abstract class not implemented by subtype (single source file)">
+        <compile files="singlesource/C.java">
+        	<message kind="error" line="9"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="bugs/abstractMethods" pr="49784"
+   	 title="Introduced abstract method on abstract class with introduced concrete method (single source file)">
+        <compile files="singlesource/C1.java"/>
+        <run class="C1"/>
+    </ajc-test>
+
+    <ajc-test dir="bugs/abstractMethods" pr="49784"
+   	 title="Introduced abstract method on abstract class with existing concrete method (single source file)">
+        <compile files="singlesource/C2.java"/>
+        <run class="C2"/>
+    </ajc-test>
+
+    <ajc-test dir="bugs/interAbstract" 
+		pr="49784"
+		title="aspect declares interface method (no modifiers)">
+        <compile files="InterfaceMethodDeclarationNone.java" >
+        	<message kind="error" line="32" text="requires a body" />
+        </compile>
+    </ajc-test>
+	
+	<ajc-test dir="bugs/interAbstract" 
+		pr="49784"
+		title="aspect declares interface method (abstract)">
+        <compile files="InterfaceMethodDeclarationAbstract.java">
+        	<message kind="error" line="40" text="abstract intertype method declaration 'int I.getInt()' on interface I must be declared public (compiler limitation)" />
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="bugs/interAbstract" 
+		pr="49784"
+		comment="working in 1.1.1 - keep with others?"
+		title="aspect declares interface method (public abstract)">
+        <compile files="InterfaceMethodDeclarationFull.java" />
+        <run class="InterfaceMethodDeclarationFull"/>
+    </ajc-test>
+
+    <ajc-test dir="bugs/interfaceDefinition" 
+    	pr="43972"
+    	title="Use class implementing interface via aspect (not woven together)">
+        <compile 
+        	files="pack/DefineInterface.java,
+        		   pack/InterfaceDefinition.java,
+        		   pack/MyInterface.java" options="-XnotReweavable"/>
+        <run class="pack.InterfaceDefinition"/>
+        <compile 
+        	includeClassesDir="true"
+        	files="Main.java">
+        	<message kind="error" line="3"/>
+       </compile>
+    </ajc-test>
+    
+    <ajc-test dir="bugs/interfaceDefinition" 
+    	pr="43972"
+    	title="Use class implementing interface via aspect (weave all together)">
+        <compile 
+        	files="pack/DefineInterface.java,
+        		   pack/InterfaceDefinition.java,
+        		   pack/MyInterface.java,
+        		   Main.java"/>
+        <run class="pack.InterfaceDefinition"/>
+        <run class="Main"/>
+    </ajc-test>
+    
+    <ajc-test dir="bugs/interfaceDefinition" 
+    	pr="43972"
+    	title="Use class implementing interface via aspect (only one implementer)">
+        <compile 
+        	files="pack/DefineInterface.java,
+        		   pack/InterfaceDefinition.java,
+        		   pack/MyInterface.java"/>
+        <run class="pack.InterfaceDefinition"/>
+        <compile 
+        	includeClassesDir="true"
+        	files="Main1.java"/>
+        <run class="Main1"/>
+    </ajc-test>
+
+    <ajc-test dir="bugs" pr="44587"
+      title="Erroneous exception conversion">
+        <compile files="ErroneousExceptionConversion.java">
+        </compile>
+        <run class="ErroneousExceptionConversion"/>
+    </ajc-test>
+    
+  <ajc-test dir="bugs" pr="34206"
+      title="before():execution(new(..)) does not throw NoAspectBoundException">
+        <compile files="ErroneousExceptionConversion1.java" options="-Xlint:ignore">
+        </compile>
+        <run class="ErroneousExceptionConversion1"/>
+    </ajc-test>
+
+	<ajc-test dir="bugs" pr="38824"
+	      title="Anomalous handling of inter-type declarations to abstract base classes in aspectj 1.1">
+	        <compile files="AbstractBaseAndInterTypeInterface.java">
+	        </compile>
+	</ajc-test>
+
+  <ajc-test dir="bugs/caseSensitivity" pr="42515"
+      title="NPE When compiling intertype declaration">
+        <compile files="uniqueId/Numbered.java,uniqueId/Bug.aj">
+		  <message kind="error" line="4"/>
+        </compile>
+  </ajc-test>   
+        
+    <ajc-test dir="bugs" 
+		pr="49295"
+		title="declare warning on subtype constructor">
+        <compile files="SubtypeConstructorCW.java" >
+			<message kind="warning" line="5" text="String as first"/>
+			<message kind="warning" line="10" text="String as first"/>
+        </compile>
+        <run class="SubtypeConstructorCW"/>
+    </ajc-test>
+        
+    <ajc-test dir="bugs" pr="50570"
+      title="CatchClauseSignature has broken operation">
+        <compile files="HandlerSig.java"/>
+        <run class="HandlerSig"/>
+    </ajc-test>
+    
+
+    <ajc-test dir="new" pr="42668"
+   	 title="after returning with parameter: matching rules">
+        <compile files="AfterReturningParamMatching.java" options="-1.4"/>
+        <run class="AfterReturningParamMatching"/>
+    </ajc-test>
+    
+    <ajc-test dir="bugs/binaryCompat" pr="50641"
+      title="binary compatibility of advice method names - expect no error">
+        <compile files="Main.java,TraceV1.aj" options="-1.4"/>
+        <run class="Main"/>
+        <compile files="TraceV2.aj" options="-1.4"/>
+        <run class="Main"/>
+    </ajc-test>
+   
+    <ajc-test dir="bugs/binaryCompat" pr="50641"
+      title="binary compatibility of advice method names - expect error">
+        <compile files="Main.java,TraceV1.aj" options="-1.4"/>
+        <run class="Main"/>
+        <compile files="TraceRE.aj" options="-1.4"/>
+        <run class="Main"/>
+    </ajc-test>
+    
+     <ajc-test dir="bugs/binaryCompat" pr="50641"
+      title="binary compatibility of advice method names - expect no error">
+        <compile files="Main.java,TraceWithInnerV1.aj" options="-1.4"/>
+        <run class="Main"/>
+        <compile files="TraceWithInnerV2.aj" options="-1.4"/>
+        <run class="Main"/>
+    </ajc-test>
+    
+	<ajc-test dir="bugs/protectedvf"
+		title="mail list VerifyError with protected access">
+		<compile files="main/Driver.java,main/p2/AbstractTest.aj,main/p1/ConcreteTest.aj"/>
+		<run class="main.Driver"/>
+	</ajc-test>
+	
+	<ajc-test dir="bugs" pr="51919"
+   	 title="Polymorphic ITD fails in CVS HEAD (From ajdt 1.1.6)">
+        <compile files="OverloadedITDNPE.java" />
+    </ajc-test>
+    
+    <ajc-test dir="bugs" pr="51320"
+   	 title="ClasscastException on concretization of if(false)">
+        <compile files="DecwClassCastException.java">
+        
+         <!-- These are the illegal PCDs against a deow -->
+         <message kind="error" line="27" text="if() pointcut designator cannot be used"/>
+         <message kind="error" line="29" text="if() pointcut designator cannot be used"/>
+         
+         <message kind="error" line="31" text="cflow() pointcut designator cannot be used"/>
+         <message kind="error" line="33" text="cflow() pointcut designator cannot be used"/>
+         
+         <message kind="error" line="35" text="cflowbelow() pointcut designator cannot be used"/>
+         <message kind="error" line="37" text="cflowbelow() pointcut designator cannot be used"/>
+         
+         <message kind="error" line="39" text="this() pointcut designator cannot be used"/>
+         <message kind="error" line="41" text="this() pointcut designator cannot be used"/>
+         
+         <message kind="error" line="43" text="target() pointcut designator cannot be used"/>
+         <message kind="error" line="45" text="target() pointcut designator cannot be used"/>
+         
+         <message kind="error" line="47" text="args() pointcut designator cannot be used"/>
+         <message kind="error" line="49" text="args() pointcut designator cannot be used"/>
+         
+        </compile>
+    </ajc-test>
+	
+	 <ajc-test dir="bugs" pr="51320"
+   	 	title="ClasscastException on concretization of if(false)">
+        <compile files="DeclareSoftDynamicPCDs.java">
+        
+         <!-- These are the illegal PCDs against a deow -->
+         <message kind="error" line="27" text="if() pointcut designator cannot be used"/>
+         <message kind="error" line="29" text="if() pointcut designator cannot be used"/>
+         
+         <message kind="error" line="31" text="cflow() pointcut designator cannot be used"/>
+         <message kind="error" line="33" text="cflow() pointcut designator cannot be used"/>
+         
+         <message kind="error" line="35" text="cflowbelow() pointcut designator cannot be used"/>
+         <message kind="error" line="37" text="cflowbelow() pointcut designator cannot be used"/>
+         
+         <message kind="error" line="39" text="this() pointcut designator cannot be used"/>
+         <message kind="error" line="41" text="this() pointcut designator cannot be used"/>
+         
+         <message kind="error" line="43" text="target() pointcut designator cannot be used"/>
+         <message kind="error" line="45" text="target() pointcut designator cannot be used"/>
+         
+         <message kind="error" line="47" text="args() pointcut designator cannot be used"/>
+         <message kind="error" line="49" text="args() pointcut designator cannot be used"/>
+         
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="bugs/abstractMethods" pr="49784"
+   	 title="Introduced abstract method on interface not implemented by subtype (weave altogether)">
+        <compile files="interface/C.java,interface/A.java,interface/B.java" />
+        <run class="C"/>
+    </ajc-test>
+ 
+    
+   	<ajc-test dir="bugs/fieldsOnInterfaces"
+		pr="52107"
+		title="declare String field on interface">
+		<compile files="StringFieldOnInterface.java">
+			<message kind="warning" line="16" text="this affected type is not exposed"/>
+         	<message kind="warning" line="17" text="this affected type is not exposed"/>
+		</compile>	   
+	</ajc-test>
+
+	<ajc-test dir="bugs/fieldsOnInterfaces"
+		pr="52107"
+		title="declare int field on interface">
+		<compile files="IntFieldOnInterface.java">
+		<message kind="warning" line="27" text="this affected type is not exposed"/>
+         	<message kind="warning" line="28" text="this affected type is not exposed"/>
+		</compile>
+	</ajc-test>
+	
+	<ajc-test dir="bugs/fieldsOnInterfaces"
+		pr="52107"
+		title="declare Object field on interface">
+		<compile files="ObjectFieldOnInterface.java">
+			<message kind="warning" line="20" text="this affected type is not exposed"/>
+         	<message kind="warning" line="21" text="this affected type is not exposed"/>
+		</compile>
+	</ajc-test>
+	
+	<ajc-test dir="bugs" pr="50776"
+   	 title="fail in compiling aspect with overriding method introduction with different throws clause ">
+        <compile files="IntertypeDifferentThrows.java" />
+    </ajc-test>
+    
+	<ajc-test dir="new" 
+		comment="in ajc 1.1.1, VerifyError Illegal use of nonvirtual function call"
+		title="super call in anonymous class created in around advice">
+        <compile files="SuperClosure.java" />
+        <run class="SuperClosure" />
+    </ajc-test>
+
+      <ajc-test dir="bugs" pr="44272"
+    		title="retitle warning to circular {advice} dependency at ...">
+        <compile files="CircularAdvicePrecedence.java" options="-1.4">
+            <message kind="error" line="4"/> 
+            <message kind="error" line="5"/> 
+            <message kind="error" line="6"/> 
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="bugs"  pr="51322"
+    	title="Introduce Unknown Type to class causes Null pointer exception"  >
+        <compile files="Pr51322.java"> 
+        	<message kind="error" line="5"/>
+        </compile>
+    </ajc-test>
+	
+    <ajc-test dir="bugs"
+		title="Private members introduced via an interface are visible to the class"
+		pr="52928">
+		<compile
+			files="VisiblePrivateInterfaceITDs.java" >
+            <message kind="error" line="13"/>
+		</compile>
+	</ajc-test>
+	
+    <ajc-test dir="bugs/declarePrecedenceWithClasses" pr="53012"
+   	 title="declare precedence on a class should be a compile-time error">
+        <compile files="DeclarePrecedenceTestClass.java" >
+          <message kind="error" line="10" text="Non-aspect types can only be specified"/>
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="bugs/declarePrecedenceWithClasses" pr="53012"
+   	 title="declare precedence on a class should be a compile-time error">
+        <compile files="Priority.aj" />
+    </ajc-test>
+	
+    <ajc-test dir="bugs"
+    	pr="59440"
+		title="NPE when binary weaving a ctor ITD">
+        <compile files="CtorITD.aj">
+        	<message kind="error" line="2"/>
+        </compile>
+    </ajc-test>
+
+	<ajc-test dir="bugs"
+    	pr="59397"
+		title="NPE in compiler when using (an unusual) declare warning against a ctor ITD">
+        <compile files="DecwInitializationITD.java">
+        </compile>
+    </ajc-test>
+	
+   <ajc-test dir="bugs/compileOrdering" 
+		pr="59778"
+		title="InterTypeMethodDeclaration.java:104">
+        <compile files="B.java,D.java" >
+          <message kind="error" line="2" file="B.java"/>
+        </compile>
+        <compile files="D.java,B.java">
+          <message kind="error" line="2" file="B.java"/>
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="bugs" 
+		pr="61538" title="nested uses of this() inside constructors not handled properly for initialization and preinitialization pointcuts">
+        <compile files="ConstructorMain.java"/>
+        <run class="ConstructorMain"/>
+    </ajc-test> 
+    
+    <ajc-test dir="bugs"
+		pr="61568" title="wrong variable binding in || pointcuts">
+        <compile files="DisjunctVarBinding.java">
+          <message kind="error" line="17" text="ambiguous binding of parameter(s) a, b across '||' in pointcut"/>
+        </compile>
+    </ajc-test>
+ 
+ 	<ajc-test dir="bugs" 
+		pr="60936" title="error message for constructor-execution pcd">
+        <compile files="InterfaceConstructor.java" options="-1.4">
+          <message kind="warning" line="10" text="no interface constructor-execution join point"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="bugs"  pr="43714"
+    	title="weaving using an empty jar in -injars"  >
+        <compile files="notAJar.jar" outjar="outJar.jar"> 
+        	<message kind="warning" text="build config error: skipping missing, empty or corrupt inpath entry"/>
+        	<message kind="error" text="no sources specified"/>
+        	<message kind="fail"/>
+        </compile>
+    </ajc-test>
+	
+	 <ajc-test dir="bugs"  pr="43714"
+    	title="weaving using an empty jar in -aspectpath"  >
+        <compile files="WeaveLocal.java" aspectpath="notAJar.jar" outjar="outJar.jar" >         	
+        	<message kind="warning" text="build config error: skipping missing, empty or corrupt aspectpath entry"/>
+        </compile>
+    </ajc-test>
 
 </suite>
diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc121/ajc121-tests.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc121/ajc121-tests.xml
deleted file mode 100644
index 1d65dc3e1..000000000
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc121/ajc121-tests.xml
+++ /dev/null
@@ -1,494 +0,0 @@
-<!-- AspectJ v1.2.1 Tests -->
-
-
-   	<ajc-test dir="bugs"
-		pr="62073" title="false ambiguous binding error (introduced in 1.2rc2)">
-        <compile files="DisjunctVarBinding_2.java,DisjunctVarBinding_3.java">
-        	<message kind="error" line="4" file="DisjunctVarBinding_3.java" text="ambiguous binding of parameter(s) a, b across '||' in pointcut"/>
-        </compile>
-        <compile files="DisjunctVarBinding_3.java,DisjunctVarBinding_2.java">
-        	<message kind="error" line="4" file="DisjunctVarBinding_3.java" text="ambiguous binding of parameter(s) a, b across '||' in pointcut"/>
-        </compile>
-    </ajc-test>
-    
-	<ajc-test dir="bugs/IfPerThis"
-		pr="62458" title="An if() pointcut inside a perthis() clauses an ABORT - null pointer exception in ajc">
-        <compile files="Testcase1.java">
-        	<message kind="error" line="15" text="if() pointcut designator cannot be used directly in a per clause"/>
-        	<message kind="error" line="23" text="if() pointcut designator cannot be used directly in a per clause"/>
-        	<message kind="error" line="25" text="if() pointcut designator cannot be used directly in a per clause"/>
-        	<message kind="error" line="27" text="if() pointcut designator cannot be used directly in a per clause"/>
-        </compile>
-    </ajc-test>
-    
-   	<ajc-test dir="bugs/IfPerThis"
-		pr="62458" title="An if() pointcut inside a perthis() clauses an ABORT - null pointer exception in ajc">
-        <compile files="Testcase2.java"/>
-        <run class="Testcase2"/>
-    </ajc-test>
-   	
-   	<ajc-test dir="bugs/IfPerThis"
-		pr="62458" title="An if() pointcut inside a perthis() clauses an ABORT - null pointer exception in ajc">
-        <compile files="Testcase3.java">
-        	<message kind="error" line="2" text="if() pointcut designator cannot be used directly in a per clause"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs/bug70619"
-		pr="70619" title="compiler aborts with 'conflicting dominates orders' with circular declare precedences">
-        <compile files="Precedence.java">
-          <message kind="error" line="0" text="conflicting declare precedence"/>
-        </compile>
-        <compile files="Conflict.java,Order2.aj,Order1.aj">        
-          <message kind="error" line="0" text="conflicting declare precedence"/>
-        </compile>
-        <compile files="Conflict.java,Order1.aj,Order2.aj">
-          <message kind="error" line="0" text="conflicting declare precedence"/>
-        </compile>
-    </ajc-test>
- 
-    <ajc-test dir="bugs"
-		pr="53999" title="'can't bind type' message has $ for . in type name for declare soft">
-        <compile files="Cosmetic.java">
-        <message kind="error" line="9" text="can't bind type name 'unknown.Error'"/>
-        </compile>
-    </ajc-test> 
-    
-    <ajc-test dir="bugs/intertypeOverrides"
-		pr="69459" title="Hiding of Instance Methods by static methods">
-        <compile files="IntertypeOverrides.java">
-          <message kind="error" line="8" text="void Sub.m() cannot override void Super.m(); overriding method is static"/>
-        </compile>
-        <compile files="IntertypeOverrides2.java">
-          <message kind="error" line="8" text="void Sub.m() cannot override void Super.m(); overridden method is static"/>
-        </compile>
-        <compile files="Superclass.java,Subclass.java,Aspect1.java">
-          <message file="Aspect1.java" kind="error" line="2" 
-             text="void Subclass.staticMethod() cannot override void Superclass.staticMethod(); overridden method is static"/>
-        </compile>
-        <compile files="Superclass.java,Subclass.java,Aspect2.java">
-          <message file="Aspect2.java" kind="error" line="2"
-             text="void Subclass.nonstaticMethod() cannot override void Superclass.nonstaticMethod(); overriding method is static"/>
-        </compile>
-    </ajc-test>
-   
-      <ajc-test dir="new"
-      title="if(false) optimisation" pr="48990">
-        <compile files="IfFalse.aj" options="-1.4"/>
-        <run class="IfFalse"/>
-    </ajc-test>
-   
-    <ajc-test dir="new"
-      title="if(true) optimisation" pr="48990">
-        <compile files="IfTrue.aj" options="-1.4"/>
-        <run class="IfTrue"/>
-    </ajc-test> 
-    
-    <ajc-test dir="bugs/abstractITDs"
-		pr="64331" title="java.lang.NullPointerException in WeaverMessageHandler class">
-        <compile files="A.java,C.java" aspectpath="B.jar">
-          <message kind="error" line="1" text="must implement abstract inter-type declaration: void A.foo()"/>
-        </compile>
-    </ajc-test>
-  
-   <ajc-test dir="bugs/pr64262"
-      title="ClassCastException at BcelRenderer.java:169" pr="64262">
-        <compile files="PrimitiveCoercionInExactTypePatternMatching.java"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs"
-		pr="61536" title="Front-end bug, shouldn't allow patterns of the form foo.., should be foo..*">
-        <compile files="EllipsesStar.java">
-          <message kind="error" line="3" text="Syntax error on token"/>
-          <message kind="error" line="4" text="Syntax error on token"/>
-          <message kind="error" line="5" text="Syntax error on token"/>
-          <message kind="error" line="6" text="Syntax error on token"/>
-          <message kind="error" line="8" text="Syntax error on token"/>
-          <message kind="error" line="10" text="Syntax error on token"/>
-          <message kind="error" line="12" text="Syntax error on token"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs"
-		pr="67774" title="Nullpointer-Exception when defining a withincode() pointcut">
-        <compile files="WithincodeNPE01.java">
-          <!-- there are 3 join points that result in decw match, but 2 are on the same line! -->
-          <message kind="warning" line="2" text="In String ctor"/>
-          <message kind="warning" line="11" text="In String ctor"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="60015"
-      title="NPE, Incorrect XLint:unmatchedSuperTypeInCall warning">
-      <compile files="IncorrectXlintOnInterface.java">
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs/typeVisibilityProblem" pr="67591"
-      title="invalid warning indicating no match when a match really occurs">
-      <compile files="Main.java">
-      </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="71273"
-      title="RuntimeException thrown: Could not find instruction: org.apache.bcel.generic.B2I">
-      <compile files="NoByteToInt.java"/>
-      <run class="NoByteToInt"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs/AroundAdviceJPs" pr="71377"
-    	title="Cannot advise private method call in around advice">
-    	<compile files="JoinPointInAroundAdvice.java"/>
-    	<run class="JoinPointInAroundAdvice"/>
-   	</ajc-test>
-    
-   <ajc-test dir="bugs/AroundAdviceJPs" pr="71377"
-    	title="Cannot advise private field sets in around advice">
-    	<compile files="FieldJoinPointsInAroundAdvice.java"/>
-    	<run class="FieldJoinPointsInAroundAdvice"/>
-   	</ajc-test>
-   	
-   	<ajc-test dir="bugs/AroundAdviceJPs" pr="71377"
-    	title="Cannot advise private field gets in around advice">
-    	<compile files="FieldGetJoinPointsInAroundAdvice.java"/>
-    	<run class="FieldGetJoinPointsInAroundAdvice"/>
-   	</ajc-test>
-
-<!--
-	commented out as test takes over 5 minutes to run - reinstate if you need to investigate 70201 for
-	any reason.
-	<ajc-test dir="bugs" pr="70201"
-    	title="Branch target offset too large for short">
-        <compile files="VeryLongBranch.java"/>
-	</ajc-test>
--->
-
-<!-- these next two tests commented out as they take minutes to run - reinstate if you need to 
-	investigate 59208 for any reason 
-	<ajc-test dir="bugs/pr59208" pr="59208"
-    	title="Weaver fails in BCEL for large classes">
-        <compile files="Foo.java, A.aj">
-	        <message kind="error" line="0" text="constant pool too big"></message>
-	    </compile>
-	</ajc-test>
-
-
-	<ajc-test dir="bugs/pr59208" pr="59208"
-    	title="Weaver fails in BCEL for large classes (binary)">
-        <compile 
-        	aspectpath="test.jar"
-        	inpath="classes">
-	        <message kind="error" line="0" text="constant pool too big"></message>
-	    </compile>
-	</ajc-test>
--->
-
-  	<ajc-test dir="bugs/pr53981" pr="538981"
-    	title="proceed used as method name in around advice (1)">
-    	<compile files="Proceeding1.aj"/>
-    	<run class="Proceeding1"/>
-   	</ajc-test>
-
-  	<ajc-test dir="bugs/pr53981" pr="538981"
-    	title="proceed used as method name in around advice (2)">
-    	<compile files="Proceeding2.aj"/>
-    	<run class="Proceeding2"/>
-   	</ajc-test>
-
-  	<ajc-test dir="bugs/pr53981" pr="538981"
-    	title="proceed used as method name in around advice (3)">
-    	<compile files="Proceeding3.aj"/>
-    	<run class="Proceeding3"/>
-   	</ajc-test>
-
-	<ajc-test dir="bugs" pr="61572"
-    	title="ITDs on inner classes should be static context">
-    	<compile files="PR61572.aj">
-	        <message kind="error" line="19" text="Cannot make a static reference to the non-static field zzz"></message>
-    	</compile>
-   	</ajc-test>
-
-    <ajc-test dir="bugs/oxford" pr="65319"
-	  	title="ajc crashes when compiling the following program (binding this() and target())">
-		<compile files="PR65319.java">
-		    <!-- target comes before this comes before args, and we only report one error -->
-			<message kind="error" line="23" text="ambiguous binding of parameter(s) x across '||' in pointcut"/>
-			<message kind="error" line="25" text="ambiguous binding of parameter(s) x across '||' in pointcut"/>
-			<message kind="error" line="27" text="ambiguous binding of parameter(s) x across '||' in pointcut"/>
-			<message kind="error" line="29" text="ambiguous binding of parameter(s) x across '||' in pointcut"/>
-		</compile>
-	</ajc-test>
-	
-<!-- should NOT raise error, despite Oxford expectations to the contrary -->
-	<ajc-test dir="bugs/oxford" pr="62475"
-	  	title="resolution of IT field inits">
-		<compile files="PR62475.java">
-		</compile>
-	</ajc-test>
-	
-
-	<ajc-test 
-    	dir="bugs/invalidAbsoluteTypeName" 
-    	pr="65925"
-		title="Valid but inaccessible type names should not be flagged by XLint:invalidAbsoluteTypeName">
-        <compile files="False_InvalidAbsoluteTypeName.java">
-        	<message kind="warning" line="17"/>
-        </compile>
-        <run class="False_InvalidAbsoluteTypeName"/>
-    </ajc-test>
- 
-  	<ajc-test dir="bugs/PR68991" pr="68991"
-    	title="intertype initialisers should match field set pointcuts">
-    	<compile files="Simple.java"/>
-    	<run class="Simple"/>
-   	</ajc-test>
-   	 	
-   	<ajc-test dir="bugs/PR68991" pr="68991"
-    	title="intertype initialisers should match field set pointcuts (oxford testcase)">
-    	<compile files="Oxford.java"/>
-    	<run class="Oxford"/>
-   	</ajc-test>
-	
-	<ajc-test dir="bugs" pr="54421"
-		title="Compile time declarations (warning and error) do not accept string concatenation (with +)">
-        <compile files="decwStrings.java">
-        	<message kind="warning" line="5"/>
-			<message kind="warning" line="19" text="hello world"/>
-			<message kind="warning" line="22" text="hello world"/>
-			<message kind="warning" line="25" text="hello world"/>
-			<message kind="warning" line="30" text="hello world"/>
-			<message kind="warning" line="34" text="hello world"/>
-			<message kind="warning" line="39" text="abcdefghijklmnopqrstuvwxyz"/>
-        </compile>
-    </ajc-test>
-	
-	<ajc-test dir="bugs" pr="54421"
-		title="Compile time declarations (warning and error) do not accept string concatenation (with +) (2)">
-        <compile files="decwStringsErroneous.java">
-			<message kind="error" line="22"/>
-        </compile>
-    </ajc-test>
-	    
-	<ajc-test dir="bugs/oxford" pr="61768"
-	  	title="scope for inter-type methods">
-		<compile files="PR61768.java">
-			<message kind="error" line="37" text="No enclosing instance of type Aspect is accessible"/>
-		</compile>
-	</ajc-test>
-
-	<ajc-test dir="bugs/doYouHaveVisiblePrivates" pr="71372"
-	  	title="NoSuchMethodError calling private method from around advice in inner aspect">
-		<compile files="PrivateCall.java"/>
-		<run class="PrivateCall"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs/doYouHaveVisiblePrivates" pr="71372"
-	  	title="NoSuchMethodError calling private method from around advice in inner aspect (2)">
-		<compile files="PrivateCall2.java,PrivateCall3.java"/>
-		<run class="def.PrivateCall3"/>
-	</ajc-test>
-		
-	<ajc-test dir="bugs/doYouHaveVisiblePrivates" pr="71372"
-	  	title="NoSuchMethodError calling private method from around advice in inner aspect (3)">
-		<compile files="PrivateCallInstance.java"/>
-		<run class="PrivateCallInstance"/>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/doYouHaveVisiblePrivates" pr="71372"
-	  	title="NoSuchMethodError calling private method from around advice in inner aspect (4)">
-		<compile files="PrivateCall_Instance_Package1.java,PrivateCall_Instance_Package2.java"/>
-		<run class="def.PrivateCall_Instance_Package2"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs/privilegedNPE" pr="67579"
-	  	title="NPE on privileged aspect error">
-		<compile files="a/ITD.aj,b/B.aj"/>
-		<run class="b.B"/>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/privilegedNPE" pr="67579"
-	  	title="NPE on privileged aspect error (2)">
-		<compile files="b/B.aj,a/ITD.aj"/>
-		<run class="b.B"/>
-	</ajc-test>
-
-    <ajc-test dir="bugs/privilegedAccess" pr="67578"
-	  	title="Privileged Aspect Access Problem Across Packages">
-		<compile files="b/B.aj,a/ITD.aj"/>
-		<run class="b.B"/>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/privilegedAccess" pr="67578"
-	  	title="Privileged Aspect Access Problem Across Packages (2)">
-		<compile files="b/B_notPrivileged.aj,a/ITD.aj">
-			<message kind="error" line="7" text="The method returnNothing(Object) from the type ITD is not visible"/>
-		</compile>
-	</ajc-test>
-		
-	<ajc-test dir="bugs" pr="62642"
-	  	title="proper handling of ExceptionInIntializer inside clinit in presence of after throwing advice">
-		<compile files="pr62642.java"/>
-		<run class="pr62642"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs" pr="64069"
-	  	title="ITD name clashes with private members">
-		<compile files="PR64069.aj">
-			<message kind="error" line="5" text="conflicts with existing member"/>
-			<message kind="error" line="10" text="conflicts with existing member"/>
-			<message kind="error" line="14" text="conflicts with existing member"/>
-			<!-- new error expected due to 275032 change - the itd for the ctor will be ignored in the clash case -->
-			<message kind="error" line="41" text="The constructor A() is not visible"/>
-		</compile>
-	</ajc-test>
-
-	<ajc-test dir="bugs/pr71723" pr="71723"
-	  	title="Inconsistency in scoping of protected members in ITDs">
-		<compile files="foo/Foo.java,bar/Bar.aj">
-			<message kind="error" line="8" text="The method i() from the type Foo is not visible"/>
-			<message kind="error" line="9" text="The method ancientI() from the type Foo is not visible"/>
-			<message kind="error" line="10" text="The method ancientJ() from the type AncientFoo is not visible"/>
-			<message kind="error" line="11" text="The method clone() from the type Object is not visible"/>
-			<message kind="error" line="12" text="Cannot make a static reference to the non-static method clone() from the type Object"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="design/sourceLines" pr="37020"
-	  	title="wrong line for method execution join point">
-		<compile files="TestSourceLines.java">
-			<message kind="warning" line="1" text="static init"/>
-			<message kind="warning" line="12" text="cons execution"/>
-			<message kind="warning" line="12" text="pre-init"/>
-			<message kind="warning" line="12" text="just-init"/>
-			<message kind="warning" line="16" text="cons execution"/>
-			<message kind="warning" line="16" text="just-init"/>
-			<message kind="warning" line="16" text="pre-init"/>
-			<message kind="warning" line="20" text="method execution"/>
-			<message kind="warning" line="24" text="method execution"/>
-			<message kind="warning" line="28" text="method execution"/>
-			<message kind="warning" line="35" text="static init"/>
-			<message kind="warning" line="35" text="just-init"/>
-			<message kind="warning" line="35" text="pre-init"/>
-			<message kind="warning" line="39" text="pre-init"/>
-			<message kind="warning" line="39" text="just-init"/>
-			<message kind="warning" line="39" text="static init"/>
-			<message kind="warning" line="47" text="advice"/>
-		</compile>
-	</ajc-test>
-
-	<ajc-test dir="bugs/interfaceITDs" pr="70794"
-	  	title="The introduction on interface causes the interface implementation class error (1)">
-		<compile files="PublicPublic.java"/>
-	</ajc-test>
-		
-	
-	<ajc-test dir="bugs/interfaceITDs" pr="70794"
-	  	title="The introduction on interface causes the interface implementation class error (2)">
-		<compile files="PackagePublic.java"/>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/interfaceITDs" pr="70794"
-	  	title="The introduction on interface causes the interface implementation class error (3)">
-		<compile files="PackagePackage.java">
-			<message kind="error" line="17" text="abstract intertype method declaration 'void PackagePackage.world()' on interface PackagePackage must be declared public (compiler limitation)"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/interfaceITDs" pr="70794"
-	  	title="The introduction on interface causes the interface implementation class error (4)">
-		<compile files="PublicPackage.java">
-			<message kind="error" line="13" text="abstract intertype method declaration 'void PublicPackage.world()' on interface PublicPackage must be declared public (compiler limitation)"/>
-		</compile>
-	</ajc-test>
-
-	<ajc-test dir="bugs/pr72531" pr="72531"
-	  	title="declare warning warns at wrong points">
-		<compile files="de/rohith/HelloWorld.java,de/rohith/HelloWorldAspect.java,de/rohith/PrinterWorld.java">
-			<message kind="warning" line="15" text="*[] returning method called"/>
-			<message kind="warning" line="22" text="*[] returning method called"/>
-		</compile>
-	</ajc-test>
-
-    <ajc-test dir="bugs" pr="72699"
-	   title="Bogus error message: The abstract method ajc$pointcut$$tracingScope$a2 in type Tracing can only be defined by an abstract class (1)">
-	   <compile files="BogusMessage.java">
-	      <message kind="error" line="2" text="The abstract pointcut tracingScope can only be defined in an abstract aspect"/>
-       </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="72699"
-	   title="Bogus error message: The abstract method ajc$pointcut$$tracingScope$a2 in type Tracing can only be defined by an abstract class (2)">
-	   <compile files="BogusMessage2.java">
-	     <message kind="error" line="1" text="The type BogusMessage2 must be an abstract class to define abstract methods"/>
-	     <message kind="error" line="2" text="The abstract pointcut tracingScope can only be defined in an aspect"/>
-	   </compile>
-    </ajc-test>
-	
-	<ajc-test dir="bugs/pr70404" pr="70404" 
-		title="passing null to array arguments confuzes static join point signature. (1)">
-	  <compile files="Main.java,MainAspect.java"/>
-	  <run class="dk.infimum.aspectjtest.Main"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs/pr70404" pr="70404" 
-		title="passing null to array arguments confuzes static join point signature. (2)">
-	  <compile files="Main2.java,MainAspect.java"/>
-	  <run class="dk.infimum.aspectjtest.Main2"/>
-	</ajc-test>
-	
-    <ajc-test dir="bugs" pr="72528"
-		title="around advice throws java.lang.VerifyError at runtime">
-		<compile files="ArrayCloning.java"/>
-		<run class="ArrayCloning"/>
-	</ajc-test>
-
-    <ajc-test dir="bugs" pr="72157"
-		title="declare soft can cause programs with invalid exception behaviour to be generated">
-		<compile files="PR72157.java">
- 	      <message kind="error" line="13" text="Unhandled"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test 
-    	dir="bugs" 
-    	pr="75129"
-		title="NPE on thisJoinPoint mistake">
-        <compile files="TjpMistake.java">
-        	<message kind="error" line="22"/>
-        </compile>
-    </ajc-test>
-
-	<ajc-test dir="cflow" pr="76030" title="Optimization of cflow - counters (1)">
-        <compile files="CounterTest01.java"/>
-		<run class="CounterTest01"/>
-    </ajc-test>
-	
-	<ajc-test dir="cflow" pr="76030" title="Optimization of cflow - shared counters (2)">
-        <compile files="CounterTest02.java" options="-1.4"/>
-		<run class="CounterTest02"/>
-    </ajc-test>
-	
-	<ajc-test dir="cflow" pr="76030" title="Optimization of cflow - shared stacks (3)">
-        <compile files="CounterTest03.java"/>
-		<run class="CounterTest03"/>
-    </ajc-test>
-	
-	<ajc-test dir="cflow" pr="76030" title="Optimization of cflow - counters (4)">
-        <compile files="CounterTest04.java" options="-1.4"/>
-		<run class="CounterTest04"/>
-    </ajc-test>
-	
-    <ajc-test dir="cflow" pr="76030" title="Optimization of cflow - counters with abstract pointcuts (5)">
-        <compile files="CounterTest05.java"/>
-		<run class="CounterTest05"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs/pr76096" pr="76096" title="Anonymous classes unaware of introductions into abstract classes">
-        <compile files="ConcreteClassA.java"/>
-        <run class="ConcreteClassA"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs" pr="74952" title="before,after not (cflow(within(Trace*))) prints nothing">
-        <compile files="WhatsGoingOn.java"/>
-        <run class="WhatsGoingOn"/>
-    </ajc-test>
diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc121/ajc121.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc121/ajc121.xml
index 8ad54bf32..ff2e46106 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc121/ajc121.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/ajc121/ajc121.xml
@@ -1,12 +1,496 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[
-<!ENTITY tests SYSTEM "../tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml">
-]>
+<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
+<suite>
 
-<!-- AspectJ v1.2.1 Tests -->
+   	<ajc-test dir="bugs"
+		pr="62073" title="false ambiguous binding error (introduced in 1.2rc2)">
+        <compile files="DisjunctVarBinding_2.java,DisjunctVarBinding_3.java">
+        	<message kind="error" line="4" file="DisjunctVarBinding_3.java" text="ambiguous binding of parameter(s) a, b across '||' in pointcut"/>
+        </compile>
+        <compile files="DisjunctVarBinding_3.java,DisjunctVarBinding_2.java">
+        	<message kind="error" line="4" file="DisjunctVarBinding_3.java" text="ambiguous binding of parameter(s) a, b across '||' in pointcut"/>
+        </compile>
+    </ajc-test>
+    
+	<ajc-test dir="bugs/IfPerThis"
+		pr="62458" title="An if() pointcut inside a perthis() clauses an ABORT - null pointer exception in ajc">
+        <compile files="Testcase1.java">
+        	<message kind="error" line="15" text="if() pointcut designator cannot be used directly in a per clause"/>
+        	<message kind="error" line="23" text="if() pointcut designator cannot be used directly in a per clause"/>
+        	<message kind="error" line="25" text="if() pointcut designator cannot be used directly in a per clause"/>
+        	<message kind="error" line="27" text="if() pointcut designator cannot be used directly in a per clause"/>
+        </compile>
+    </ajc-test>
+    
+   	<ajc-test dir="bugs/IfPerThis"
+		pr="62458" title="An if() pointcut inside a perthis() clauses an ABORT - null pointer exception in ajc">
+        <compile files="Testcase2.java"/>
+        <run class="Testcase2"/>
+    </ajc-test>
+   	
+   	<ajc-test dir="bugs/IfPerThis"
+		pr="62458" title="An if() pointcut inside a perthis() clauses an ABORT - null pointer exception in ajc">
+        <compile files="Testcase3.java">
+        	<message kind="error" line="2" text="if() pointcut designator cannot be used directly in a per clause"/>
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="bugs/bug70619"
+		pr="70619" title="compiler aborts with 'conflicting dominates orders' with circular declare precedences">
+        <compile files="Precedence.java">
+          <message kind="error" line="0" text="conflicting declare precedence"/>
+        </compile>
+        <compile files="Conflict.java,Order2.aj,Order1.aj">        
+          <message kind="error" line="0" text="conflicting declare precedence"/>
+        </compile>
+        <compile files="Conflict.java,Order1.aj,Order2.aj">
+          <message kind="error" line="0" text="conflicting declare precedence"/>
+        </compile>
+    </ajc-test>
+ 
+    <ajc-test dir="bugs"
+		pr="53999" title="'can't bind type' message has $ for . in type name for declare soft">
+        <compile files="Cosmetic.java">
+        <message kind="error" line="9" text="can't bind type name 'unknown.Error'"/>
+        </compile>
+    </ajc-test> 
+    
+    <ajc-test dir="bugs/intertypeOverrides"
+		pr="69459" title="Hiding of Instance Methods by static methods">
+        <compile files="IntertypeOverrides.java">
+          <message kind="error" line="8" text="void Sub.m() cannot override void Super.m(); overriding method is static"/>
+        </compile>
+        <compile files="IntertypeOverrides2.java">
+          <message kind="error" line="8" text="void Sub.m() cannot override void Super.m(); overridden method is static"/>
+        </compile>
+        <compile files="Superclass.java,Subclass.java,Aspect1.java">
+          <message file="Aspect1.java" kind="error" line="2" 
+             text="void Subclass.staticMethod() cannot override void Superclass.staticMethod(); overridden method is static"/>
+        </compile>
+        <compile files="Superclass.java,Subclass.java,Aspect2.java">
+          <message file="Aspect2.java" kind="error" line="2"
+             text="void Subclass.nonstaticMethod() cannot override void Superclass.nonstaticMethod(); overriding method is static"/>
+        </compile>
+    </ajc-test>
+   
+      <ajc-test dir="new"
+      title="if(false) optimisation" pr="48990">
+        <compile files="IfFalse.aj" options="-1.4"/>
+        <run class="IfFalse"/>
+    </ajc-test>
+   
+    <ajc-test dir="new"
+      title="if(true) optimisation" pr="48990">
+        <compile files="IfTrue.aj" options="-1.4"/>
+        <run class="IfTrue"/>
+    </ajc-test> 
+    
+    <ajc-test dir="bugs/abstractITDs"
+		pr="64331" title="java.lang.NullPointerException in WeaverMessageHandler class">
+        <compile files="A.java,C.java" aspectpath="B.jar">
+          <message kind="error" line="1" text="must implement abstract inter-type declaration: void A.foo()"/>
+        </compile>
+    </ajc-test>
+  
+   <ajc-test dir="bugs/pr64262"
+      title="ClassCastException at BcelRenderer.java:169" pr="64262">
+        <compile files="PrimitiveCoercionInExactTypePatternMatching.java"/>
+    </ajc-test>
+    
+    <ajc-test dir="bugs"
+		pr="61536" title="Front-end bug, shouldn't allow patterns of the form foo.., should be foo..*">
+        <compile files="EllipsesStar.java">
+          <message kind="error" line="3" text="Syntax error on token"/>
+          <message kind="error" line="4" text="Syntax error on token"/>
+          <message kind="error" line="5" text="Syntax error on token"/>
+          <message kind="error" line="6" text="Syntax error on token"/>
+          <message kind="error" line="8" text="Syntax error on token"/>
+          <message kind="error" line="10" text="Syntax error on token"/>
+          <message kind="error" line="12" text="Syntax error on token"/>
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="bugs"
+		pr="67774" title="Nullpointer-Exception when defining a withincode() pointcut">
+        <compile files="WithincodeNPE01.java">
+          <!-- there are 3 join points that result in decw match, but 2 are on the same line! -->
+          <message kind="warning" line="2" text="In String ctor"/>
+          <message kind="warning" line="11" text="In String ctor"/>
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="bugs" pr="60015"
+      title="NPE, Incorrect XLint:unmatchedSuperTypeInCall warning">
+      <compile files="IncorrectXlintOnInterface.java">
+      </compile>
+    </ajc-test>
+    
+    <ajc-test dir="bugs/typeVisibilityProblem" pr="67591"
+      title="invalid warning indicating no match when a match really occurs">
+      <compile files="Main.java">
+      </compile>
+    </ajc-test>
+    
+    <ajc-test dir="bugs" pr="71273"
+      title="RuntimeException thrown: Could not find instruction: org.apache.bcel.generic.B2I">
+      <compile files="NoByteToInt.java"/>
+      <run class="NoByteToInt"/>
+    </ajc-test>
+    
+    <ajc-test dir="bugs/AroundAdviceJPs" pr="71377"
+    	title="Cannot advise private method call in around advice">
+    	<compile files="JoinPointInAroundAdvice.java"/>
+    	<run class="JoinPointInAroundAdvice"/>
+   	</ajc-test>
+    
+   <ajc-test dir="bugs/AroundAdviceJPs" pr="71377"
+    	title="Cannot advise private field sets in around advice">
+    	<compile files="FieldJoinPointsInAroundAdvice.java"/>
+    	<run class="FieldJoinPointsInAroundAdvice"/>
+   	</ajc-test>
+   	
+   	<ajc-test dir="bugs/AroundAdviceJPs" pr="71377"
+    	title="Cannot advise private field gets in around advice">
+    	<compile files="FieldGetJoinPointsInAroundAdvice.java"/>
+    	<run class="FieldGetJoinPointsInAroundAdvice"/>
+   	</ajc-test>
 
-<suite>
+<!--
+	commented out as test takes over 5 minutes to run - reinstate if you need to investigate 70201 for
+	any reason.
+	<ajc-test dir="bugs" pr="70201"
+    	title="Branch target offset too large for short">
+        <compile files="VeryLongBranch.java"/>
+	</ajc-test>
+-->
 
-&tests;
+<!-- these next two tests commented out as they take minutes to run - reinstate if you need to 
+	investigate 59208 for any reason 
+	<ajc-test dir="bugs/pr59208" pr="59208"
+    	title="Weaver fails in BCEL for large classes">
+        <compile files="Foo.java, A.aj">
+	        <message kind="error" line="0" text="constant pool too big"></message>
+	    </compile>
+	</ajc-test>
 
-</suite>
 
+	<ajc-test dir="bugs/pr59208" pr="59208"
+    	title="Weaver fails in BCEL for large classes (binary)">
+        <compile 
+        	aspectpath="test.jar"
+        	inpath="classes">
+	        <message kind="error" line="0" text="constant pool too big"></message>
+	    </compile>
+	</ajc-test>
+-->
+
+  	<ajc-test dir="bugs/pr53981" pr="538981"
+    	title="proceed used as method name in around advice (1)">
+    	<compile files="Proceeding1.aj"/>
+    	<run class="Proceeding1"/>
+   	</ajc-test>
+
+  	<ajc-test dir="bugs/pr53981" pr="538981"
+    	title="proceed used as method name in around advice (2)">
+    	<compile files="Proceeding2.aj"/>
+    	<run class="Proceeding2"/>
+   	</ajc-test>
+
+  	<ajc-test dir="bugs/pr53981" pr="538981"
+    	title="proceed used as method name in around advice (3)">
+    	<compile files="Proceeding3.aj"/>
+    	<run class="Proceeding3"/>
+   	</ajc-test>
+
+	<ajc-test dir="bugs" pr="61572"
+    	title="ITDs on inner classes should be static context">
+    	<compile files="PR61572.aj">
+	        <message kind="error" line="19" text="Cannot make a static reference to the non-static field zzz"></message>
+    	</compile>
+   	</ajc-test>
+
+    <ajc-test dir="bugs/oxford" pr="65319"
+	  	title="ajc crashes when compiling the following program (binding this() and target())">
+		<compile files="PR65319.java">
+		    <!-- target comes before this comes before args, and we only report one error -->
+			<message kind="error" line="23" text="ambiguous binding of parameter(s) x across '||' in pointcut"/>
+			<message kind="error" line="25" text="ambiguous binding of parameter(s) x across '||' in pointcut"/>
+			<message kind="error" line="27" text="ambiguous binding of parameter(s) x across '||' in pointcut"/>
+			<message kind="error" line="29" text="ambiguous binding of parameter(s) x across '||' in pointcut"/>
+		</compile>
+	</ajc-test>
+	
+<!-- should NOT raise error, despite Oxford expectations to the contrary -->
+	<ajc-test dir="bugs/oxford" pr="62475"
+	  	title="resolution of IT field inits">
+		<compile files="PR62475.java">
+		</compile>
+	</ajc-test>
+	
+
+	<ajc-test 
+    	dir="bugs/invalidAbsoluteTypeName" 
+    	pr="65925"
+		title="Valid but inaccessible type names should not be flagged by XLint:invalidAbsoluteTypeName">
+        <compile files="False_InvalidAbsoluteTypeName.java">
+        	<message kind="warning" line="17"/>
+        </compile>
+        <run class="False_InvalidAbsoluteTypeName"/>
+    </ajc-test>
+ 
+  	<ajc-test dir="bugs/PR68991" pr="68991"
+    	title="intertype initialisers should match field set pointcuts">
+    	<compile files="Simple.java"/>
+    	<run class="Simple"/>
+   	</ajc-test>
+   	 	
+   	<ajc-test dir="bugs/PR68991" pr="68991"
+    	title="intertype initialisers should match field set pointcuts (oxford testcase)">
+    	<compile files="Oxford.java"/>
+    	<run class="Oxford"/>
+   	</ajc-test>
+	
+	<ajc-test dir="bugs" pr="54421"
+		title="Compile time declarations (warning and error) do not accept string concatenation (with +)">
+        <compile files="decwStrings.java">
+        	<message kind="warning" line="5"/>
+			<message kind="warning" line="19" text="hello world"/>
+			<message kind="warning" line="22" text="hello world"/>
+			<message kind="warning" line="25" text="hello world"/>
+			<message kind="warning" line="30" text="hello world"/>
+			<message kind="warning" line="34" text="hello world"/>
+			<message kind="warning" line="39" text="abcdefghijklmnopqrstuvwxyz"/>
+        </compile>
+    </ajc-test>
+	
+	<ajc-test dir="bugs" pr="54421"
+		title="Compile time declarations (warning and error) do not accept string concatenation (with +) (2)">
+        <compile files="decwStringsErroneous.java">
+			<message kind="error" line="22"/>
+        </compile>
+    </ajc-test>
+	    
+	<ajc-test dir="bugs/oxford" pr="61768"
+	  	title="scope for inter-type methods">
+		<compile files="PR61768.java">
+			<message kind="error" line="37" text="No enclosing instance of type Aspect is accessible"/>
+		</compile>
+	</ajc-test>
+
+	<ajc-test dir="bugs/doYouHaveVisiblePrivates" pr="71372"
+	  	title="NoSuchMethodError calling private method from around advice in inner aspect">
+		<compile files="PrivateCall.java"/>
+		<run class="PrivateCall"/>
+	</ajc-test>
+
+	<ajc-test dir="bugs/doYouHaveVisiblePrivates" pr="71372"
+	  	title="NoSuchMethodError calling private method from around advice in inner aspect (2)">
+		<compile files="PrivateCall2.java,PrivateCall3.java"/>
+		<run class="def.PrivateCall3"/>
+	</ajc-test>
+		
+	<ajc-test dir="bugs/doYouHaveVisiblePrivates" pr="71372"
+	  	title="NoSuchMethodError calling private method from around advice in inner aspect (3)">
+		<compile files="PrivateCallInstance.java"/>
+		<run class="PrivateCallInstance"/>
+	</ajc-test>
+	
+	<ajc-test dir="bugs/doYouHaveVisiblePrivates" pr="71372"
+	  	title="NoSuchMethodError calling private method from around advice in inner aspect (4)">
+		<compile files="PrivateCall_Instance_Package1.java,PrivateCall_Instance_Package2.java"/>
+		<run class="def.PrivateCall_Instance_Package2"/>
+	</ajc-test>
+
+	<ajc-test dir="bugs/privilegedNPE" pr="67579"
+	  	title="NPE on privileged aspect error">
+		<compile files="a/ITD.aj,b/B.aj"/>
+		<run class="b.B"/>
+	</ajc-test>
+	
+	<ajc-test dir="bugs/privilegedNPE" pr="67579"
+	  	title="NPE on privileged aspect error (2)">
+		<compile files="b/B.aj,a/ITD.aj"/>
+		<run class="b.B"/>
+	</ajc-test>
+
+    <ajc-test dir="bugs/privilegedAccess" pr="67578"
+	  	title="Privileged Aspect Access Problem Across Packages">
+		<compile files="b/B.aj,a/ITD.aj"/>
+		<run class="b.B"/>
+	</ajc-test>
+	
+	<ajc-test dir="bugs/privilegedAccess" pr="67578"
+	  	title="Privileged Aspect Access Problem Across Packages (2)">
+		<compile files="b/B_notPrivileged.aj,a/ITD.aj">
+			<message kind="error" line="7" text="The method returnNothing(Object) from the type ITD is not visible"/>
+		</compile>
+	</ajc-test>
+		
+	<ajc-test dir="bugs" pr="62642"
+	  	title="proper handling of ExceptionInIntializer inside clinit in presence of after throwing advice">
+		<compile files="pr62642.java"/>
+		<run class="pr62642"/>
+	</ajc-test>
+
+	<ajc-test dir="bugs" pr="64069"
+	  	title="ITD name clashes with private members">
+		<compile files="PR64069.aj">
+			<message kind="error" line="5" text="conflicts with existing member"/>
+			<message kind="error" line="10" text="conflicts with existing member"/>
+			<message kind="error" line="14" text="conflicts with existing member"/>
+			<!-- new error expected due to 275032 change - the itd for the ctor will be ignored in the clash case -->
+			<message kind="error" line="41" text="The constructor A() is not visible"/>
+		</compile>
+	</ajc-test>
+
+	<ajc-test dir="bugs/pr71723" pr="71723"
+	  	title="Inconsistency in scoping of protected members in ITDs">
+		<compile files="foo/Foo.java,bar/Bar.aj">
+			<message kind="error" line="8" text="The method i() from the type Foo is not visible"/>
+			<message kind="error" line="9" text="The method ancientI() from the type Foo is not visible"/>
+			<message kind="error" line="10" text="The method ancientJ() from the type AncientFoo is not visible"/>
+			<message kind="error" line="11" text="The method clone() from the type Object is not visible"/>
+			<message kind="error" line="12" text="Cannot make a static reference to the non-static method clone() from the type Object"/>
+		</compile>
+	</ajc-test>
+	
+	<ajc-test dir="design/sourceLines" pr="37020"
+	  	title="wrong line for method execution join point">
+		<compile files="TestSourceLines.java">
+			<message kind="warning" line="1" text="static init"/>
+			<message kind="warning" line="12" text="cons execution"/>
+			<message kind="warning" line="12" text="pre-init"/>
+			<message kind="warning" line="12" text="just-init"/>
+			<message kind="warning" line="16" text="cons execution"/>
+			<message kind="warning" line="16" text="just-init"/>
+			<message kind="warning" line="16" text="pre-init"/>
+			<message kind="warning" line="20" text="method execution"/>
+			<message kind="warning" line="24" text="method execution"/>
+			<message kind="warning" line="28" text="method execution"/>
+			<message kind="warning" line="35" text="static init"/>
+			<message kind="warning" line="35" text="just-init"/>
+			<message kind="warning" line="35" text="pre-init"/>
+			<message kind="warning" line="39" text="pre-init"/>
+			<message kind="warning" line="39" text="just-init"/>
+			<message kind="warning" line="39" text="static init"/>
+			<message kind="warning" line="47" text="advice"/>
+		</compile>
+	</ajc-test>
+
+	<ajc-test dir="bugs/interfaceITDs" pr="70794"
+	  	title="The introduction on interface causes the interface implementation class error (1)">
+		<compile files="PublicPublic.java"/>
+	</ajc-test>
+		
+	
+	<ajc-test dir="bugs/interfaceITDs" pr="70794"
+	  	title="The introduction on interface causes the interface implementation class error (2)">
+		<compile files="PackagePublic.java"/>
+	</ajc-test>
+	
+	<ajc-test dir="bugs/interfaceITDs" pr="70794"
+	  	title="The introduction on interface causes the interface implementation class error (3)">
+		<compile files="PackagePackage.java">
+			<message kind="error" line="17" text="abstract intertype method declaration 'void PackagePackage.world()' on interface PackagePackage must be declared public (compiler limitation)"/>
+		</compile>
+	</ajc-test>
+	
+	<ajc-test dir="bugs/interfaceITDs" pr="70794"
+	  	title="The introduction on interface causes the interface implementation class error (4)">
+		<compile files="PublicPackage.java">
+			<message kind="error" line="13" text="abstract intertype method declaration 'void PublicPackage.world()' on interface PublicPackage must be declared public (compiler limitation)"/>
+		</compile>
+	</ajc-test>
+
+	<ajc-test dir="bugs/pr72531" pr="72531"
+	  	title="declare warning warns at wrong points">
+		<compile files="de/rohith/HelloWorld.java,de/rohith/HelloWorldAspect.java,de/rohith/PrinterWorld.java">
+			<message kind="warning" line="15" text="*[] returning method called"/>
+			<message kind="warning" line="22" text="*[] returning method called"/>
+		</compile>
+	</ajc-test>
+
+    <ajc-test dir="bugs" pr="72699"
+	   title="Bogus error message: The abstract method ajc$pointcut$$tracingScope$a2 in type Tracing can only be defined by an abstract class (1)">
+	   <compile files="BogusMessage.java">
+	      <message kind="error" line="2" text="The abstract pointcut tracingScope can only be defined in an abstract aspect"/>
+       </compile>
+    </ajc-test>
+    
+    <ajc-test dir="bugs" pr="72699"
+	   title="Bogus error message: The abstract method ajc$pointcut$$tracingScope$a2 in type Tracing can only be defined by an abstract class (2)">
+	   <compile files="BogusMessage2.java">
+	     <message kind="error" line="1" text="The type BogusMessage2 must be an abstract class to define abstract methods"/>
+	     <message kind="error" line="2" text="The abstract pointcut tracingScope can only be defined in an aspect"/>
+	   </compile>
+    </ajc-test>
+	
+	<ajc-test dir="bugs/pr70404" pr="70404" 
+		title="passing null to array arguments confuzes static join point signature. (1)">
+	  <compile files="Main.java,MainAspect.java"/>
+	  <run class="dk.infimum.aspectjtest.Main"/>
+	</ajc-test>
+
+	<ajc-test dir="bugs/pr70404" pr="70404" 
+		title="passing null to array arguments confuzes static join point signature. (2)">
+	  <compile files="Main2.java,MainAspect.java"/>
+	  <run class="dk.infimum.aspectjtest.Main2"/>
+	</ajc-test>
+	
+    <ajc-test dir="bugs" pr="72528"
+		title="around advice throws java.lang.VerifyError at runtime">
+		<compile files="ArrayCloning.java"/>
+		<run class="ArrayCloning"/>
+	</ajc-test>
+
+    <ajc-test dir="bugs" pr="72157"
+		title="declare soft can cause programs with invalid exception behaviour to be generated">
+		<compile files="PR72157.java">
+ 	      <message kind="error" line="13" text="Unhandled"/>
+		</compile>
+	</ajc-test>
+	
+	<ajc-test 
+    	dir="bugs" 
+    	pr="75129"
+		title="NPE on thisJoinPoint mistake">
+        <compile files="TjpMistake.java">
+        	<message kind="error" line="22"/>
+        </compile>
+    </ajc-test>
+
+	<ajc-test dir="cflow" pr="76030" title="Optimization of cflow - counters (1)">
+        <compile files="CounterTest01.java"/>
+		<run class="CounterTest01"/>
+    </ajc-test>
+	
+	<ajc-test dir="cflow" pr="76030" title="Optimization of cflow - shared counters (2)">
+        <compile files="CounterTest02.java" options="-1.4"/>
+		<run class="CounterTest02"/>
+    </ajc-test>
+	
+	<ajc-test dir="cflow" pr="76030" title="Optimization of cflow - shared stacks (3)">
+        <compile files="CounterTest03.java"/>
+		<run class="CounterTest03"/>
+    </ajc-test>
+	
+	<ajc-test dir="cflow" pr="76030" title="Optimization of cflow - counters (4)">
+        <compile files="CounterTest04.java" options="-1.4"/>
+		<run class="CounterTest04"/>
+    </ajc-test>
+	
+    <ajc-test dir="cflow" pr="76030" title="Optimization of cflow - counters with abstract pointcuts (5)">
+        <compile files="CounterTest05.java"/>
+		<run class="CounterTest05"/>
+    </ajc-test>
+    
+    <ajc-test dir="bugs/pr76096" pr="76096" title="Anonymous classes unaware of introductions into abstract classes">
+        <compile files="ConcreteClassA.java"/>
+        <run class="ConcreteClassA"/>
+    </ajc-test>
+    
+    <ajc-test dir="bugs" pr="74952" title="before,after not (cflow(within(Trace*))) prints nothing">
+        <compile files="WhatsGoingOn.java"/>
+        <run class="WhatsGoingOn"/>
+    </ajc-test>
+    
+</suite>
diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc150/ltw/ltw-tests.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc150/ltw/ltw-tests.xml
index 0dcdbf142..e69de29bb 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc150/ltw/ltw-tests.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/ajc150/ltw/ltw-tests.xml
@@ -1,670 +0,0 @@
-
-<!-- Load-time weaving tests -->
-<ajc-test dir="ltw"
-	title="Ensure 1st aspect is rewoven when weaving 2nd aspect"
-	keywords="reweavable">
-	<compile files="Main.java, Aspect1.aj" outjar="main1.jar"
-		options="-showWeaveInfo -verbose -1.4">
-		<message kind="weave"
-			text="method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)" />
-	</compile>
-	<compile classpath="main1.jar" files="Aspect2.aj"
-		outjar="aspect2.jar" options="-showWeaveInfo -verbose -1.4">
-	</compile>
-	<run class="Main" ltw="aop-ltwreweavable.xml">
-		<stdout>
-			<line text="Main.main" />
-			<line text="Main.test1" />
-			<line text="Main.test2" />
-		</stdout>
-		<stderr>
-			<line
-				text="weaveinfo Join point 'method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)" />
-			<line
-				text="weaveinfo Join point 'method-execution(void Main.test2())' in Type 'Main' (Main.java:21) advised by before advice from 'Aspect2' (Aspect2.aj:16)" />
-			<line text="Aspect1.before_test1" />
-			<line text="Aspect2.before_test2" />
-		</stderr>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw"
-	title="Ensure valid aop.xml file is generated" keywords="-outxml">
-	<compile files="Main.java" outjar="main.jar">
-	</compile>
-	<compile classpath="main.jar"
-		files="Aspect1.aj, Aspect2.aj, pakkage/Aspect3.aj"
-		outxmlfile="META-INF/aop.xml" options="-1.4">
-	</compile>
-	<run class="Main" ltw="">
-		<stdout>
-			<line text="Main.main" />
-			<line text="Main.test1" />
-			<line text="Main.test2" />
-		</stdout>
-		<stderr>
-			<line text="Aspect1.before_test1" />
-			<line text="Aspect2.before_test2" />
-			<line text="pakkage.Aspect3.before_test2" />
-		</stderr>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw"
-	title="Ensure valid aop.xml is generated for -outjar"
-	keywords="-outxml">
-	<compile files="Main.java" outjar="main.jar">
-	</compile>
-	<compile classpath="main.jar"
-		files="Aspect1.aj, Aspect2.aj, pakkage/Aspect3.aj"
-		outjar="aspects.jar" options="-1.4 -outxml">
-	</compile>
-	<run class="Main" ltw="">
-		<stdout>
-			<line text="Main.main" />
-			<line text="Main.test1" />
-			<line text="Main.test2" />
-		</stdout>
-		<stderr>
-			<line text="Aspect1.before_test1" />
-			<line text="Aspect2.before_test2" />
-			<line text="pakkage.Aspect3.before_test2" />
-		</stderr>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw"
-	title="Ensure no weaving without visible aop.xml" keywords="reweavable">
-	<compile files="TestMain.java, Main.java">
-	</compile>
-	<run class="TestMain" ltw="">
-		<stdout>
-			<line text="Main.main" />
-			<line text="Main.test1" />
-			<line text="Main.test2" />
-		</stdout>
-		<stderr>
-			<line text="info AspectJ Weaver Version" />
-			<line
-				text="info register classloader org.aspectj.weaver.loadtime.WeavingURLClassLoader" />
-			<line
-				text="info no configuration found. Disabling weaver for class loader org.aspectj.weaver.loadtime.WeavingURLClassLoader" />
-		</stderr>
-	</run>
-</ajc-test>
-
-<!-- type discarding tests, investigating call munging -->
-
-<ajc-test dir="ltw/callMunging"
-	title="discarding woven types - 1">
-	<compile files="A.java,B.java,T.java,Main.java"
-		outjar="classes.jar" />
-	<compile files="X.java" outjar="aspects.jar"
-		classpath="classes.jar" options="-Xlint:ignore" />
-	<run class="Main" ltw="aop.xml">
-		<stdout>
-			<line text="into:main" />
-			<line text="A.method() running" />
-			<line text="advice running" />
-			<line text="T.m1() running" />
-			<line text="B.method() running" />
-			<line text="advice running" />
-			<line text="T.m2() running" />
-			<line text="leave:main" />
-		</stdout>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw/callMunging/case1"
-	title="aggressive ltw - decp">
-	<compile files="A.java,T.java,Main.java" outjar="classes.jar" />
-	<compile files="X.java" outjar="aspects.jar"
-		classpath="classes.jar" options="-Xlint:ignore" />
-	<run class="Main" ltw="aop.xml">
-		<stdout>
-			<line text="into:main" />
-			<line text="A.method() running" />
-			<line text="advice running" />
-			<line text="T.m1() running" />
-			<line text="leave:main" />
-		</stdout>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw/callMunging/case1"
-	title="aggressive ltw - decp - deactivate">
-	<compile files="A.java,T.java,Main.java" outjar="classes.jar" />
-	<compile files="X.java" outjar="aspects.jar"
-		classpath="classes.jar" options="-Xlint:ignore" />
-	<run class="Main" ltw="aop2.xml">
-		<stdout>
-			<line text="into:main" />
-			<line text="A.method() running" />
-			<line text="T.m1() running" />
-			<line text="leave:main" />
-		</stdout>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw/callMunging/case1"
-	title="aggressive ltw - hierarchy">
-	<compile files="T.java,HierMain.java" outjar="classes.jar" />
-	<compile files="A.java" outjar="sub.hiddenjar"
-		classpath="classes.jar" />
-	<compile files="X.java" outjar="aspects.jar"
-		classpath="classes.jar" options="-Xlint:ignore" />
-	<run class="HierMain" ltw="aop.xml">
-		<stdout>
-			<line text="into:main" />
-			<line text="A.method() running" />
-			<line text="advice running" />
-			<line text="T.m1() running" />
-			<line text="leave:main" />
-		</stdout>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw/callMunging/case3"
-	title="aggressive ltw - decp - 2">
-	<compile files="A.java,T.java,S.java,Main.java"
-		outjar="classes.jar" />
-	<compile files="X.java" outjar="aspects.jar"
-		classpath="classes.jar" options="-Xlint:ignore" />
-	<run class="Main" ltw="aop.xml">
-		<stdout>
-			<line text="into:main" />
-			<line text="A.method() running" />
-			<line text="advice running" />
-			<line text="T.m1() running" />
-			<line text="leave:main" />
-		</stdout>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw/callMunging/case2"
-	title="aggressive ltw - deca">
-	<compile files="A.java,T.java,Main.java,MarkerAnnotation.java"
-		outjar="classes.jar" options="-1.5" />
-	<compile files="X.java" outjar="aspects.jar"
-		classpath="classes.jar" options="-1.5 -Xlint:ignore" />
-	<run class="Main" ltw="aop.xml">
-		<stdout>
-			<line text="into:main" />
-			<line text="A.method() running" />
-			<line text="advice running" />
-			<line text="T.m1() running" />
-			<line text="leave:main" />
-		</stdout>
-	</run>
-</ajc-test>
-
-
-
-<!-- end of discarding type tests -->
-
-<ajc-test dir="ltw"
-	title="Define concrete sub-aspect using aop.xml" keywords="aop.xml">
-	<compile files="Main.java" outjar="main.jar">
-	</compile>
-	<!-- was in next section classpath="main1.jar" -->
-	<compile files="AbstractSuperAspect.aj" outjar="aspect.jar"
-		options="-1.4">
-	</compile>
-	<run class="Main" ltw="aop-defineaspect.xml">
-		<stdout>
-			<line text="Main.main" />
-			<line text="Main.test1" />
-			<line text="Main.test2" />
-		</stdout>
-		<stderr>
-			<line text="info AspectJ Weaver Version" />
-			<line text="info register classloader" />
-			<line text="info using" />
-			<line text="info define aspect ConcreteAspect" />
-			<line text="debug weaving 'ConcreteAspect'" />
-			<line text="debug generating class 'ConcreteAspect'" />
-			<line text="debug weaving 'Main'" />
-			<line text="AbstractSuperAspect.before_test1" />
-		</stderr>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw"
-	title="Use abstract aspect for ITD using aop.xml"
-	keywords="abstract aspect, ITD">
-	<compile files="TestITDMethod.java">
-	</compile>
-	<compile files="AbstractAspect.aj" options="-1.4">
-		<message kind="warning"
-			text="this affected type is not exposed to the weaver: TestITDMethod" />
-	</compile>
-	<run class="TestITDMethod" options="test"
-		ltw="aop-abstractaspect.xml">
-		<stdout>
-			<line text="TestITDMethod.main" />
-		</stdout>
-		<stderr>
-			<line
-				text="weaveinfo Type 'TestITDMethod' (TestITDMethod.java) has intertyped method from 'AbstractAspect' (AbstractAspect.aj:'void TestITDMethod.test()')" />
-			<line text="AbstractAspect_TestITDMethod.test" />
-		</stderr>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw"
-	title="Ensure a subset of inherited aspects is used for weaving"
-	keywords="aspects, include">
-	<compile files="Main.java" outjar="main.jar">
-	</compile>
-	<compile classpath="main.jar"
-		files="Aspect1.aj, Aspect2.aj, pakkage/Aspect3.aj"
-		outjar="aspects.jar" options="-outxml -1.4">
-	</compile>
-	<run class="Main" ltw="aop-aspectsinclude.xml">
-		<stdout>
-			<line text="Main.main" />
-			<line text="Main.test1" />
-			<line text="Main.test2" />
-		</stdout>
-		<stderr>
-			<line text="pakkage.Aspect3.before_test2" />
-		</stderr>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw"
-	title="Ensure weaver lint warning issued when an aspect is not used for weaving"
-	keywords="aspects, include, lint">
-	<compile files="Main.java" outjar="main.jar">
-	</compile>
-	<compile classpath="main.jar"
-		files="Aspect1.aj, Aspect2.aj, pakkage/Aspect3.aj"
-		outjar="aspects.jar" options="-outxml -1.4">
-	</compile>
-	<run class="Main" ltw="aop-aspectsincludewithlintwarning.xml">
-		<stdout>
-			<line text="Main.main" />
-			<line text="Main.test1" />
-			<line text="Main.test2" />
-		</stdout>
-		<stderr ordered="no">
-			<line
-				text="warning aspect Aspect1 exluded for class loader org.aspectj.weaver.loadtime.WeavingURLClassLoader [Xlint:aspectExcludedByConfiguration]" />
-			<line
-				text="warning aspect Aspect2 exluded for class loader org.aspectj.weaver.loadtime.WeavingURLClassLoader [Xlint:aspectExcludedByConfiguration]" />
-			<line text="pakkage.Aspect3.before_test2" />
-		</stderr>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw" title="Empty Xlint.properties file"
-	keywords="xlint, ltw">
-	<compile files="Main.java">
-	</compile>
-	<run class="Main" ltw="aop-xlintfile.xml"
-		xlintfile="Xlint-empty.properties">
-		<stderr>
-		</stderr>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw" title="Set Xset properties enabled"
-	keywords="xSet, ltw">
-	<compile files="Main.java,Aspect1.aj">
-	</compile>
-	<run class="Main" ltw="aop-xset-verbose.xml"
-		xlintfile="Xlint-empty.properties">
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw" title="Set Xset properties disabled"
-	keywords="xSet, ltw">
-	<compile files="Main.java,Aspect1.aj">
-	</compile>
-	<run class="Main" ltw="aop-xset-verbose.xml"
-		xlintfile="Xlint-empty.properties">
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw"
-	title="Warning with missing Xlint.properties file"
-	keywords="xlint, ltw">
-	<compile files="Main.java">
-	</compile>
-	<run class="Main" ltw="aop-xlintfile.xml">
-		<stderr>
-			<line
-				text="warning Cannot access resource for -Xlintfile:Xlint-empty.properties" />
-		</stderr>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw/hier"
-	title="separate compilation with ltw: declare parents and call"
-	keywords="ltw">
-	<compile files="util/A.aj,util/T.aj" />
-	<compile
-		files="child/Executor.aj,child/Advisor.aj,top/SimpleMain.aj"
-		options="-1.4">
-		<message kind="warning"
-			text="this affected type is not exposed to the weaver: util.A" />
-	</compile>
-	<run class="top.SimpleMain" ltw="aop-single.xml">
-		<stdout>
-			<line text="T call" />
-		</stdout>
-		<stderr>
-			<line
-				text="weaveinfo Join point 'method-call(void util.A.foo())' in Type 'child.Executor' (Executor.aj:18) advised by before advice from 'child.Advisor' (Advisor.aj:20)" />
-			<line
-				text="weaveinfo Extending interface set for type 'util.A' (A.aj) to include 'util.T' (Advisor.aj)" />
-			<line
-				text="weaveinfo Extending interface set for type 'child.Advisor' (Advisor.aj) to include 'util.T' (Advisor.aj)" />
-		</stderr>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw"
-	title="Warning when advice doesn't match suppressed for LTW"
-	keywords="xlint, ltw">
-	<compile files="Main.java">
-	</compile>
-	<compile files="Aspect3.aj" options="-1.4">
-	</compile>
-	<run class="Main" ltw="aop-nomatch.xml">
-		<stderr>
-			<line text="info AspectJ Weaver Version" />
-			<line text="info register classloader" />
-			<line text="info using" />
-			<line text="info register aspect Aspect3" />
-			<line text="debug weaving 'Main'" />
-		</stderr>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw"
-	title="Override suppressing of warning when advice doesn't match using -Xlintfile"
-	keywords="xlint, ltw">
-	<compile files="Main.java">
-	</compile>
-	<compile files="Aspect3.aj" options="-1.4">
-	</compile>
-	<run class="Main" ltw="aop-nomatchxlintfile.xml"
-		xlintfile="Xlint-nomatch.properties">
-		<stderr>
-			<line text="info AspectJ Weaver Version" />
-			<line text="info register classloader" />
-			<line text="info using" />
-			<line text="info register aspect Aspect3" />
-			<line text="can not build thisJoinPoint lazily for this advice" />
-			<line text="debug weaving 'Main'" />
-		</stderr>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw"
-	title="Warning when advice doesn't match using -Xlint:default"
-	keywords="xlint, ltw">
-	<compile files="Main.java">
-	</compile>
-	<compile files="Aspect3.aj" options="-1.4">
-	</compile>
-	<run class="Main" ltw="aop-nomatchxlint.xml">
-		<stderr>
-			<line text="info AspectJ Weaver Version" />
-			<line text="info register classloader" />
-			<line text="info using" />
-			<line text="info register aspect Aspect3" />
-			<line text="can not build thisJoinPoint lazily for this advice" />
-			<line text="debug weaving 'Main'" />
-		</stderr>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw"
-	title="Override suppressing of warning when advice doesn't match using -Xlint:warning"
-	keywords="xlint, ltw">
-	<compile files="Main.java">
-	</compile>
-	<compile files="Aspect3.aj" options="-1.4">
-	</compile>
-	<run class="Main" ltw="aop-nomatchxlint.xml">
-		<stderr>
-			<line text="info AspectJ Weaver Version" />
-			<line text="info register classloader" />
-			<line text="info using" />
-			<line text="info register aspect Aspect3" />
-			<line text="can not build thisJoinPoint lazily for this advice" />
-			<line text="debug weaving 'Main'" />
-		</stderr>
-	</run>
-</ajc-test>
-
-<!-- based on "Ensure 1st aspect is rewoven when weaving 2nd aspect" -->
-<ajc-test dir="ltw" title="Nonstandard jar file extensions"
-	pr="137235">
-	<compile files="folder.jar/Main.java, folder.jar/Aspect1.aj"
-		outjar="folder.jar/main1.zip" options="-showWeaveInfo -1.4">
-		<message kind="weave"
-			text="method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)" />
-	</compile>
-	<compile classpath="$sandbox/folder.jar/main1.zip"
-		files="Aspect2.aj" outjar="aspect2Jar" options="-showWeaveInfo -1.4">
-	</compile>
-	<run class="Main" ltw="aop-ltwreweavable.xml"
-		classpath="$sandbox/folder.jar/main1.zip,$sandbox/aspect2Jar">
-		<stdout>
-			<line text="Main.main" />
-			<line text="Main.test1" />
-			<line text="Main.test2" />
-		</stdout>
-		<stderr>
-			<line
-				text="weaveinfo Join point 'method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)" />
-			<line
-				text="weaveinfo Join point 'method-execution(void Main.test2())' in Type 'Main' (Main.java:21) advised by before advice from 'Aspect2' (Aspect2.aj:16)" />
-			<line text="Aspect1.before_test1" />
-			<line text="Aspect2.before_test2" />
-		</stderr>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw" title="Odd zip on classpath" pr="137235">
-	<compile files="folder.jar/Main.java, folder.jar/Aspect1.aj"
-		outjar="folder.jar/main1.archive" options="-showWeaveInfo">
-		<message kind="weave"
-			text="method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)" />
-	</compile>
-	<compile classpath="$sandbox/folder.jar/main1.archive"
-		files="Aspect2.aj" outjar="aspect2Jar" options="-showWeaveInfo -1.4">
-	</compile>
-	<run class="Main" ltw="aop-ltwreweavable.xml"
-		classpath="$sandbox/folder.jar/main1.archive,$sandbox/aspect2Jar">
-		<stdout>
-			<line text="Main.main" />
-			<line text="Main.test1" />
-			<line text="Main.test2" />
-		</stdout>
-		<stderr>
-			<line
-				text="weaveinfo Join point 'method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)" />
-			<line
-				text="weaveinfo Join point 'method-execution(void Main.test2())' in Type 'Main' (Main.java:21) advised by before advice from 'Aspect2' (Aspect2.aj:16)" />
-			<line text="Aspect1.before_test1" />
-			<line text="Aspect2.before_test2" />
-		</stderr>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw" title="JDK14 LTW with XML" keywords="ltw">
-	<compile files="HelloWorldWithException.java"
-		options="-outjar hello.jar" />
-	<compile files="ExceptionHandler.aj"
-		options="-outxml -outjar handler.jar -1.4" />
-	<ant file="ant.xml" target="JDK14 LTW with XML" verbose="true">
-		<stdout>
-			<line text="Hello World!" />
-		</stdout>
-		<stderr>
-			<line text="TraceFactory.instance=" />
-		</stderr>
-	</ant>
-</ajc-test>
-
-<ajc-test dir="ltw" title="JDK14 LTW with ASPECTPATH"
-	keywords="ltw">
-	<compile files="HelloWorldWithException.java"
-		options="-outjar hello.jar" />
-	<compile files="ExceptionHandler.aj"
-		options="-outjar handler.jar" />
-	<ant file="ant.xml" target="JDK14 LTW with ASPECTPATH"
-		verbose="true">
-		<stdout>
-			<line text="Hello World!" />
-		</stdout>
-		<stderr>
-			<line text="TraceFactory.instance=" />
-		</stderr>
-	</ant>
-</ajc-test>
-
-<ajc-test dir="ltw" title="TestServer with HelloWorld"
-	keywords="ltw,server">
-	<compile files="HelloWorldWithException.java"
-		options="-outjar hello.jar" />
-	<compile files="ExceptionHandler.aj"
-		options="-outxml -outjar handler.jar -1.4" />
-	<ant file="ant-server.xml" target="TestServer with HelloWorld"
-		verbose="true">
-		<stdout>
-			<line text="Starting ..." />
-			<line text="Running HelloWorld" />
-			<line text="Hello World!" />
-			<line text="Stopping ..." />
-		</stdout>
-	</ant>
-</ajc-test>
-<!-- <ajc-test dir="ltw" title="TestServer with Parent and Child" keywords="ltw,server"> 
-	<compile files="Parent.java" options="-outjar parent.jar"/> <compile files="Child.java" 
-	options="-classpath parent.jar -outjar child.jar"/> <ant file="ant-server.xml" 
-	target="TestServer with Parent and Child" verbose="true"> <stdout> <line 
-	text="Starting ..."/> <line text="Running Child"/> <line text="Parent"/> 
-	<line text="Child"/> <line text="Stopping ..."/> </stdout> </ant> </ajc-test> -->
-<ajc-test dir="ltw" title="TestServer with Parent and Child"
-	keywords="ltw,server">
-	<compile files="HelloWorldWithException.java"
-		options="-outjar child.jar" />
-	<compile files="ExceptionHandler.aj"
-		options="-outxml -outjar parent.jar -1.4" />
-	<ant file="ant-server.xml"
-		target="TestServer with Parent and Child" verbose="true">
-		<stdout>
-			<line text="Starting ..." />
-			<line text="Running HelloWorld" />
-			<line text="Hello World!" />
-			<line text="Stopping ..." />
-		</stdout>
-	</ant>
-</ajc-test>
-
-<ajc-test dir="ltw"
-	title="override default path using -Dorg.aspectj.weaver.loadtime.configuration"
-	keywords="ltw">
-	<compile files="HelloWorldWithException.java"
-		options="-outjar hello.jar" />
-	<compile files="ExceptionHandler.aj"
-		options="-outxml -outjar handler.jar -1.4" />
-	<compile files="Tracing.aj"
-		options="-outxml -outjar tracing.jar -1.4" />
-	<ant file="ant.xml"
-		target="override default path using -Dorg.aspectj.weaver.loadtime.configuration"
-		verbose="true">
-		<stdout>
-			<line text="Hello World!" />
-		</stdout>
-	</ant>
-</ajc-test>
-
-<ajc-test dir="ltw/inclExcl" title="Inclusion and patterns"
-	keywords="ltw">
-	<compile files="pkg/sub/Foo.aj, pkg/Main.aj"
-		options="-outjar base.jar" />
-	<compile files="tracing/Tracer.aj" options="-1.4" />
-	<run class="pkg.Main" ltw="aop-include.xml">
-		<stderr>
-			<line text="execution(void pkg.Main.foo())" />
-			<line text="Main.class" />
-		</stderr>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw/inclExcl" title="Exclusion and patterns"
-	keywords="ltw">
-	<compile files="pkg/sub/Foo.aj, pkg/Main.aj"
-		options="-outjar base.jar" />
-	<compile files="tracing/Tracer.aj" options="-1.4" />
-	<run class="pkg.Main" ltw="aop-exclude.xml">
-		<stderr>
-			<line text="execution(void pkg.sub.Foo.foo())" />
-		</stderr>
-	</run>
-</ajc-test>
-<ajc-test dir="ltw/inclExcl" title="And patterns aspects"
-	keywords="ltw">
-	<compile files="pkg/sub/Foo.aj, pkg/Main.aj"
-		options="-outjar base.jar" />
-	<compile
-		files="tracing/Tracer.aj, tracing/staticinit/Tracer.aj, tracing/staticinit/sub/Tracer.aj"
-		options="-1.4" />
-	<run class="pkg.Main" ltw="aop-aspectinclexcl.xml">
-		<stderr>
-			<line text="staticinitialization(pkg.Main.&lt;clinit&gt;)" />
-			<line text="staticinitialization(pkg.sub.Foo.&lt;clinit&gt;)" />
-		</stderr>
-	</run>
-</ajc-test>
-
-<ajc-test dir="ltw" title="simple LTW" keywords="ltw">
-	<compile files="HelloWorldWithException.java" />
-	<compile files="ExceptionHandler.aj" options="-outxml -1.4" />
-	<ant file="ant.xml" target="simple LTW" verbose="true">
-		<stdout>
-			<line text="Hello World!" />
-		</stdout>
-	</ant>
-</ajc-test>
-
-<ajc-test dir="ltw" title="dump on error" keywords="ltw">
-	<compile files="HelloWorldWithException.java" />
-	<compile files="ExceptionHandler.aj" options="-outxml -1.4" />
-	<ant file="ant.xml" target="dump on error" verbose="true">
-		<stdout>
-			<line text="Hello World!" />
-		</stdout>
-	</ant>
-</ajc-test>
-
-<ajc-test dir="bugs153/pr155033" title="multiple dump on error"
-	keywords="ltw">
-	<compile files="Annotation.java" options="-1.5" />
-	<compile
-		files="MultipleDumpTest.java, Class1.java, Class2.java, Class3.java"
-		options="-1.5" />
-	<compile files="Aspect.aj" options="-1.5 -outxml -Xlint:ignore" />
-	<!-- <run class="MultipleDumpTest" ltw="aop-multipledumponerror.xml"> <stdout> 
-		<line text="? AbortingMessageHandler.AbortingMessageHandler()"/> </stdout> 
-		</run> -->
-	<ant file="ant.xml" target="multiple dump on error" verbose="true">
-		<stdout>
-			<line text="? MultipleDumpTest.main()" />
-			<line text="? Class1.main()" />
-			<line text="? Aspect.before()" />
-			<line text="? Class2.main()" />
-			<line text="? Aspect.before()" />
-			<line text="? Class3.main()" />
-			<line text="? Aspect.before()" />
-		</stdout>
-	</ant>
-</ajc-test>
-    
-    
\ No newline at end of file
diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc150/ltw/ltw.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc150/ltw/ltw.xml
index 311872c09..936ec50d3 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc150/ltw/ltw.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/ajc150/ltw/ltw.xml
@@ -1,11 +1,677 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[
-<!ENTITY tests SYSTEM "../tests/src/org/aspectj/systemtest/ajc150/ltw/ltw-tests.xml">
-]>
+<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
 
 <!-- Load-time weaving tests -->
 
 <suite>
 
-&tests;
+<!-- Load-time weaving tests -->
+<ajc-test dir="ltw"
+	title="Ensure 1st aspect is rewoven when weaving 2nd aspect"
+	keywords="reweavable">
+	<compile files="Main.java, Aspect1.aj" outjar="main1.jar"
+		options="-showWeaveInfo -verbose -1.4">
+		<message kind="weave"
+			text="method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)" />
+	</compile>
+	<compile classpath="main1.jar" files="Aspect2.aj"
+		outjar="aspect2.jar" options="-showWeaveInfo -verbose -1.4">
+	</compile>
+	<run class="Main" ltw="aop-ltwreweavable.xml">
+		<stdout>
+			<line text="Main.main" />
+			<line text="Main.test1" />
+			<line text="Main.test2" />
+		</stdout>
+		<stderr>
+			<line
+				text="weaveinfo Join point 'method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)" />
+			<line
+				text="weaveinfo Join point 'method-execution(void Main.test2())' in Type 'Main' (Main.java:21) advised by before advice from 'Aspect2' (Aspect2.aj:16)" />
+			<line text="Aspect1.before_test1" />
+			<line text="Aspect2.before_test2" />
+		</stderr>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw"
+	title="Ensure valid aop.xml file is generated" keywords="-outxml">
+	<compile files="Main.java" outjar="main.jar">
+	</compile>
+	<compile classpath="main.jar"
+		files="Aspect1.aj, Aspect2.aj, pakkage/Aspect3.aj"
+		outxmlfile="META-INF/aop.xml" options="-1.4">
+	</compile>
+	<run class="Main" ltw="">
+		<stdout>
+			<line text="Main.main" />
+			<line text="Main.test1" />
+			<line text="Main.test2" />
+		</stdout>
+		<stderr>
+			<line text="Aspect1.before_test1" />
+			<line text="Aspect2.before_test2" />
+			<line text="pakkage.Aspect3.before_test2" />
+		</stderr>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw"
+	title="Ensure valid aop.xml is generated for -outjar"
+	keywords="-outxml">
+	<compile files="Main.java" outjar="main.jar">
+	</compile>
+	<compile classpath="main.jar"
+		files="Aspect1.aj, Aspect2.aj, pakkage/Aspect3.aj"
+		outjar="aspects.jar" options="-1.4 -outxml">
+	</compile>
+	<run class="Main" ltw="">
+		<stdout>
+			<line text="Main.main" />
+			<line text="Main.test1" />
+			<line text="Main.test2" />
+		</stdout>
+		<stderr>
+			<line text="Aspect1.before_test1" />
+			<line text="Aspect2.before_test2" />
+			<line text="pakkage.Aspect3.before_test2" />
+		</stderr>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw"
+	title="Ensure no weaving without visible aop.xml" keywords="reweavable">
+	<compile files="TestMain.java, Main.java">
+	</compile>
+	<run class="TestMain" ltw="">
+		<stdout>
+			<line text="Main.main" />
+			<line text="Main.test1" />
+			<line text="Main.test2" />
+		</stdout>
+		<stderr>
+			<line text="info AspectJ Weaver Version" />
+			<line
+				text="info register classloader org.aspectj.weaver.loadtime.WeavingURLClassLoader" />
+			<line
+				text="info no configuration found. Disabling weaver for class loader org.aspectj.weaver.loadtime.WeavingURLClassLoader" />
+		</stderr>
+	</run>
+</ajc-test>
+
+<!-- type discarding tests, investigating call munging -->
+
+<ajc-test dir="ltw/callMunging"
+	title="discarding woven types - 1">
+	<compile files="A.java,B.java,T.java,Main.java"
+		outjar="classes.jar" />
+	<compile files="X.java" outjar="aspects.jar"
+		classpath="classes.jar" options="-Xlint:ignore" />
+	<run class="Main" ltw="aop.xml">
+		<stdout>
+			<line text="into:main" />
+			<line text="A.method() running" />
+			<line text="advice running" />
+			<line text="T.m1() running" />
+			<line text="B.method() running" />
+			<line text="advice running" />
+			<line text="T.m2() running" />
+			<line text="leave:main" />
+		</stdout>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw/callMunging/case1"
+	title="aggressive ltw - decp">
+	<compile files="A.java,T.java,Main.java" outjar="classes.jar" />
+	<compile files="X.java" outjar="aspects.jar"
+		classpath="classes.jar" options="-Xlint:ignore" />
+	<run class="Main" ltw="aop.xml">
+		<stdout>
+			<line text="into:main" />
+			<line text="A.method() running" />
+			<line text="advice running" />
+			<line text="T.m1() running" />
+			<line text="leave:main" />
+		</stdout>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw/callMunging/case1"
+	title="aggressive ltw - decp - deactivate">
+	<compile files="A.java,T.java,Main.java" outjar="classes.jar" />
+	<compile files="X.java" outjar="aspects.jar"
+		classpath="classes.jar" options="-Xlint:ignore" />
+	<run class="Main" ltw="aop2.xml">
+		<stdout>
+			<line text="into:main" />
+			<line text="A.method() running" />
+			<line text="T.m1() running" />
+			<line text="leave:main" />
+		</stdout>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw/callMunging/case1"
+	title="aggressive ltw - hierarchy">
+	<compile files="T.java,HierMain.java" outjar="classes.jar" />
+	<compile files="A.java" outjar="sub.hiddenjar"
+		classpath="classes.jar" />
+	<compile files="X.java" outjar="aspects.jar"
+		classpath="classes.jar" options="-Xlint:ignore" />
+	<run class="HierMain" ltw="aop.xml">
+		<stdout>
+			<line text="into:main" />
+			<line text="A.method() running" />
+			<line text="advice running" />
+			<line text="T.m1() running" />
+			<line text="leave:main" />
+		</stdout>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw/callMunging/case3"
+	title="aggressive ltw - decp - 2">
+	<compile files="A.java,T.java,S.java,Main.java"
+		outjar="classes.jar" />
+	<compile files="X.java" outjar="aspects.jar"
+		classpath="classes.jar" options="-Xlint:ignore" />
+	<run class="Main" ltw="aop.xml">
+		<stdout>
+			<line text="into:main" />
+			<line text="A.method() running" />
+			<line text="advice running" />
+			<line text="T.m1() running" />
+			<line text="leave:main" />
+		</stdout>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw/callMunging/case2"
+	title="aggressive ltw - deca">
+	<compile files="A.java,T.java,Main.java,MarkerAnnotation.java"
+		outjar="classes.jar" options="-1.5" />
+	<compile files="X.java" outjar="aspects.jar"
+		classpath="classes.jar" options="-1.5 -Xlint:ignore" />
+	<run class="Main" ltw="aop.xml">
+		<stdout>
+			<line text="into:main" />
+			<line text="A.method() running" />
+			<line text="advice running" />
+			<line text="T.m1() running" />
+			<line text="leave:main" />
+		</stdout>
+	</run>
+</ajc-test>
+
+
+
+<!-- end of discarding type tests -->
+
+<ajc-test dir="ltw"
+	title="Define concrete sub-aspect using aop.xml" keywords="aop.xml">
+	<compile files="Main.java" outjar="main.jar">
+	</compile>
+	<!-- was in next section classpath="main1.jar" -->
+	<compile files="AbstractSuperAspect.aj" outjar="aspect.jar"
+		options="-1.4">
+	</compile>
+	<run class="Main" ltw="aop-defineaspect.xml">
+		<stdout>
+			<line text="Main.main" />
+			<line text="Main.test1" />
+			<line text="Main.test2" />
+		</stdout>
+		<stderr>
+			<line text="info AspectJ Weaver Version" />
+			<line text="info register classloader" />
+			<line text="info using" />
+			<line text="info define aspect ConcreteAspect" />
+			<line text="debug weaving 'ConcreteAspect'" />
+			<line text="debug generating class 'ConcreteAspect'" />
+			<line text="debug weaving 'Main'" />
+			<line text="AbstractSuperAspect.before_test1" />
+		</stderr>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw"
+	title="Use abstract aspect for ITD using aop.xml"
+	keywords="abstract aspect, ITD">
+	<compile files="TestITDMethod.java">
+	</compile>
+	<compile files="AbstractAspect.aj" options="-1.4">
+		<message kind="warning"
+			text="this affected type is not exposed to the weaver: TestITDMethod" />
+	</compile>
+	<run class="TestITDMethod" options="test"
+		ltw="aop-abstractaspect.xml">
+		<stdout>
+			<line text="TestITDMethod.main" />
+		</stdout>
+		<stderr>
+			<line
+				text="weaveinfo Type 'TestITDMethod' (TestITDMethod.java) has intertyped method from 'AbstractAspect' (AbstractAspect.aj:'void TestITDMethod.test()')" />
+			<line text="AbstractAspect_TestITDMethod.test" />
+		</stderr>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw"
+	title="Ensure a subset of inherited aspects is used for weaving"
+	keywords="aspects, include">
+	<compile files="Main.java" outjar="main.jar">
+	</compile>
+	<compile classpath="main.jar"
+		files="Aspect1.aj, Aspect2.aj, pakkage/Aspect3.aj"
+		outjar="aspects.jar" options="-outxml -1.4">
+	</compile>
+	<run class="Main" ltw="aop-aspectsinclude.xml">
+		<stdout>
+			<line text="Main.main" />
+			<line text="Main.test1" />
+			<line text="Main.test2" />
+		</stdout>
+		<stderr>
+			<line text="pakkage.Aspect3.before_test2" />
+		</stderr>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw"
+	title="Ensure weaver lint warning issued when an aspect is not used for weaving"
+	keywords="aspects, include, lint">
+	<compile files="Main.java" outjar="main.jar">
+	</compile>
+	<compile classpath="main.jar"
+		files="Aspect1.aj, Aspect2.aj, pakkage/Aspect3.aj"
+		outjar="aspects.jar" options="-outxml -1.4">
+	</compile>
+	<run class="Main" ltw="aop-aspectsincludewithlintwarning.xml">
+		<stdout>
+			<line text="Main.main" />
+			<line text="Main.test1" />
+			<line text="Main.test2" />
+		</stdout>
+		<stderr ordered="no">
+			<line
+				text="warning aspect Aspect1 exluded for class loader org.aspectj.weaver.loadtime.WeavingURLClassLoader [Xlint:aspectExcludedByConfiguration]" />
+			<line
+				text="warning aspect Aspect2 exluded for class loader org.aspectj.weaver.loadtime.WeavingURLClassLoader [Xlint:aspectExcludedByConfiguration]" />
+			<line text="pakkage.Aspect3.before_test2" />
+		</stderr>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw" title="Empty Xlint.properties file"
+	keywords="xlint, ltw">
+	<compile files="Main.java">
+	</compile>
+	<run class="Main" ltw="aop-xlintfile.xml"
+		xlintfile="Xlint-empty.properties">
+		<stderr>
+		</stderr>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw" title="Set Xset properties enabled"
+	keywords="xSet, ltw">
+	<compile files="Main.java,Aspect1.aj">
+	</compile>
+	<run class="Main" ltw="aop-xset-verbose.xml"
+		xlintfile="Xlint-empty.properties">
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw" title="Set Xset properties disabled"
+	keywords="xSet, ltw">
+	<compile files="Main.java,Aspect1.aj">
+	</compile>
+	<run class="Main" ltw="aop-xset-verbose.xml"
+		xlintfile="Xlint-empty.properties">
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw"
+	title="Warning with missing Xlint.properties file"
+	keywords="xlint, ltw">
+	<compile files="Main.java">
+	</compile>
+	<run class="Main" ltw="aop-xlintfile.xml">
+		<stderr>
+			<line
+				text="warning Cannot access resource for -Xlintfile:Xlint-empty.properties" />
+		</stderr>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw/hier"
+	title="separate compilation with ltw: declare parents and call"
+	keywords="ltw">
+	<compile files="util/A.aj,util/T.aj" />
+	<compile
+		files="child/Executor.aj,child/Advisor.aj,top/SimpleMain.aj"
+		options="-1.4">
+		<message kind="warning"
+			text="this affected type is not exposed to the weaver: util.A" />
+	</compile>
+	<run class="top.SimpleMain" ltw="aop-single.xml">
+		<stdout>
+			<line text="T call" />
+		</stdout>
+		<stderr>
+			<line
+				text="weaveinfo Join point 'method-call(void util.A.foo())' in Type 'child.Executor' (Executor.aj:18) advised by before advice from 'child.Advisor' (Advisor.aj:20)" />
+			<line
+				text="weaveinfo Extending interface set for type 'util.A' (A.aj) to include 'util.T' (Advisor.aj)" />
+			<line
+				text="weaveinfo Extending interface set for type 'child.Advisor' (Advisor.aj) to include 'util.T' (Advisor.aj)" />
+		</stderr>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw"
+	title="Warning when advice doesn't match suppressed for LTW"
+	keywords="xlint, ltw">
+	<compile files="Main.java">
+	</compile>
+	<compile files="Aspect3.aj" options="-1.4">
+	</compile>
+	<run class="Main" ltw="aop-nomatch.xml">
+		<stderr>
+			<line text="info AspectJ Weaver Version" />
+			<line text="info register classloader" />
+			<line text="info using" />
+			<line text="info register aspect Aspect3" />
+			<line text="debug weaving 'Main'" />
+		</stderr>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw"
+	title="Override suppressing of warning when advice doesn't match using -Xlintfile"
+	keywords="xlint, ltw">
+	<compile files="Main.java">
+	</compile>
+	<compile files="Aspect3.aj" options="-1.4">
+	</compile>
+	<run class="Main" ltw="aop-nomatchxlintfile.xml"
+		xlintfile="Xlint-nomatch.properties">
+		<stderr>
+			<line text="info AspectJ Weaver Version" />
+			<line text="info register classloader" />
+			<line text="info using" />
+			<line text="info register aspect Aspect3" />
+			<line text="can not build thisJoinPoint lazily for this advice" />
+			<line text="debug weaving 'Main'" />
+		</stderr>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw"
+	title="Warning when advice doesn't match using -Xlint:default"
+	keywords="xlint, ltw">
+	<compile files="Main.java">
+	</compile>
+	<compile files="Aspect3.aj" options="-1.4">
+	</compile>
+	<run class="Main" ltw="aop-nomatchxlint.xml">
+		<stderr>
+			<line text="info AspectJ Weaver Version" />
+			<line text="info register classloader" />
+			<line text="info using" />
+			<line text="info register aspect Aspect3" />
+			<line text="can not build thisJoinPoint lazily for this advice" />
+			<line text="debug weaving 'Main'" />
+		</stderr>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw"
+	title="Override suppressing of warning when advice doesn't match using -Xlint:warning"
+	keywords="xlint, ltw">
+	<compile files="Main.java">
+	</compile>
+	<compile files="Aspect3.aj" options="-1.4">
+	</compile>
+	<run class="Main" ltw="aop-nomatchxlint.xml">
+		<stderr>
+			<line text="info AspectJ Weaver Version" />
+			<line text="info register classloader" />
+			<line text="info using" />
+			<line text="info register aspect Aspect3" />
+			<line text="can not build thisJoinPoint lazily for this advice" />
+			<line text="debug weaving 'Main'" />
+		</stderr>
+	</run>
+</ajc-test>
+
+<!-- based on "Ensure 1st aspect is rewoven when weaving 2nd aspect" -->
+<ajc-test dir="ltw" title="Nonstandard jar file extensions"
+	pr="137235">
+	<compile files="folder.jar/Main.java, folder.jar/Aspect1.aj"
+		outjar="folder.jar/main1.zip" options="-showWeaveInfo -1.4">
+		<message kind="weave"
+			text="method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)" />
+	</compile>
+	<compile classpath="$sandbox/folder.jar/main1.zip"
+		files="Aspect2.aj" outjar="aspect2Jar" options="-showWeaveInfo -1.4">
+	</compile>
+	<run class="Main" ltw="aop-ltwreweavable.xml"
+		classpath="$sandbox/folder.jar/main1.zip,$sandbox/aspect2Jar">
+		<stdout>
+			<line text="Main.main" />
+			<line text="Main.test1" />
+			<line text="Main.test2" />
+		</stdout>
+		<stderr>
+			<line
+				text="weaveinfo Join point 'method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)" />
+			<line
+				text="weaveinfo Join point 'method-execution(void Main.test2())' in Type 'Main' (Main.java:21) advised by before advice from 'Aspect2' (Aspect2.aj:16)" />
+			<line text="Aspect1.before_test1" />
+			<line text="Aspect2.before_test2" />
+		</stderr>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw" title="Odd zip on classpath" pr="137235">
+	<compile files="folder.jar/Main.java, folder.jar/Aspect1.aj"
+		outjar="folder.jar/main1.archive" options="-showWeaveInfo">
+		<message kind="weave"
+			text="method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)" />
+	</compile>
+	<compile classpath="$sandbox/folder.jar/main1.archive"
+		files="Aspect2.aj" outjar="aspect2Jar" options="-showWeaveInfo -1.4">
+	</compile>
+	<run class="Main" ltw="aop-ltwreweavable.xml"
+		classpath="$sandbox/folder.jar/main1.archive,$sandbox/aspect2Jar">
+		<stdout>
+			<line text="Main.main" />
+			<line text="Main.test1" />
+			<line text="Main.test2" />
+		</stdout>
+		<stderr>
+			<line
+				text="weaveinfo Join point 'method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)" />
+			<line
+				text="weaveinfo Join point 'method-execution(void Main.test2())' in Type 'Main' (Main.java:21) advised by before advice from 'Aspect2' (Aspect2.aj:16)" />
+			<line text="Aspect1.before_test1" />
+			<line text="Aspect2.before_test2" />
+		</stderr>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw" title="JDK14 LTW with XML" keywords="ltw">
+	<compile files="HelloWorldWithException.java"
+		options="-outjar hello.jar" />
+	<compile files="ExceptionHandler.aj"
+		options="-outxml -outjar handler.jar -1.4" />
+	<ant file="ant.xml" target="JDK14 LTW with XML" verbose="true">
+		<stdout>
+			<line text="Hello World!" />
+		</stdout>
+		<stderr>
+			<line text="TraceFactory.instance=" />
+		</stderr>
+	</ant>
+</ajc-test>
+
+<ajc-test dir="ltw" title="JDK14 LTW with ASPECTPATH"
+	keywords="ltw">
+	<compile files="HelloWorldWithException.java"
+		options="-outjar hello.jar" />
+	<compile files="ExceptionHandler.aj"
+		options="-outjar handler.jar" />
+	<ant file="ant.xml" target="JDK14 LTW with ASPECTPATH"
+		verbose="true">
+		<stdout>
+			<line text="Hello World!" />
+		</stdout>
+		<stderr>
+			<line text="TraceFactory.instance=" />
+		</stderr>
+	</ant>
+</ajc-test>
+
+<ajc-test dir="ltw" title="TestServer with HelloWorld"
+	keywords="ltw,server">
+	<compile files="HelloWorldWithException.java"
+		options="-outjar hello.jar" />
+	<compile files="ExceptionHandler.aj"
+		options="-outxml -outjar handler.jar -1.4" />
+	<ant file="ant-server.xml" target="TestServer with HelloWorld"
+		verbose="true">
+		<stdout>
+			<line text="Starting ..." />
+			<line text="Running HelloWorld" />
+			<line text="Hello World!" />
+			<line text="Stopping ..." />
+		</stdout>
+	</ant>
+</ajc-test>
+<!-- <ajc-test dir="ltw" title="TestServer with Parent and Child" keywords="ltw,server"> 
+	<compile files="Parent.java" options="-outjar parent.jar"/> <compile files="Child.java" 
+	options="-classpath parent.jar -outjar child.jar"/> <ant file="ant-server.xml" 
+	target="TestServer with Parent and Child" verbose="true"> <stdout> <line 
+	text="Starting ..."/> <line text="Running Child"/> <line text="Parent"/> 
+	<line text="Child"/> <line text="Stopping ..."/> </stdout> </ant> </ajc-test> -->
+<ajc-test dir="ltw" title="TestServer with Parent and Child"
+	keywords="ltw,server">
+	<compile files="HelloWorldWithException.java"
+		options="-outjar child.jar" />
+	<compile files="ExceptionHandler.aj"
+		options="-outxml -outjar parent.jar -1.4" />
+	<ant file="ant-server.xml"
+		target="TestServer with Parent and Child" verbose="true">
+		<stdout>
+			<line text="Starting ..." />
+			<line text="Running HelloWorld" />
+			<line text="Hello World!" />
+			<line text="Stopping ..." />
+		</stdout>
+	</ant>
+</ajc-test>
+
+<ajc-test dir="ltw"
+	title="override default path using -Dorg.aspectj.weaver.loadtime.configuration"
+	keywords="ltw">
+	<compile files="HelloWorldWithException.java"
+		options="-outjar hello.jar" />
+	<compile files="ExceptionHandler.aj"
+		options="-outxml -outjar handler.jar -1.4" />
+	<compile files="Tracing.aj"
+		options="-outxml -outjar tracing.jar -1.4" />
+	<ant file="ant.xml"
+		target="override default path using -Dorg.aspectj.weaver.loadtime.configuration"
+		verbose="true">
+		<stdout>
+			<line text="Hello World!" />
+		</stdout>
+	</ant>
+</ajc-test>
+
+<ajc-test dir="ltw/inclExcl" title="Inclusion and patterns"
+	keywords="ltw">
+	<compile files="pkg/sub/Foo.aj, pkg/Main.aj"
+		options="-outjar base.jar" />
+	<compile files="tracing/Tracer.aj" options="-1.4" />
+	<run class="pkg.Main" ltw="aop-include.xml">
+		<stderr>
+			<line text="execution(void pkg.Main.foo())" />
+			<line text="Main.class" />
+		</stderr>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw/inclExcl" title="Exclusion and patterns"
+	keywords="ltw">
+	<compile files="pkg/sub/Foo.aj, pkg/Main.aj"
+		options="-outjar base.jar" />
+	<compile files="tracing/Tracer.aj" options="-1.4" />
+	<run class="pkg.Main" ltw="aop-exclude.xml">
+		<stderr>
+			<line text="execution(void pkg.sub.Foo.foo())" />
+		</stderr>
+	</run>
+</ajc-test>
+<ajc-test dir="ltw/inclExcl" title="And patterns aspects"
+	keywords="ltw">
+	<compile files="pkg/sub/Foo.aj, pkg/Main.aj"
+		options="-outjar base.jar" />
+	<compile
+		files="tracing/Tracer.aj, tracing/staticinit/Tracer.aj, tracing/staticinit/sub/Tracer.aj"
+		options="-1.4" />
+	<run class="pkg.Main" ltw="aop-aspectinclexcl.xml">
+		<stderr>
+			<line text="staticinitialization(pkg.Main.&lt;clinit&gt;)" />
+			<line text="staticinitialization(pkg.sub.Foo.&lt;clinit&gt;)" />
+		</stderr>
+	</run>
+</ajc-test>
+
+<ajc-test dir="ltw" title="simple LTW" keywords="ltw">
+	<compile files="HelloWorldWithException.java" />
+	<compile files="ExceptionHandler.aj" options="-outxml -1.4" />
+	<ant file="ant.xml" target="simple LTW" verbose="true">
+		<stdout>
+			<line text="Hello World!" />
+		</stdout>
+	</ant>
+</ajc-test>
+
+<ajc-test dir="ltw" title="dump on error" keywords="ltw">
+	<compile files="HelloWorldWithException.java" />
+	<compile files="ExceptionHandler.aj" options="-outxml -1.4" />
+	<ant file="ant.xml" target="dump on error" verbose="true">
+		<stdout>
+			<line text="Hello World!" />
+		</stdout>
+	</ant>
+</ajc-test>
+
+<ajc-test dir="bugs153/pr155033" title="multiple dump on error"
+	keywords="ltw">
+	<compile files="Annotation.java" options="-1.5" />
+	<compile
+		files="MultipleDumpTest.java, Class1.java, Class2.java, Class3.java"
+		options="-1.5" />
+	<compile files="Aspect.aj" options="-1.5 -outxml -Xlint:ignore" />
+	<!-- <run class="MultipleDumpTest" ltw="aop-multipledumponerror.xml"> <stdout> 
+		<line text="? AbortingMessageHandler.AbortingMessageHandler()"/> </stdout> 
+		</run> -->
+	<ant file="ant.xml" target="multiple dump on error" verbose="true">
+		<stdout>
+			<line text="? MultipleDumpTest.main()" />
+			<line text="? Class1.main()" />
+			<line text="? Aspect.before()" />
+			<line text="? Class2.main()" />
+			<line text="? Aspect.before()" />
+			<line text="? Class3.main()" />
+			<line text="? Aspect.before()" />
+		</stdout>
+	</ant>
+</ajc-test>
+    
+    
 
 </suite>
diff --git a/tests/src/test/resources/org/aspectj/systemtest/aspectpath/aspectpath-tests.xml b/tests/src/test/resources/org/aspectj/systemtest/aspectpath/aspectpath-tests.xml
deleted file mode 100644
index 5f201b355..000000000
--- a/tests/src/test/resources/org/aspectj/systemtest/aspectpath/aspectpath-tests.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<!-- Aspectpath Tests -->
-
-    <!-- .................................... aspectpath tests -->
-	<!-- The jars used by this test can be regenerated with
-	     org.aspectj.ajdt.core/testsrc/org.aspectj.ajdt.internal.compiler.batch.BcweaverJarMaker
-	-->
-    <ajc-test dir="new/options11" 
-      comment="XXX not validated correct yet"
-      title="testing new options">
-        <compile files="Main.java,injar.jar,Aspect.java" 
-            aspectpath="aspectlib1.jar,aspectlib2.jar"/>
-        <!-- can't run until we support classpath including the above jars
-        <run class="Main"/>
-        -->
-    </ajc-test>
-    
-	<ajc-test dir="new/interfaceLibrary"
-		title="aspect-declared interface members in libraries - baseline">
-		<compile files="lib/LibraryInterface.java,
-						Client.java,
-						LibraryAspect.java"/>
-		<run class="Client"/>
-		</ajc-test>
-		
-	<ajc-test dir="new/interfaceLibrary"
-		comment="prove that LibraryAspect is required"
-		title="aspect-declared interface members in libraries - interfaceOnly.jar">
-		<compile 
-			files="Client.java" 
-			aspectpath="interfaceOnly.jar">
-			<message kind="error" line="5"/>
-			</compile>
-		</ajc-test>
-
-	<ajc-test dir="new/interfaceLibrary"
-		title="aspect-declared interface members in libraries - aspectOnly.jar">
-		<compile 
-			files="lib/LibraryInterface.java,
-					Client.java" 
-			aspectpath="aspectOnly.jar"/>
-		<run class="Client"/>
-		</ajc-test>
-		
-	<ajc-test dir="new/interfaceLibrary"
-		title="aspect-declared interface members in libraries - aspectedInterfaceOnly.jar"
-		comment="prove aspect is required even if interface is woven"
-		>
-		<compile 
-			files="Client.java" 
-			classpath="aspectedInterfaceOnly.jar">
-			<message kind="error" line="0" text="LibraryAspect"/>
-			<message kind="error" line="9" text="LibraryInterface"/>
-			</compile>
-		</ajc-test>
-
-	<ajc-test dir="new/interfaceLibrary"
-		title="aspect-declared interface members in libraries - aspectedInterfaceOnly.jar,aspectOnly.jar"
-		comment="weaving required for implementations of interface? 
-		         XXX Would prefer to support javac compiles of Client here, mimicked with classpath only"
-		>
-		<compile 
-			files="Client.java" 
-			classpath="aspectedInterfaceOnly.jar,aspectOnly.jar">
-			<message kind="error" line="9"/>
-			</compile>
-		</ajc-test>
-
-	<ajc-test dir="new/interfaceLibrary"
-		title="aspect-declared interface members in libraries - aspectedInterfaceOnlyBinary.jar,aspectOnly.jar"
-		comment="works if aspect is only on the classpath?, i.e., no weaving XXX need javac run"
-		>
-		<compile 
-			files="Client.java" 
-			classpath="aspectedInterfaceOnlyBinary.jar,aspectOnly.jar">
-			<message kind="error" line="9"/>
-			</compile>
-		</ajc-test>
-
-	<ajc-test dir="new/interfaceLibrary"
-		title="aspect-declared interface members in libraries - aspectedInterfaceOnly.jar,aspectpath=aspectOnly.jar"
-		comment="can weave to create library, and then weave clients"
-		>
-		<compile 
-			files="Client.java" 
-			classpath="aspectedInterfaceOnly.jar"
-			aspectpath="aspectOnly.jar"/>
-		<run class="Client"/>
-		</ajc-test>
-
-	<ajc-test dir="new/interfaceLibrary"
-		title="aspect-declared interface members in libraries - aspectedInterfaceOnly.jar,aspectpath=aspectOnly.jar"
-		comment="works if source aspect and binary classpath woven with aspect? 
-		         should NOT warn about affected type not since affected type is already woven?"
-		>
-		<compile 
-			files="Client.java,LibraryAspect.java" 
-			classpath="aspectedInterfaceOnly.jar"/>
-			
-		<run class="Client"/>
-		</ajc-test>
-
-	<ajc-test 
-		dir="bugs/interfaceLibrary"
-		title="exception clause for aspect-declared interface methods - positive">
-		<compile files="Client.java,LibraryAspect.java,lib/LibraryInterface.java" options="-Xlint:ignore"/>
-		<run class="Client"/>
-		</ajc-test>
-
-	<ajc-test 
-		dir="bugs/interfaceLibrary"
-		title="exception clause for aspect-declared interface methods - negative">
-		<compile files="ClientCE.java,LibraryAspect.java,lib/LibraryInterface.java">
-			<message kind="error" file="ClientCE.java" line="5"/>
-		</compile>
-		</ajc-test>
-
-	<ajc-test 
-		dir="bugs/interfaceLibrary"
-		title="exception clause for aspect-declared class methods - positive">
-		<compile files="ClassClient.java,LibraryClassAspect.java,lib/LibraryClass.java" options="-Xlint:ignore"/>
-		<run class="ClassClient"/>
-		</ajc-test>
-
-	<ajc-test 
-		dir="bugs/interfaceLibrary"
-		title="exception clause for aspect-declared class methods - negative">
-		<compile files="ClassClientCE.java,LibraryClassAspect.java,lib/LibraryClass.java">
-			<message kind="error" file="ClassClientCE.java" line="5"/>
-			</compile>
-		</ajc-test>
-		
-	<ajc-test dir="bugs/interfaceLibrary"
-		pr="41175"
-		title="exception clause for aspect-declared interface methods - positive binary">
-		<compile files="Client.java" aspectpath="lib.jar" options="-Xlint:ignore"/>
-		<run class="Client"/>
-		</ajc-test>
-
-	<ajc-test dir="bugs/interfaceLibrary"
-		pr="41175"
-		title="exception clause for aspect-declared interface methods - negative binary">
-		<compile files="ClientCE.java" aspectpath="lib.jar">
-			<message kind="error" file="ClientCE.java" line="5"/>
-			</compile>
-		</ajc-test>
-
-	<ajc-test dir="bugs/interfaceLibrary"
-		pr="41175"
-		title="exception clause for aspect-declared class methods - positive binary">
-		<compile files="ClassClient.java" aspectpath="libClass.jar" options="-Xlint:ignore"/>
-		<run class="ClassClient"/>
-		</ajc-test>
-
-	<ajc-test dir="bugs/interfaceLibrary"
-		pr="41175"
-		title="exception clause for aspect-declared class methods - negative binary">
-		<compile files="ClassClientCE.java" aspectpath="libClass.jar">
-			<message kind="error" file="ClassClientCE.java" line="5"/>
-			</compile>
-	</ajc-test>
-	
-		<ajc-test dir="bugs/perCflowAndJar"
-		pr="41359"
-		title="percflow aspects compiled from jars share one instance for all entry points">
-		<compile files="PerCFlowCompileFromJar.java,PerCFlowCompileFromJarTest.java"/>
-		<run class="PerCFlowCompileFromJarTest"/>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/perCflowAndJar"
-		pr="41359"
-		title="(using aspectpath) percflow aspects compiled from jars share one instance for all entry points">
-		<compile files="PerCFlowCompileFromJarTest.java"
-				aspectpath="lib.jar"/>
-		<run class="PerCFlowCompileFromJarTest"/>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/abstractMethods" pr="49784"
-   	 title="Introduced abstract method on abstract class not implemented by subtype">
-        <compile files="abstractClass/C.java"
-        		 aspectpath="abstractClass/jars/AandB.jar">
-            <message kind="error" line="1"/>
-        </compile>
-    </ajc-test>
-
-	<ajc-test dir="bugs/abstractMethods" pr="49784"
-   	 title="Introduced abstract method on interface not implemented by subtype (aspectpath)">
-        <compile files="interface/C.java"
-        		 aspectpath="interface/jars/AandB.jar" />
-        <run class="C"/>
-    </ajc-test>
-    
-	
diff --git a/tests/src/test/resources/org/aspectj/systemtest/aspectpath/aspectpath.xml b/tests/src/test/resources/org/aspectj/systemtest/aspectpath/aspectpath.xml
index ba587fe9e..92be7503c 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/aspectpath/aspectpath.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/aspectpath/aspectpath.xml
@@ -1,12 +1,198 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[
-<!ENTITY tests SYSTEM "../tests/src/org/aspectj/systemtest/aspectpath/aspectpath-tests.xml">
-]>
-
-<!-- Aspectpath Tests -->
+<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
 
 <suite>
 
-&tests;
+    <!-- .................................... aspectpath tests -->
+	<!-- The jars used by this test can be regenerated with
+	     org.aspectj.ajdt.core/testsrc/org.aspectj.ajdt.internal.compiler.batch.BcweaverJarMaker
+	-->
+    <ajc-test dir="new/options11" 
+      comment="XXX not validated correct yet"
+      title="testing new options">
+        <compile files="Main.java,injar.jar,Aspect.java" 
+            aspectpath="aspectlib1.jar,aspectlib2.jar"/>
+        <!-- can't run until we support classpath including the above jars
+        <run class="Main"/>
+        -->
+    </ajc-test>
+    
+	<ajc-test dir="new/interfaceLibrary"
+		title="aspect-declared interface members in libraries - baseline">
+		<compile files="lib/LibraryInterface.java,
+						Client.java,
+						LibraryAspect.java"/>
+		<run class="Client"/>
+		</ajc-test>
+		
+	<ajc-test dir="new/interfaceLibrary"
+		comment="prove that LibraryAspect is required"
+		title="aspect-declared interface members in libraries - interfaceOnly.jar">
+		<compile 
+			files="Client.java" 
+			aspectpath="interfaceOnly.jar">
+			<message kind="error" line="5"/>
+			</compile>
+		</ajc-test>
+
+	<ajc-test dir="new/interfaceLibrary"
+		title="aspect-declared interface members in libraries - aspectOnly.jar">
+		<compile 
+			files="lib/LibraryInterface.java,
+					Client.java" 
+			aspectpath="aspectOnly.jar"/>
+		<run class="Client"/>
+		</ajc-test>
+		
+	<ajc-test dir="new/interfaceLibrary"
+		title="aspect-declared interface members in libraries - aspectedInterfaceOnly.jar"
+		comment="prove aspect is required even if interface is woven"
+		>
+		<compile 
+			files="Client.java" 
+			classpath="aspectedInterfaceOnly.jar">
+			<message kind="error" line="0" text="LibraryAspect"/>
+			<message kind="error" line="9" text="LibraryInterface"/>
+			</compile>
+		</ajc-test>
+
+	<ajc-test dir="new/interfaceLibrary"
+		title="aspect-declared interface members in libraries - aspectedInterfaceOnly.jar,aspectOnly.jar"
+		comment="weaving required for implementations of interface? 
+		         XXX Would prefer to support javac compiles of Client here, mimicked with classpath only"
+		>
+		<compile 
+			files="Client.java" 
+			classpath="aspectedInterfaceOnly.jar,aspectOnly.jar">
+			<message kind="error" line="9"/>
+			</compile>
+		</ajc-test>
+
+	<ajc-test dir="new/interfaceLibrary"
+		title="aspect-declared interface members in libraries - aspectedInterfaceOnlyBinary.jar,aspectOnly.jar"
+		comment="works if aspect is only on the classpath?, i.e., no weaving XXX need javac run"
+		>
+		<compile 
+			files="Client.java" 
+			classpath="aspectedInterfaceOnlyBinary.jar,aspectOnly.jar">
+			<message kind="error" line="9"/>
+			</compile>
+		</ajc-test>
+
+	<ajc-test dir="new/interfaceLibrary"
+		title="aspect-declared interface members in libraries - aspectedInterfaceOnly.jar,aspectpath=aspectOnly.jar"
+		comment="can weave to create library, and then weave clients"
+		>
+		<compile 
+			files="Client.java" 
+			classpath="aspectedInterfaceOnly.jar"
+			aspectpath="aspectOnly.jar"/>
+		<run class="Client"/>
+		</ajc-test>
+
+	<ajc-test dir="new/interfaceLibrary"
+		title="aspect-declared interface members in libraries - aspectedInterfaceOnly.jar,aspectpath=aspectOnly.jar"
+		comment="works if source aspect and binary classpath woven with aspect? 
+		         should NOT warn about affected type not since affected type is already woven?"
+		>
+		<compile 
+			files="Client.java,LibraryAspect.java" 
+			classpath="aspectedInterfaceOnly.jar"/>
+			
+		<run class="Client"/>
+		</ajc-test>
+
+	<ajc-test 
+		dir="bugs/interfaceLibrary"
+		title="exception clause for aspect-declared interface methods - positive">
+		<compile files="Client.java,LibraryAspect.java,lib/LibraryInterface.java" options="-Xlint:ignore"/>
+		<run class="Client"/>
+		</ajc-test>
+
+	<ajc-test 
+		dir="bugs/interfaceLibrary"
+		title="exception clause for aspect-declared interface methods - negative">
+		<compile files="ClientCE.java,LibraryAspect.java,lib/LibraryInterface.java">
+			<message kind="error" file="ClientCE.java" line="5"/>
+		</compile>
+		</ajc-test>
+
+	<ajc-test 
+		dir="bugs/interfaceLibrary"
+		title="exception clause for aspect-declared class methods - positive">
+		<compile files="ClassClient.java,LibraryClassAspect.java,lib/LibraryClass.java" options="-Xlint:ignore"/>
+		<run class="ClassClient"/>
+		</ajc-test>
+
+	<ajc-test 
+		dir="bugs/interfaceLibrary"
+		title="exception clause for aspect-declared class methods - negative">
+		<compile files="ClassClientCE.java,LibraryClassAspect.java,lib/LibraryClass.java">
+			<message kind="error" file="ClassClientCE.java" line="5"/>
+			</compile>
+		</ajc-test>
+		
+	<ajc-test dir="bugs/interfaceLibrary"
+		pr="41175"
+		title="exception clause for aspect-declared interface methods - positive binary">
+		<compile files="Client.java" aspectpath="lib.jar" options="-Xlint:ignore"/>
+		<run class="Client"/>
+		</ajc-test>
+
+	<ajc-test dir="bugs/interfaceLibrary"
+		pr="41175"
+		title="exception clause for aspect-declared interface methods - negative binary">
+		<compile files="ClientCE.java" aspectpath="lib.jar">
+			<message kind="error" file="ClientCE.java" line="5"/>
+			</compile>
+		</ajc-test>
+
+	<ajc-test dir="bugs/interfaceLibrary"
+		pr="41175"
+		title="exception clause for aspect-declared class methods - positive binary">
+		<compile files="ClassClient.java" aspectpath="libClass.jar" options="-Xlint:ignore"/>
+		<run class="ClassClient"/>
+		</ajc-test>
+
+	<ajc-test dir="bugs/interfaceLibrary"
+		pr="41175"
+		title="exception clause for aspect-declared class methods - negative binary">
+		<compile files="ClassClientCE.java" aspectpath="libClass.jar">
+			<message kind="error" file="ClassClientCE.java" line="5"/>
+			</compile>
+	</ajc-test>
+	
+		<ajc-test dir="bugs/perCflowAndJar"
+		pr="41359"
+		title="percflow aspects compiled from jars share one instance for all entry points">
+		<compile files="PerCFlowCompileFromJar.java,PerCFlowCompileFromJarTest.java"/>
+		<run class="PerCFlowCompileFromJarTest"/>
+	</ajc-test>
+	
+	<ajc-test dir="bugs/perCflowAndJar"
+		pr="41359"
+		title="(using aspectpath) percflow aspects compiled from jars share one instance for all entry points">
+		<compile files="PerCFlowCompileFromJarTest.java"
+				aspectpath="lib.jar"/>
+		<run class="PerCFlowCompileFromJarTest"/>
+	</ajc-test>
+	
+	<ajc-test dir="bugs/abstractMethods" pr="49784"
+   	 title="Introduced abstract method on abstract class not implemented by subtype">
+        <compile files="abstractClass/C.java"
+        		 aspectpath="abstractClass/jars/AandB.jar">
+            <message kind="error" line="1"/>
+        </compile>
+    </ajc-test>
+
+	<ajc-test dir="bugs/abstractMethods" pr="49784"
+   	 title="Introduced abstract method on interface not implemented by subtype (aspectpath)">
+        <compile files="interface/C.java"
+        		 aspectpath="interface/jars/AandB.jar" />
+        <run class="C"/>
+    </ajc-test>
+    
+	
+
 
 </suite>
 
diff --git a/tests/src/test/resources/org/aspectj/systemtest/base/baseTests-tests.xml b/tests/src/test/resources/org/aspectj/systemtest/base/baseTests-tests.xml
deleted file mode 100644
index b47682f51..000000000
--- a/tests/src/test/resources/org/aspectj/systemtest/base/baseTests-tests.xml
+++ /dev/null
@@ -1,266 +0,0 @@
-<!-- Base Tests -->
-
-    <ajc-test dir="base/test100"
-      title="static and non-static before methods -- one file"
-      keywords="from-base">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test101"
-      title="static and non-static before methods -- many files"
-      keywords="from-base">
-        <compile files="Driver.java,Foo.java,Bar.java,Pos.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test102"
-      title="this redirection in non-static before methods" keywords="from-base">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test103" title="DEPRECATED: introductions"
-      keywords="from-base">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test104" title="before constructors -- one file"
-      keywords="from-base">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test105"
-      title="advise weaves find methods typed to builtins or non-woven classes"
-      keywords="from-base">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test106"
-      title="make sure new weaves work inside of packages" keywords="from-base">
-        <compile files="Driver.java,pkg/Obj.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test107"
-      title="make sure new weaves work inside of packages (again)"
-      keywords="from-base">
-        <compile
-          files="Driver.java,C1.java,C2.java,pack1/Foo.java,pack2/Foo.java,pack3/Foo.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test108"
-      title="Inheritance of class and aspect vars in weaves"
-      keywords="from-base">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test109"
-      title="Accessibility of class and aspect members from inside weaves"
-      keywords="from-base">
-        <compile files="Driver.java,Aspect.java,Foo.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test110"
-      title="Packaged aspects referring to packaged classes"
-      keywords="from-base">
-        <compile files="Driver.java,pAspect/Aspect.java,pClass/Class.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test111"
-      title="Inheritance of methods advised by aspects" keywords="from-base">
-        <compile
-          files="Driver.java,SubClass.java,SuperClass.java,SuperAspect.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test112" title="Inherited weaves on constructor"
-      keywords="from-base">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test113" title="Initializers in Aspect and Class Bodies"
-      keywords="from-base">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test114"
-      title="Weaver Resolution of method names in method calls passed as args"
-      keywords="from-base">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test115"
-      title="DEPRECATED: Introduce constructor with class inheritance"
-      keywords="from-base">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test116"
-      title="empty and singular patterns on modifiers and throws"
-      keywords="from-base">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test118" title="DEPRECATED: Introduce of constructors"
-      keywords="from-base">
-        <compile files="Driver.java">
-          <message kind="warning" line="54" text="[Xlint:noExplicitConstructorCall]"/>
-          <message kind="warning" line="57" text="[Xlint:noExplicitConstructorCall]"/>
-        </compile>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test119" title="Local declarations in advise bodies"
-      keywords="from-base">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-
-    <ajc-test dir="base/test121"
-      title="advises on introduced methods and constructors"
-      keywords="from-base">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test122"
-      title="DEPRECATED: Method introduction into interface implemented by abstract class"
-      keywords="from-base">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test123" title="Crossing super calls in constructors"
-      keywords="from-base">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test124" title="empty modifier pattern"
-      keywords="from-base">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test125"
-      title="Alpha conversion of argument names in designators"
-      keywords="from-base">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test127"
-      title="advice uses its own formals to get actuals" keywords="from-base">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test128"
-      title="DEPRECATED:  introduce weaves can use this" keywords="from-base">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test129"
-      title="DEPRECATED: introduce of abstract methods works"
-      keywords="from-base">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test130"
-      title="multiple arounds successfully intercept and return own values"
-      keywords="from-base">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test132"
-      title="proper matching of overloaded constructors" keywords="from-base">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test134"
-      title="proper handling of formals in catch advice" keywords="from-base">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test135"
-      title="proper values for thisJoinPoint attributes" keywords="from-base">
-        <compile
-          files="Driver.java,JoinPointFields.java,TopFoo.java,pack/PackFoo.java,pack/JoinPointFields.java,pack/PackJoinPointFields.java"/>
-        <run class="test135.Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test136" title="supers, supers, supers"
-      keywords="from-base">
-        <compile files="Driver.java" options="-1.4"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test137"
-      title="operations on private and protected aspect members (++, -- in partciular)"
-      keywords="from-base">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test138" title="only register things once"
-      keywords="from-base">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test139" title="inner aspects and around"
-      keywords="from-base">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test140"
-      title="aspect inheritance and advice, introduction" keywords="from-base">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test141" title="thisResultObject for primitives"
-      keywords="from-base">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test142" title="introductions calling super."
-      keywords="from-base">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test143" pr="384"
-      title="allow one argument calls even when there's a comma in the arglist"
-      keywords="from-base">
-        <compile files="OneArgCallsIsOkay.java"/>
-        <run class="OneArgCallsIsOkay"/>
-    </ajc-test>
-
-    <ajc-test dir="base/test144"
-      title="advice on calls to static methods even works when called on super"
-      keywords="from-base">
-        <compile files="SuperStaticCallJoinPoint.java"/>
-        <run class="SuperStaticCallJoinPoint"/>
-    </ajc-test>
diff --git a/tests/src/test/resources/org/aspectj/systemtest/base/baseTests.xml b/tests/src/test/resources/org/aspectj/systemtest/base/baseTests.xml
index 420567395..7001a763f 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/base/baseTests.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/base/baseTests.xml
@@ -1,10 +1,270 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[
-<!ENTITY tests SYSTEM "../tests/src/org/aspectj/systemtest/base/baseTests-tests.xml">
-]>
-<!-- Base Tests -->
-
+<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
 <suite>
 
-&tests;
+    <ajc-test dir="base/test100"
+      title="static and non-static before methods -- one file"
+      keywords="from-base">
+        <compile files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test101"
+      title="static and non-static before methods -- many files"
+      keywords="from-base">
+        <compile files="Driver.java,Foo.java,Bar.java,Pos.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test102"
+      title="this redirection in non-static before methods" keywords="from-base">
+        <compile files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test103" title="DEPRECATED: introductions"
+      keywords="from-base">
+        <compile files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test104" title="before constructors -- one file"
+      keywords="from-base">
+        <compile files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test105"
+      title="advise weaves find methods typed to builtins or non-woven classes"
+      keywords="from-base">
+        <compile files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test106"
+      title="make sure new weaves work inside of packages" keywords="from-base">
+        <compile files="Driver.java,pkg/Obj.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test107"
+      title="make sure new weaves work inside of packages (again)"
+      keywords="from-base">
+        <compile
+          files="Driver.java,C1.java,C2.java,pack1/Foo.java,pack2/Foo.java,pack3/Foo.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test108"
+      title="Inheritance of class and aspect vars in weaves"
+      keywords="from-base">
+        <compile files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test109"
+      title="Accessibility of class and aspect members from inside weaves"
+      keywords="from-base">
+        <compile files="Driver.java,Aspect.java,Foo.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test110"
+      title="Packaged aspects referring to packaged classes"
+      keywords="from-base">
+        <compile files="Driver.java,pAspect/Aspect.java,pClass/Class.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test111"
+      title="Inheritance of methods advised by aspects" keywords="from-base">
+        <compile
+          files="Driver.java,SubClass.java,SuperClass.java,SuperAspect.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test112" title="Inherited weaves on constructor"
+      keywords="from-base">
+        <compile files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test113" title="Initializers in Aspect and Class Bodies"
+      keywords="from-base">
+        <compile files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test114"
+      title="Weaver Resolution of method names in method calls passed as args"
+      keywords="from-base">
+        <compile files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test115"
+      title="DEPRECATED: Introduce constructor with class inheritance"
+      keywords="from-base">
+        <compile files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test116"
+      title="empty and singular patterns on modifiers and throws"
+      keywords="from-base">
+        <compile files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test118" title="DEPRECATED: Introduce of constructors"
+      keywords="from-base">
+        <compile files="Driver.java">
+          <message kind="warning" line="54" text="[Xlint:noExplicitConstructorCall]"/>
+          <message kind="warning" line="57" text="[Xlint:noExplicitConstructorCall]"/>
+        </compile>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test119" title="Local declarations in advise bodies"
+      keywords="from-base">
+        <compile files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+
+    <ajc-test dir="base/test121"
+      title="advises on introduced methods and constructors"
+      keywords="from-base">
+        <compile files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test122"
+      title="DEPRECATED: Method introduction into interface implemented by abstract class"
+      keywords="from-base">
+        <compile files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test123" title="Crossing super calls in constructors"
+      keywords="from-base">
+        <compile files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test124" title="empty modifier pattern"
+      keywords="from-base">
+        <compile files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test125"
+      title="Alpha conversion of argument names in designators"
+      keywords="from-base">
+        <compile files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test127"
+      title="advice uses its own formals to get actuals" keywords="from-base">
+        <compile files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test128"
+      title="DEPRECATED:  introduce weaves can use this" keywords="from-base">
+        <compile files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test129"
+      title="DEPRECATED: introduce of abstract methods works"
+      keywords="from-base">
+        <compile files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test130"
+      title="multiple arounds successfully intercept and return own values"
+      keywords="from-base">
+        <compile files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test132"
+      title="proper matching of overloaded constructors" keywords="from-base">
+        <compile files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test134"
+      title="proper handling of formals in catch advice" keywords="from-base">
+        <compile files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test135"
+      title="proper values for thisJoinPoint attributes" keywords="from-base">
+        <compile
+          files="Driver.java,JoinPointFields.java,TopFoo.java,pack/PackFoo.java,pack/JoinPointFields.java,pack/PackJoinPointFields.java"/>
+        <run class="test135.Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test136" title="supers, supers, supers"
+      keywords="from-base">
+        <compile files="Driver.java" options="-1.4"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test137"
+      title="operations on private and protected aspect members (++, -- in partciular)"
+      keywords="from-base">
+        <compile files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test138" title="only register things once"
+      keywords="from-base">
+        <compile files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test139" title="inner aspects and around"
+      keywords="from-base">
+        <compile files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test140"
+      title="aspect inheritance and advice, introduction" keywords="from-base">
+        <compile files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test141" title="thisResultObject for primitives"
+      keywords="from-base">
+        <compile files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test142" title="introductions calling super."
+      keywords="from-base">
+        <compile files="Driver.java"/>
+        <run class="Driver"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test143" pr="384"
+      title="allow one argument calls even when there's a comma in the arglist"
+      keywords="from-base">
+        <compile files="OneArgCallsIsOkay.java"/>
+        <run class="OneArgCallsIsOkay"/>
+    </ajc-test>
+
+    <ajc-test dir="base/test144"
+      title="advice on calls to static methods even works when called on super"
+      keywords="from-base">
+        <compile files="SuperStaticCallJoinPoint.java"/>
+        <run class="SuperStaticCallJoinPoint"/>
+    </ajc-test>
+
 
 </suite>    
\ No newline at end of file
diff --git a/tests/src/test/resources/org/aspectj/systemtest/design/design.xml b/tests/src/test/resources/org/aspectj/systemtest/design/design.xml
index 51cc93173..1d4f6f34a 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/design/design.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/design/design.xml
@@ -1,11 +1,112 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd" [
-<!ENTITY designTests SYSTEM "../tests/src/org/aspectj/systemtest/design/designtest.xml">
-]>
-
+<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd" []>
 <!-- Language Design Tests -->
-
 <suite>
+    <ajc-test dir="design/intro"
+      title="initial tests for new introduction style" keywords="from-design">
+        <compile files="Simple.java"/>
+        <run class="Simple"/>
+    </ajc-test>
+
+    <ajc-test dir="design/intro"
+      title="overriding of introduced methods and accessibility"
+      keywords="from-design">
+        <compile files="Overriding.java"/>
+        <run class="Overriding"/>
+    </ajc-test>
+
+    <ajc-test dir="design/intro"
+      title="within and introductions behaves correctly" keywords="from-design">
+        <compile files="Within.java" options="-1.4"/>
+        <run class="Within"/>
+    </ajc-test>
+
+    <ajc-test dir="design/intro" pr="570"
+      title="correct inheritance of multiple concrete methods"
+      keywords="from-design">
+        <compile files="MultiInheritCP.java"/>
+        <run class="MultiInheritCP"/>
+    </ajc-test>
+
+    <ajc-test dir="design/intro" pr="570"
+      title="errors in inheritance of multiple concrete methods"
+      keywords="from-design">
+        <compile files="MultiInheritCF.java">
+<!-- the error is:       error at java\lang\Object.java::0 can't override int I2.toString() with java.lang.String java.lang.Object.toString() return types don't match-->
+			<message kind="error" line="0"/>
+			<message kind="error" line="17"/>
+			<message kind="error" line="18"/>
+            <message kind="error" line="21"/>
+            <message kind="error" line="41"/>
+            <message kind="error" line="42"/>
+            <message kind="error" line="43"/>
+            <message kind="error" line="45"/>
+            <message kind="error" line="46"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="design/intro"
+      title="declared exceptions are checked correctly on intros (errors)">
+        <compile files="ExceptionsCF.java">
+            <message kind="error" line="8"/>
+            <message kind="error" line="23"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="design/intro"
+      title="declared exceptions are checked correctly on intros">
+      <compile files="ExceptionsCP.java">
+      </compile>
+        <run class="ExceptionsCP"/>
+    </ajc-test>
+
+    <ajc-test dir="design/reflect"
+      title="Joinpoint is not created for foo(String) when before() advice is present."
+      keywords="from-design">
+        <compile files="SimpleAround1.java"/>
+        <run class="SimpleAround1"/>
+    </ajc-test>
+
+    <ajc-test dir="design/eachobject"
+      title="more tests of eachobject with some difficult typing issues"
+      keywords="from-design">
+        <compile files="Tricky3.java" options="-1.4"/>
+        <run class="Tricky3"/>
+    </ajc-test>
+
+    <ajc-test dir="design/eachobject"
+      title="eachobject: eachobject(receptions(...)) [eachobject]"
+      keywords="from-design">
+        <compile files="Tricky1.java"/>
+        <run class="Tricky1"/>
+    </ajc-test>
+
+    <ajc-test dir="design/reflect" title="Checking new joinpoints"
+      keywords="from-design">
+        <compile files="Coverage.java" options="-Xlint:ignore"/>
+        <run class="Coverage"/>
+    </ajc-test>
+
+    <ajc-test dir="design/eachobject"
+      title="eachobject: simple test [eachobject] (still)"
+      keywords="from-design">
+        <compile files="Simple.java"/>
+        <run class="Simple"/>
+    </ajc-test>
+
+    <ajc-test dir="design/intro"
+      title="scope issues with introduction (needs more work)"
+      keywords="from-design">
+        <compile files="p1/ScopeIssues.java,p1/C1.java"/>
+        <run class="p1.ScopeIssues"/>
+    </ajc-test>
+
+<!-- uncomment this test if we decide to implement 42743 
+	<ajc-test dir="design/soft" pr="42743"
+		title="declare soft limitation">
+		<compile files="DeclareSoft.aj"/>
+		<run class="DeclareSoft"/>
+	</ajc-test>
+-->
 
-&designTests;
 
 </suite>
\ No newline at end of file
diff --git a/tests/src/test/resources/org/aspectj/systemtest/design/designtest.xml b/tests/src/test/resources/org/aspectj/systemtest/design/designtest.xml
deleted file mode 100644
index 21be1943c..000000000
--- a/tests/src/test/resources/org/aspectj/systemtest/design/designtest.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-    <ajc-test dir="design/intro"
-      title="initial tests for new introduction style" keywords="from-design">
-        <compile files="Simple.java"/>
-        <run class="Simple"/>
-    </ajc-test>
-
-    <ajc-test dir="design/intro"
-      title="overriding of introduced methods and accessibility"
-      keywords="from-design">
-        <compile files="Overriding.java"/>
-        <run class="Overriding"/>
-    </ajc-test>
-
-    <ajc-test dir="design/intro"
-      title="within and introductions behaves correctly" keywords="from-design">
-        <compile files="Within.java" options="-1.4"/>
-        <run class="Within"/>
-    </ajc-test>
-
-    <ajc-test dir="design/intro" pr="570"
-      title="correct inheritance of multiple concrete methods"
-      keywords="from-design">
-        <compile files="MultiInheritCP.java"/>
-        <run class="MultiInheritCP"/>
-    </ajc-test>
-
-    <ajc-test dir="design/intro" pr="570"
-      title="errors in inheritance of multiple concrete methods"
-      keywords="from-design">
-        <compile files="MultiInheritCF.java">
-<!-- the error is:       error at java\lang\Object.java::0 can't override int I2.toString() with java.lang.String java.lang.Object.toString() return types don't match-->
-			<message kind="error" line="0"/>
-			<message kind="error" line="17"/>
-			<message kind="error" line="18"/>
-            <message kind="error" line="21"/>
-            <message kind="error" line="41"/>
-            <message kind="error" line="42"/>
-            <message kind="error" line="43"/>
-            <message kind="error" line="45"/>
-            <message kind="error" line="46"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="design/intro"
-      title="declared exceptions are checked correctly on intros (errors)">
-        <compile files="ExceptionsCF.java">
-            <message kind="error" line="8"/>
-            <message kind="error" line="23"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="design/intro"
-      title="declared exceptions are checked correctly on intros">
-      <compile files="ExceptionsCP.java">
-      </compile>
-        <run class="ExceptionsCP"/>
-    </ajc-test>
-
-    <ajc-test dir="design/reflect"
-      title="Joinpoint is not created for foo(String) when before() advice is present."
-      keywords="from-design">
-        <compile files="SimpleAround1.java"/>
-        <run class="SimpleAround1"/>
-    </ajc-test>
-
-    <ajc-test dir="design/eachobject"
-      title="more tests of eachobject with some difficult typing issues"
-      keywords="from-design">
-        <compile files="Tricky3.java" options="-1.4"/>
-        <run class="Tricky3"/>
-    </ajc-test>
-
-    <ajc-test dir="design/eachobject"
-      title="eachobject: eachobject(receptions(...)) [eachobject]"
-      keywords="from-design">
-        <compile files="Tricky1.java"/>
-        <run class="Tricky1"/>
-    </ajc-test>
-
-    <ajc-test dir="design/reflect" title="Checking new joinpoints"
-      keywords="from-design">
-        <compile files="Coverage.java" options="-Xlint:ignore"/>
-        <run class="Coverage"/>
-    </ajc-test>
-
-    <ajc-test dir="design/eachobject"
-      title="eachobject: simple test [eachobject] (still)"
-      keywords="from-design">
-        <compile files="Simple.java"/>
-        <run class="Simple"/>
-    </ajc-test>
-
-    <ajc-test dir="design/intro"
-      title="scope issues with introduction (needs more work)"
-      keywords="from-design">
-        <compile files="p1/ScopeIssues.java,p1/C1.java"/>
-        <run class="p1.ScopeIssues"/>
-    </ajc-test>
-
-<!-- uncomment this test if we decide to implement 42743 
-	<ajc-test dir="design/soft" pr="42743"
-		title="declare soft limitation">
-		<compile files="DeclareSoft.aj"/>
-		<run class="DeclareSoft"/>
-	</ajc-test>
--->
diff --git a/tests/src/test/resources/org/aspectj/systemtest/incremental/model/incremental-model-tests.xml b/tests/src/test/resources/org/aspectj/systemtest/incremental/model/incremental-model-tests.xml
deleted file mode 100644
index ae9e6be31..000000000
--- a/tests/src/test/resources/org/aspectj/systemtest/incremental/model/incremental-model-tests.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-<!-- 
-     In order for these tests to pass you have to flip this flag to true:
-       AsmManager.attemptIncrementalModelRepairs
-       
-     If you want to debug the output from the tests, you might want uncomment
-     the static initializer in AsmManager which will enable you to collect
-     detailed information on model processing.
--->
-
-<!-- 
-     These tests utilise the inc-compile test harness option but I've extended it
-     with a checkModel option which enables me to check information about the model
-     after a incremental compilation step.
--->
-
-<!--
-	asm relationships for inter type declarations are tricky things.  
-	Today, because type mungers don't remember where they came from in attribute form, 
-	the relationships for ITDs are created during source compilation.  When building incrementally,
-	we are really doing a binary weave of 'everything else' with the source for the file that
-	has changed.  In this case the relationships for ITDs are not added.  This makes managing
-	them incrementally in the model rather tough!
-	
-	The solution is to make them remember where they came from.  This would mean we can create
-	the relationships during weave time and so they will be created when either doing a 
-	source compilation or a binary weave.  The support is in ResolvedTypeMunger to remember
-	where they came from (you just have to flick a switch) but I haven't switched it on
-	because we need to version *all* aspectj attributes properly so that we don't end up with 
-	a migration nightmare.  If ITD attributes remembered their location in a particular version
-	of AspectJ then everyone would need to recompile their code from source with that version.
-	If we keep changing the attributes, we keep having this problem.  If we include a *version*
-	number in every attribute we can make the compiler more robust to coping with 'old' attributes
-	that might be missing certain options or values.
-	
-	Hence the first test here is not complete...
-	
--->
-    <ajc-test dir="incremental/model/introduction" 
-    	title="Testing incremental structure model: Intertype declarations (and a declare parents)" 
-    	keywords="incremental-test,model-test" >
-        <compile staging="true" options="-incremental,-emacssym -Xlint:ignore" sourceroots="src"/>
-        <inc-compile tag="20"/> <!-- Just 'touched' one file -->
-        <inc-compile tag="30"/> <!-- Just 'touched another aspect -->
-     </ajc-test>
-     
-	 <ajc-test dir="incremental/model/intertype" 
-    	title="Testing incremental structure model: Intertype field declarations" 
-    	keywords="incremental-test,model-test" >
-        <compile staging="true" options="-incremental,-emacssym" sourceroots="src"/>
-        <inc-compile tag="20" checkModel="inter-type field=2,RelationshipMapSize=3"/> <!-- BetaA intertypes int i and String s -->
-        <inc-compile tag="30" checkModel="inter-type field=1,RelationshipMapSize=2"/> <!-- BetaA takes the String intertype away -->
-     </ajc-test>
-     
-	<ajc-test dir="incremental/model/weaving2" 
-    	title="Testing incremental structure model: Weaving handlers" 
-    	keywords="incremental-test,model-test" >
-        <compile staging="true" options="-incremental,-emacssym, -XnotReweavable" sourceroots="src"/>
-        <inc-compile tag="20" checkModel="code=1,advice=1,RelationshipMapSize=2"/> <!-- BetaA has a new piece of handler advice added -->
-        <inc-compile tag="30" checkModel="code=1,advice=2,RelationshipMapSize=3"/> <!-- secondary.GammaA added, also advises the same handler -->
-        <inc-compile tag="40" checkModel="code=1,advice=1,RelationshipMapSize=2"/> <!-- primary.BetaA deleted -->
-    </ajc-test>
-    
-	<ajc-test dir="incremental/model/weaving" 
-    	title="Testing incremental structure model: Weaving" 
-    	keywords="incremental-test,model-test" >
-        <compile staging="true" options="-incremental,-emacssym" sourceroots="src"/>
-        <inc-compile tag="20" checkModel="code=2,advice=2,java source file=3,RelationshipMapSize=4"/> <!-- BetaA has a new piece of advice added -->
-        <inc-compile tag="30" checkModel="code=1,advice=1,RelationshipMapSize=2"/> <!-- BetaA has a piece of advice removed -->
-        <inc-compile tag="40" checkModel="code=0,RelationshipMapSize=0,advice=0"/> <!-- BetaA other piece of advice removed (now empty) -->
-    </ajc-test>
-
-
-    <ajc-test dir="incremental/model/sourcefiles_updating" 
-    	title="Testing incremental structure model: Updating files"
-    	keywords="incremental-test,model-test" >
-        <compile staging="true" options="-incremental,-emacssym,-Xset:minimalModel=false,-1.4" sourceroots="src"/>
-        <!-- On first compile, 5 source files in model, 'root','Alpha','Beta','Gamma','Delta' -->
-        <inc-compile tag="20" checkModel="java source file=5,method=4,class=3,FileMapSize=4"/> <!-- Beta changed, method added -->
-        <inc-compile tag="30" checkModel="java source file=5,method=4,class=4,advice=1"/> <!-- Delta changed, class added -->
-        <inc-compile tag="40" checkModel="advice=2"/> <!-- Gamma changed, advice added -->
-        <inc-compile tag="50" checkModel="advice=2,pointcut=1"/> <!-- Gamma changed, pointcut added -->
-        <inc-compile tag="60" checkModel="advice=0,pointcut=1"/> <!-- Gamma changed, both advice removed -->
-	</ajc-test>
-	
-	<ajc-test dir="incremental/model/sourcefiles_addremove" 
-    	title="Testing incremental structure model: Adding and removing files" 
-    	keywords="incremental-test,model-test" >
-        <compile staging="true" options="-incremental,-emacssym, -XnotReweavable,-Xset:minimalModel=false" sourceroots="src"/>
-        <!-- On first compile, two source files in model, 'root' and 'Alpha' -->
-        <inc-compile tag="20" checkModel="java source file=3,FileMapSize=2"/> <!-- Adds primary.Beta class -->   
-        <inc-compile tag="30" checkModel="java source file=4"/> <!-- Adds secondary.Gamma aspect -->
-        <inc-compile tag="40" checkModel="java source file=5,package=2,FileMapSize=4"/> <!-- Adds seconday.Delta class -->
-        <inc-compile tag="50" checkModel="java source file=4,package=2"/> <!-- Deletes Gamma aspect -->
-        <inc-compile tag="60" checkModel="java source file=2,FileMapSize=1"/> <!-- Deletes Beta and Delta classes -->
-    </ajc-test>
-       
\ No newline at end of file
diff --git a/tests/src/test/resources/org/aspectj/systemtest/incremental/model/incremental-model.xml b/tests/src/test/resources/org/aspectj/systemtest/incremental/model/incremental-model.xml
index 1768ea102..48b36b1eb 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/incremental/model/incremental-model.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/incremental/model/incremental-model.xml
@@ -1,10 +1,102 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[
-<!ENTITY tests SYSTEM "../tests/src/org/aspectj/systemtest/incremental/model/incremental-model-tests.xml">
-]>
+<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
 <!-- Incremental structure model compilation Tests -->
-
 <suite>
 
-&tests;	
+<!-- 
+     In order for these tests to pass you have to flip this flag to true:
+       AsmManager.attemptIncrementalModelRepairs
+       
+     If you want to debug the output from the tests, you might want uncomment
+     the static initializer in AsmManager which will enable you to collect
+     detailed information on model processing.
+-->
+
+<!-- 
+     These tests utilise the inc-compile test harness option but I've extended it
+     with a checkModel option which enables me to check information about the model
+     after a incremental compilation step.
+-->
+
+<!--
+	asm relationships for inter type declarations are tricky things.  
+	Today, because type mungers don't remember where they came from in attribute form, 
+	the relationships for ITDs are created during source compilation.  When building incrementally,
+	we are really doing a binary weave of 'everything else' with the source for the file that
+	has changed.  In this case the relationships for ITDs are not added.  This makes managing
+	them incrementally in the model rather tough!
+	
+	The solution is to make them remember where they came from.  This would mean we can create
+	the relationships during weave time and so they will be created when either doing a 
+	source compilation or a binary weave.  The support is in ResolvedTypeMunger to remember
+	where they came from (you just have to flick a switch) but I haven't switched it on
+	because we need to version *all* aspectj attributes properly so that we don't end up with 
+	a migration nightmare.  If ITD attributes remembered their location in a particular version
+	of AspectJ then everyone would need to recompile their code from source with that version.
+	If we keep changing the attributes, we keep having this problem.  If we include a *version*
+	number in every attribute we can make the compiler more robust to coping with 'old' attributes
+	that might be missing certain options or values.
+	
+	Hence the first test here is not complete...
+	
+-->
+    <ajc-test dir="incremental/model/introduction" 
+    	title="Testing incremental structure model: Intertype declarations (and a declare parents)" 
+    	keywords="incremental-test,model-test" >
+        <compile staging="true" options="-incremental,-emacssym -Xlint:ignore" sourceroots="src"/>
+        <inc-compile tag="20"/> <!-- Just 'touched' one file -->
+        <inc-compile tag="30"/> <!-- Just 'touched another aspect -->
+     </ajc-test>
+     
+	 <ajc-test dir="incremental/model/intertype" 
+    	title="Testing incremental structure model: Intertype field declarations" 
+    	keywords="incremental-test,model-test" >
+        <compile staging="true" options="-incremental,-emacssym" sourceroots="src"/>
+        <inc-compile tag="20" checkModel="inter-type field=2,RelationshipMapSize=3"/> <!-- BetaA intertypes int i and String s -->
+        <inc-compile tag="30" checkModel="inter-type field=1,RelationshipMapSize=2"/> <!-- BetaA takes the String intertype away -->
+     </ajc-test>
+     
+	<ajc-test dir="incremental/model/weaving2" 
+    	title="Testing incremental structure model: Weaving handlers" 
+    	keywords="incremental-test,model-test" >
+        <compile staging="true" options="-incremental,-emacssym, -XnotReweavable" sourceroots="src"/>
+        <inc-compile tag="20" checkModel="code=1,advice=1,RelationshipMapSize=2"/> <!-- BetaA has a new piece of handler advice added -->
+        <inc-compile tag="30" checkModel="code=1,advice=2,RelationshipMapSize=3"/> <!-- secondary.GammaA added, also advises the same handler -->
+        <inc-compile tag="40" checkModel="code=1,advice=1,RelationshipMapSize=2"/> <!-- primary.BetaA deleted -->
+    </ajc-test>
+    
+	<ajc-test dir="incremental/model/weaving" 
+    	title="Testing incremental structure model: Weaving" 
+    	keywords="incremental-test,model-test" >
+        <compile staging="true" options="-incremental,-emacssym" sourceroots="src"/>
+        <inc-compile tag="20" checkModel="code=2,advice=2,java source file=3,RelationshipMapSize=4"/> <!-- BetaA has a new piece of advice added -->
+        <inc-compile tag="30" checkModel="code=1,advice=1,RelationshipMapSize=2"/> <!-- BetaA has a piece of advice removed -->
+        <inc-compile tag="40" checkModel="code=0,RelationshipMapSize=0,advice=0"/> <!-- BetaA other piece of advice removed (now empty) -->
+    </ajc-test>
+
+
+    <ajc-test dir="incremental/model/sourcefiles_updating" 
+    	title="Testing incremental structure model: Updating files"
+    	keywords="incremental-test,model-test" >
+        <compile staging="true" options="-incremental,-emacssym,-Xset:minimalModel=false,-1.4" sourceroots="src"/>
+        <!-- On first compile, 5 source files in model, 'root','Alpha','Beta','Gamma','Delta' -->
+        <inc-compile tag="20" checkModel="java source file=5,method=4,class=3,FileMapSize=4"/> <!-- Beta changed, method added -->
+        <inc-compile tag="30" checkModel="java source file=5,method=4,class=4,advice=1"/> <!-- Delta changed, class added -->
+        <inc-compile tag="40" checkModel="advice=2"/> <!-- Gamma changed, advice added -->
+        <inc-compile tag="50" checkModel="advice=2,pointcut=1"/> <!-- Gamma changed, pointcut added -->
+        <inc-compile tag="60" checkModel="advice=0,pointcut=1"/> <!-- Gamma changed, both advice removed -->
+	</ajc-test>
+	
+	<ajc-test dir="incremental/model/sourcefiles_addremove" 
+    	title="Testing incremental structure model: Adding and removing files" 
+    	keywords="incremental-test,model-test" >
+        <compile staging="true" options="-incremental,-emacssym, -XnotReweavable,-Xset:minimalModel=false" sourceroots="src"/>
+        <!-- On first compile, two source files in model, 'root' and 'Alpha' -->
+        <inc-compile tag="20" checkModel="java source file=3,FileMapSize=2"/> <!-- Adds primary.Beta class -->   
+        <inc-compile tag="30" checkModel="java source file=4"/> <!-- Adds secondary.Gamma aspect -->
+        <inc-compile tag="40" checkModel="java source file=5,package=2,FileMapSize=4"/> <!-- Adds seconday.Delta class -->
+        <inc-compile tag="50" checkModel="java source file=4,package=2"/> <!-- Deletes Gamma aspect -->
+        <inc-compile tag="60" checkModel="java source file=2,FileMapSize=1"/> <!-- Deletes Beta and Delta classes -->
+    </ajc-test>
+       
 
 </suite>
\ No newline at end of file
diff --git a/tests/src/test/resources/org/aspectj/systemtest/inpath/inpath-tests.xml b/tests/src/test/resources/org/aspectj/systemtest/inpath/inpath-tests.xml
deleted file mode 100644
index 46fe869c1..000000000
--- a/tests/src/test/resources/org/aspectj/systemtest/inpath/inpath-tests.xml
+++ /dev/null
@@ -1,297 +0,0 @@
-<!-- InPath Tests -->
-
-    <!-- .................................... -injars tests -->
-
-    <ajc-test dir="options/injars/simple" 
-      title="source for options -injars">
-        <compile files="Simple.java,Main.java"/>
-        <run class="Main"/>
-    </ajc-test>
- 
-    <ajc-test dir="options/injars/simple" 
-      title="options -injars">
-        <compile files="Simple.java,main.jar"
-        	options="!eclipse"/>
-        <run class="Main"/>
-    </ajc-test>
-
-    
-    <ajc-test dir="options/injars/simple"  pr="35865"
-      title="options -injars checking declare parents interactions">
-        <compile files="DecParents.java,main.jar"
-        	options="!eclipse"/>
-        <run class="DecParents"/>
-    </ajc-test>
-    
-  <ajc-test dir="new/options11"  pr="36329"
-   	  comment="the line number might change, we're really interested only in the files here"
-      title="The compiler crashes when using aspect libraries created without using -terminateAfterCompile">
-        <compile files="Main.java,injar.jar,Aspect.java,aspectlib1.jar,aspectlib2.jar">
-            <message kind="error" line="0"/>
-        </compile>
-   </ajc-test>
- 
-    <ajc-test dir="new/binaryWarnings/src" pr="37020"
-   	 title="declare warnings on main">
-        <compile files="aspects/MainWarnings.java,app/Main.java">
-        	<message line="4"  text="staticinitialization(Main)" kind="warning" file="app/Main.java" />
-        	<message line="6"  text="set(String Main.staticString)" kind="warning" file="app/Main.java" />
-        	<message line="8"  text="set(String Main.s)" kind="warning" file="app/Main.java" />
-        	<message line="12" text="get(String Main.staticString)" kind="warning" file="app/Main.java" />
-        	<message line="14" text="set(String Main.staticString)" kind="warning" file="app/Main.java" />
-        	<message line="16" text="call(Main.new())" kind="warning" file="app/Main.java" />
-        	<message line="19" text="call(void Main.go(String))" kind="warning" file="app/Main.java" />
-        	<message line="23" text="initialization(Main.new())" kind="warning" file="app/Main.java" />
-        	<message line="23" text="get(String Main.s)" kind="warning" file="app/Main.java" />
-        	<message line="23" text="set(String Main.s)" kind="warning" file="app/Main.java" />
-        	<message line="26" text="execution(void Main.go(String))" kind="warning" file="app/Main.java" />
-        	<message line="29" text="get(String Main.s)" kind="warning" file="app/Main.java" />
-        	<message line="31" text="set(String Main.s)" kind="warning" file="app/Main.java" />
-        	<message line="32" text="D.go withincode(void Main.go(String))" kind="warning" file="app/Main.java" />
-        	<message line="33" text="handler(RuntimeException)" kind="warning" file="app/Main.java" />
-        	<message line="35" text="withincode(void Main.go(String))" kind="warning" file="app/Main.java" />
-        	<message line="42" text="withincode(void Main.stop())" kind="warning" file="app/Main.java" />
-        	<message line="50" text="preinitialization(app.C.new())" kind="warning" file="app/Main.java" />
-        </compile>
-        <run class="app.Main"/>
-    </ajc-test>
-
-    <ajc-test dir="new/binaryWarnings/src"  pr="37020"
-   	title="declare warnings on binary javac 1.4 classes">
-        <compile files="aspects/MainWarnings.java,../injars/app-javac-1.4.jar">
-        	<message line="6"  text="staticinitialization(Main)" kind="warning" file="app/Main.java" />
-        	<message line="6"  text="set(String Main.staticString)" kind="warning" file="app/Main.java" />
-        	<message line="8"  text="set(String Main.s)" kind="warning" file="app/Main.java" />
-        	<message line="12" text="get(String Main.staticString)" kind="warning" file="app/Main.java" />
-        	<message line="14" text="set(String Main.staticString)" kind="warning" file="app/Main.java" />
-        	<message line="16" text="call(Main.new())" kind="warning" file="app/Main.java" />
-        	<message line="19" text="call(void Main.go(String))" kind="warning" file="app/Main.java" />
-        	<message line="23" text="initialization(Main.new())" kind="warning" file="app/Main.java" />
-        	<message line="23" text="get(String Main.s)" kind="warning" file="app/Main.java" />
-        	<message line="23" text="set(String Main.s)" kind="warning" file="app/Main.java" />
-        	<message line="26" text="execution(void Main.go(String))" kind="warning" file="app/Main.java" />
-        	<message line="29" text="get(String Main.s)" kind="warning" file="app/Main.java" />
-        	<message line="31" text="set(String Main.s)" kind="warning" file="app/Main.java" />
-        	<message line="32" text="D.go withincode(void Main.go(String))" kind="warning" file="app/Main.java" />
-        	<message line="33" text="handler(RuntimeException)" kind="warning" file="app/Main.java" />
-        	<message line="35" text="withincode(void Main.go(String))" kind="warning" file="app/Main.java" />
-        	<message line="42" text="withincode(void Main.stop())" kind="warning" file="app/Main.java" />
-        	<message line="50" text="preinitialization(app.C.new())" kind="warning" file="app/Main.java" />
-        </compile>
-        <run class="app.Main"/>
-    </ajc-test>
-    
-   <ajc-test dir="new/binaryWarnings/src" pr="37023"
-   	title="declare warnings on binary ajc 1.1 classes">
-        <compile files="aspects/MainWarnings.java,../injars/app-ajc-1.1.jar">
-        	<message line="6"  text="staticinitialization(Main)" kind="warning" file="app/Main.java" />
-        	<message line="6"  text="set(String Main.staticString)" kind="warning" file="app/Main.java" />
-        	<message line="8"  text="set(String Main.s)" kind="warning" file="app/Main.java" />
-        	<message line="12" text="get(String Main.staticString)" kind="warning" file="app/Main.java" />
-        	<message line="14" text="set(String Main.staticString)" kind="warning" file="app/Main.java" />
-        	<message line="16" text="call(Main.new())" kind="warning" file="app/Main.java" />
-        	<message line="19" text="call(void Main.go(String))" kind="warning" file="app/Main.java" />
-        	<message line="23" text="initialization(Main.new())" kind="warning" file="app/Main.java" />
-        	<message line="23" text="get(String Main.s)" kind="warning" file="app/Main.java" />
-        	<message line="23" text="set(String Main.s)" kind="warning" file="app/Main.java" />
-        	<message line="26" text="execution(void Main.go(String))" kind="warning" file="app/Main.java" />
-        	<message line="29" text="get(String Main.s)" kind="warning" file="app/Main.java" />
-        	<message line="31" text="set(String Main.s)" kind="warning" file="app/Main.java" />
-        	<message line="32" text="D.go withincode(void Main.go(String))" kind="warning" file="app/Main.java" />
-        	<message line="33" text="handler(RuntimeException)" kind="warning" file="app/Main.java" />
-        	<message line="35" text="withincode(void Main.go(String))" kind="warning" file="app/Main.java" />
-        	<message line="42" text="withincode(void Main.stop())" kind="warning" file="app/Main.java" />
-        	<message line="50" text="preinitialization(app.C.new())" kind="warning" file="app/Main.java" />
-        </compile>
-        <run class="app.Main"/>
-	</ajc-test>
-
-   <ajc-test dir="bugs/lines" pr="37758"
-   	 title="Weaving rt.jar results in stack overflow">
-        <compile files="A.java,big.jar">
- 			<!-- message no longer produced as a result of bug fix 44190
-        	<message kind="warning" text="manifest not copied"/>
-        	-->
-        </compile>
-        <run class="Big"/>
-    </ajc-test>
-
-	<ajc-test dir="bugs/moreInterfaceLibrary"
-		pr="41123"
-		title="Weaving failure when using injars (no jars)">
-		<compile
-			files="lib/ExecutionMonitor.aj,model/BusObj.java,model/MonitorBusObj.java">
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/moreInterfaceLibrary"
-		pr="41123"
-		title="Weaving failure when using injars (on aspectpath)">
-		<compile
-			files="model/BusObj.java,model/MonitorBusObj.java"
-			aspectpath="lib.jar">
-		</compile>
-	</ajc-test>
-
-	<ajc-test dir="bugs/moreInterfaceLibrary"
-		pr="41123"
-		title="Weaving failure when using injars (on classpath)">
-		<compile
-			files="model/BusObj.java,model/MonitorBusObj.java"
-			classpath="lib.jar">
-		    <message kind="error" line="3"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/moreInterfaceLibrary"
-		pr="41123"
-		title="Weaving failure when using injars (actual injars)">
-		<compile
-			files="model/BusObj.java,model/MonitorBusObj.java,lib.jar">
-		    <message kind="error" line="3"/>
-		</compile>
-	</ajc-test>
-
-    <ajc-test dir="bugs/abstractMethods" pr="49784"
-   	 title="Introduced abstract method on interface not implemented by subtype (injars)">
-       <compile files="interface/C.java,interface/jars/AandB.jar"> 
-            <message kind="error" line="1"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs/StringToString" pr="55341"
-	    title="error Type mismatch: cannot convert from java.lang.String to java.lang.String"
-     		comment="make helloworld.jar with 'ajc -outjar helloworld.jar HW.java' or run BcweaverJarMaker"
-     		keywords="">
-        <compile files="X.java" classpath="helloworld.jar">
-        	<message kind="warning" line="3"/>
-        	<message kind="warning" line="7"/>
-        	<message kind="warning" text="needed for privileged"/>
-        </compile>
-    </ajc-test>
-	
-    <ajc-test dir="bugs/systemouts"
-    	pr="57432"
-		title="declare error binary-weaving NPE">
-        <compile files="injar-debug.jar,A.java">
-			<message kind="error" line="12" file="X.java"/>
-			<message kind="error" line="13" file="X.java"/>
-			<message kind="error" line="20" file="X.java"/>
-			<message kind="error" line="22" file="X.java"/>
-			<message kind="error" line="23" file="X.java"/>
-			<message kind="error" line="27" file="X.java"/>
-			<message kind="error" line="28" file="X.java"/>
-			<message kind="error" line="29" file="X.java"/>
-			<message kind="error" line="30" file="X.java"/>
-			<message kind="error" line="31" file="X.java"/>
-			<message kind="error" line="32" file="X.java"/>
-			<message kind="error" line="33" file="X.java"/>
-			<message kind="error" line="34" file="X.java"/>
-			<message kind="error" line="35" file="X.java"/>
-			<message kind="error" line="36" file="X.java"/>
-			<message kind="error" line="37" file="X.java"/>
-			<message kind="error" line="38" file="X.java"/>
-			<message kind="error" line="39" file="X.java"/>
-			<message kind="error" line="40" file="X.java"/>
-			<message kind="error" line="41" file="X.java"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="bugs/systemouts"
-    	pr="57432"
-		title="declare error binary-weaving NPE">
-        <compile files="injar-nodebug.jar,A.java">
-			<message kind="error" line="0"/>
-        </compile>
-    </ajc-test>
-	
-	<ajc-test dir="bugs/tooManyErrors"
-    	pr="58679"
-		title="Regression from 1.1: NPE in CompilationResult">
-        <compile files="Joinpoints101.jar,DecErrors.aj">
-         
-          <message kind="error" line="10"/><message kind="error" line="11"/>
-          <message kind="error" line="12"/><message kind="error" line="13"/>
-          <message kind="error" line="14"/>
-
-          <message kind="error" line="16"/><message kind="error" line="17"/>
-          <message kind="error" line="18"/><message kind="error" line="19"/>
-          <message kind="error" line="20"/>
- 
-          <message kind="error" line="22"/><message kind="error" line="23"/>
-          <message kind="error" line="24"/><message kind="error" line="25"/>
-          <message kind="error" line="26"/>
- 
-          <message kind="error" line="28"/><message kind="error" line="29"/>
-          <message kind="error" line="30"/><message kind="error" line="31"/>
-          <message kind="error" line="32"/>
-  
-          <message kind="error" line="34"/><message kind="error" line="35"/>
-          <message kind="error" line="36"/><message kind="error" line="37"/>
-          <message kind="error" line="38"/>
- 
-          <message kind="error" line="40"/><message kind="error" line="41"/>
-          <message kind="error" line="42"/><message kind="error" line="43"/>
-          <message kind="error" line="44"/>
-          
-          <message kind="error" line="46"/><message kind="error" line="47"/>
-          <message kind="error" line="48"/><message kind="error" line="49"/>
-          <message kind="error" line="50"/>
- 
-          <message kind="error" line="52"/><message kind="error" line="53"/>
-          <message kind="error" line="54"/><message kind="error" line="55"/>
-          <message kind="error" line="56"/>
-  
-          <message kind="error" line="58"/><message kind="error" line="59"/>
-          <message kind="error" line="60"/><message kind="error" line="61"/>
-          <message kind="error" line="62"/>
- 
-          <message kind="error" line="64"/><message kind="error" line="65"/>
-          <message kind="error" line="66"/><message kind="error" line="67"/>
-          <message kind="error" line="68"/>
-          
-          <message kind="error" line="70"/><message kind="error" line="71"/>
-          <message kind="error" line="72"/><message kind="error" line="73"/>
-          <message kind="error" line="74"/>
- 
-          <message kind="error" line="76"/><message kind="error" line="77"/>
-          <message kind="error" line="78"/><message kind="error" line="79"/>
-          <message kind="error" line="80"/>
-  
-          <message kind="error" line="82"/><message kind="error" line="83"/>
-          <message kind="error" line="84"/><message kind="error" line="85"/>
-          <message kind="error" line="86"/>
- 
-          <message kind="error" line="88"/><message kind="error" line="89"/>
-          <message kind="error" line="90"/><message kind="error" line="91"/>
-          <message kind="error" line="92"/>
-          
-          <message kind="error" line="94"/><message kind="error" line="95"/>
-          <message kind="error" line="96"/><message kind="error" line="97"/>
-          <message kind="error" line="98"/>
- 
-          <message kind="error" line="100"/><message kind="error" line="101"/>
-          <message kind="error" line="102"/><message kind="error" line="103"/>
-          <message kind="error" line="104"/>
-  
-          <message kind="error" line="106"/><message kind="error" line="107"/>
-          <message kind="error" line="108"/><message kind="error" line="109"/>
-          <message kind="error" line="110"/>
- 
-          <message kind="error" line="112"/><message kind="error" line="113"/>
-          <message kind="error" line="114"/><message kind="error" line="115"/>
-          <message kind="error" line="116"/>
-          
-          <message kind="error" line="118"/><message kind="error" line="119"/>
-          <message kind="error" line="120"/><message kind="error" line="121"/>
-          <message kind="error" line="122"/>
-  
-          <message kind="error" line="124"/><message kind="error" line="125"/>
-          <message kind="error" line="126"/><message kind="error" line="127"/>
-          <message kind="error" line="128"/>
- 
-          <message kind="error" line="130"/>
-          
-        </compile>
-    </ajc-test>
- 
\ No newline at end of file
diff --git a/tests/src/test/resources/org/aspectj/systemtest/inpath/inpath.xml b/tests/src/test/resources/org/aspectj/systemtest/inpath/inpath.xml
index 2c0eac4c7..953b03a4e 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/inpath/inpath.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/inpath/inpath.xml
@@ -1,11 +1,300 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[
-<!ENTITY tests SYSTEM "../tests/src/org/aspectj/systemtest/inpath/inpath-tests.xml">
-]>
-
-<!-- InPath Tests -->
+<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
 
 <suite>
+    <!-- .................................... -injars tests -->
+
+    <ajc-test dir="options/injars/simple" 
+      title="source for options -injars">
+        <compile files="Simple.java,Main.java"/>
+        <run class="Main"/>
+    </ajc-test>
+ 
+    <ajc-test dir="options/injars/simple" 
+      title="options -injars">
+        <compile files="Simple.java,main.jar"
+        	options="!eclipse"/>
+        <run class="Main"/>
+    </ajc-test>
+
+    
+    <ajc-test dir="options/injars/simple"  pr="35865"
+      title="options -injars checking declare parents interactions">
+        <compile files="DecParents.java,main.jar"
+        	options="!eclipse"/>
+        <run class="DecParents"/>
+    </ajc-test>
+    
+  <ajc-test dir="new/options11"  pr="36329"
+   	  comment="the line number might change, we're really interested only in the files here"
+      title="The compiler crashes when using aspect libraries created without using -terminateAfterCompile">
+        <compile files="Main.java,injar.jar,Aspect.java,aspectlib1.jar,aspectlib2.jar">
+            <message kind="error" line="0"/>
+        </compile>
+   </ajc-test>
+ 
+    <ajc-test dir="new/binaryWarnings/src" pr="37020"
+   	 title="declare warnings on main">
+        <compile files="aspects/MainWarnings.java,app/Main.java">
+        	<message line="4"  text="staticinitialization(Main)" kind="warning" file="app/Main.java" />
+        	<message line="6"  text="set(String Main.staticString)" kind="warning" file="app/Main.java" />
+        	<message line="8"  text="set(String Main.s)" kind="warning" file="app/Main.java" />
+        	<message line="12" text="get(String Main.staticString)" kind="warning" file="app/Main.java" />
+        	<message line="14" text="set(String Main.staticString)" kind="warning" file="app/Main.java" />
+        	<message line="16" text="call(Main.new())" kind="warning" file="app/Main.java" />
+        	<message line="19" text="call(void Main.go(String))" kind="warning" file="app/Main.java" />
+        	<message line="23" text="initialization(Main.new())" kind="warning" file="app/Main.java" />
+        	<message line="23" text="get(String Main.s)" kind="warning" file="app/Main.java" />
+        	<message line="23" text="set(String Main.s)" kind="warning" file="app/Main.java" />
+        	<message line="26" text="execution(void Main.go(String))" kind="warning" file="app/Main.java" />
+        	<message line="29" text="get(String Main.s)" kind="warning" file="app/Main.java" />
+        	<message line="31" text="set(String Main.s)" kind="warning" file="app/Main.java" />
+        	<message line="32" text="D.go withincode(void Main.go(String))" kind="warning" file="app/Main.java" />
+        	<message line="33" text="handler(RuntimeException)" kind="warning" file="app/Main.java" />
+        	<message line="35" text="withincode(void Main.go(String))" kind="warning" file="app/Main.java" />
+        	<message line="42" text="withincode(void Main.stop())" kind="warning" file="app/Main.java" />
+        	<message line="50" text="preinitialization(app.C.new())" kind="warning" file="app/Main.java" />
+        </compile>
+        <run class="app.Main"/>
+    </ajc-test>
+
+    <ajc-test dir="new/binaryWarnings/src"  pr="37020"
+   	title="declare warnings on binary javac 1.4 classes">
+        <compile files="aspects/MainWarnings.java,../injars/app-javac-1.4.jar">
+        	<message line="6"  text="staticinitialization(Main)" kind="warning" file="app/Main.java" />
+        	<message line="6"  text="set(String Main.staticString)" kind="warning" file="app/Main.java" />
+        	<message line="8"  text="set(String Main.s)" kind="warning" file="app/Main.java" />
+        	<message line="12" text="get(String Main.staticString)" kind="warning" file="app/Main.java" />
+        	<message line="14" text="set(String Main.staticString)" kind="warning" file="app/Main.java" />
+        	<message line="16" text="call(Main.new())" kind="warning" file="app/Main.java" />
+        	<message line="19" text="call(void Main.go(String))" kind="warning" file="app/Main.java" />
+        	<message line="23" text="initialization(Main.new())" kind="warning" file="app/Main.java" />
+        	<message line="23" text="get(String Main.s)" kind="warning" file="app/Main.java" />
+        	<message line="23" text="set(String Main.s)" kind="warning" file="app/Main.java" />
+        	<message line="26" text="execution(void Main.go(String))" kind="warning" file="app/Main.java" />
+        	<message line="29" text="get(String Main.s)" kind="warning" file="app/Main.java" />
+        	<message line="31" text="set(String Main.s)" kind="warning" file="app/Main.java" />
+        	<message line="32" text="D.go withincode(void Main.go(String))" kind="warning" file="app/Main.java" />
+        	<message line="33" text="handler(RuntimeException)" kind="warning" file="app/Main.java" />
+        	<message line="35" text="withincode(void Main.go(String))" kind="warning" file="app/Main.java" />
+        	<message line="42" text="withincode(void Main.stop())" kind="warning" file="app/Main.java" />
+        	<message line="50" text="preinitialization(app.C.new())" kind="warning" file="app/Main.java" />
+        </compile>
+        <run class="app.Main"/>
+    </ajc-test>
+    
+   <ajc-test dir="new/binaryWarnings/src" pr="37023"
+   	title="declare warnings on binary ajc 1.1 classes">
+        <compile files="aspects/MainWarnings.java,../injars/app-ajc-1.1.jar">
+        	<message line="6"  text="staticinitialization(Main)" kind="warning" file="app/Main.java" />
+        	<message line="6"  text="set(String Main.staticString)" kind="warning" file="app/Main.java" />
+        	<message line="8"  text="set(String Main.s)" kind="warning" file="app/Main.java" />
+        	<message line="12" text="get(String Main.staticString)" kind="warning" file="app/Main.java" />
+        	<message line="14" text="set(String Main.staticString)" kind="warning" file="app/Main.java" />
+        	<message line="16" text="call(Main.new())" kind="warning" file="app/Main.java" />
+        	<message line="19" text="call(void Main.go(String))" kind="warning" file="app/Main.java" />
+        	<message line="23" text="initialization(Main.new())" kind="warning" file="app/Main.java" />
+        	<message line="23" text="get(String Main.s)" kind="warning" file="app/Main.java" />
+        	<message line="23" text="set(String Main.s)" kind="warning" file="app/Main.java" />
+        	<message line="26" text="execution(void Main.go(String))" kind="warning" file="app/Main.java" />
+        	<message line="29" text="get(String Main.s)" kind="warning" file="app/Main.java" />
+        	<message line="31" text="set(String Main.s)" kind="warning" file="app/Main.java" />
+        	<message line="32" text="D.go withincode(void Main.go(String))" kind="warning" file="app/Main.java" />
+        	<message line="33" text="handler(RuntimeException)" kind="warning" file="app/Main.java" />
+        	<message line="35" text="withincode(void Main.go(String))" kind="warning" file="app/Main.java" />
+        	<message line="42" text="withincode(void Main.stop())" kind="warning" file="app/Main.java" />
+        	<message line="50" text="preinitialization(app.C.new())" kind="warning" file="app/Main.java" />
+        </compile>
+        <run class="app.Main"/>
+	</ajc-test>
+
+   <ajc-test dir="bugs/lines" pr="37758"
+   	 title="Weaving rt.jar results in stack overflow">
+        <compile files="A.java,big.jar">
+ 			<!-- message no longer produced as a result of bug fix 44190
+        	<message kind="warning" text="manifest not copied"/>
+        	-->
+        </compile>
+        <run class="Big"/>
+    </ajc-test>
+
+	<ajc-test dir="bugs/moreInterfaceLibrary"
+		pr="41123"
+		title="Weaving failure when using injars (no jars)">
+		<compile
+			files="lib/ExecutionMonitor.aj,model/BusObj.java,model/MonitorBusObj.java">
+		</compile>
+	</ajc-test>
+	
+	<ajc-test dir="bugs/moreInterfaceLibrary"
+		pr="41123"
+		title="Weaving failure when using injars (on aspectpath)">
+		<compile
+			files="model/BusObj.java,model/MonitorBusObj.java"
+			aspectpath="lib.jar">
+		</compile>
+	</ajc-test>
+
+	<ajc-test dir="bugs/moreInterfaceLibrary"
+		pr="41123"
+		title="Weaving failure when using injars (on classpath)">
+		<compile
+			files="model/BusObj.java,model/MonitorBusObj.java"
+			classpath="lib.jar">
+		    <message kind="error" line="3"/>
+		</compile>
+	</ajc-test>
+	
+	<ajc-test dir="bugs/moreInterfaceLibrary"
+		pr="41123"
+		title="Weaving failure when using injars (actual injars)">
+		<compile
+			files="model/BusObj.java,model/MonitorBusObj.java,lib.jar">
+		    <message kind="error" line="3"/>
+		</compile>
+	</ajc-test>
+
+    <ajc-test dir="bugs/abstractMethods" pr="49784"
+   	 title="Introduced abstract method on interface not implemented by subtype (injars)">
+       <compile files="interface/C.java,interface/jars/AandB.jar"> 
+            <message kind="error" line="1"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="bugs/StringToString" pr="55341"
+	    title="error Type mismatch: cannot convert from java.lang.String to java.lang.String"
+     		comment="make helloworld.jar with 'ajc -outjar helloworld.jar HW.java' or run BcweaverJarMaker"
+     		keywords="">
+        <compile files="X.java" classpath="helloworld.jar">
+        	<message kind="warning" line="3"/>
+        	<message kind="warning" line="7"/>
+        	<message kind="warning" text="needed for privileged"/>
+        </compile>
+    </ajc-test>
+	
+    <ajc-test dir="bugs/systemouts"
+    	pr="57432"
+		title="declare error binary-weaving NPE">
+        <compile files="injar-debug.jar,A.java">
+			<message kind="error" line="12" file="X.java"/>
+			<message kind="error" line="13" file="X.java"/>
+			<message kind="error" line="20" file="X.java"/>
+			<message kind="error" line="22" file="X.java"/>
+			<message kind="error" line="23" file="X.java"/>
+			<message kind="error" line="27" file="X.java"/>
+			<message kind="error" line="28" file="X.java"/>
+			<message kind="error" line="29" file="X.java"/>
+			<message kind="error" line="30" file="X.java"/>
+			<message kind="error" line="31" file="X.java"/>
+			<message kind="error" line="32" file="X.java"/>
+			<message kind="error" line="33" file="X.java"/>
+			<message kind="error" line="34" file="X.java"/>
+			<message kind="error" line="35" file="X.java"/>
+			<message kind="error" line="36" file="X.java"/>
+			<message kind="error" line="37" file="X.java"/>
+			<message kind="error" line="38" file="X.java"/>
+			<message kind="error" line="39" file="X.java"/>
+			<message kind="error" line="40" file="X.java"/>
+			<message kind="error" line="41" file="X.java"/>
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="bugs/systemouts"
+    	pr="57432"
+		title="declare error binary-weaving NPE">
+        <compile files="injar-nodebug.jar,A.java">
+			<message kind="error" line="0"/>
+        </compile>
+    </ajc-test>
+	
+	<ajc-test dir="bugs/tooManyErrors"
+    	pr="58679"
+		title="Regression from 1.1: NPE in CompilationResult">
+        <compile files="Joinpoints101.jar,DecErrors.aj">
+         
+          <message kind="error" line="10"/><message kind="error" line="11"/>
+          <message kind="error" line="12"/><message kind="error" line="13"/>
+          <message kind="error" line="14"/>
 
-&tests;
+          <message kind="error" line="16"/><message kind="error" line="17"/>
+          <message kind="error" line="18"/><message kind="error" line="19"/>
+          <message kind="error" line="20"/>
+ 
+          <message kind="error" line="22"/><message kind="error" line="23"/>
+          <message kind="error" line="24"/><message kind="error" line="25"/>
+          <message kind="error" line="26"/>
+ 
+          <message kind="error" line="28"/><message kind="error" line="29"/>
+          <message kind="error" line="30"/><message kind="error" line="31"/>
+          <message kind="error" line="32"/>
+  
+          <message kind="error" line="34"/><message kind="error" line="35"/>
+          <message kind="error" line="36"/><message kind="error" line="37"/>
+          <message kind="error" line="38"/>
+ 
+          <message kind="error" line="40"/><message kind="error" line="41"/>
+          <message kind="error" line="42"/><message kind="error" line="43"/>
+          <message kind="error" line="44"/>
+          
+          <message kind="error" line="46"/><message kind="error" line="47"/>
+          <message kind="error" line="48"/><message kind="error" line="49"/>
+          <message kind="error" line="50"/>
+ 
+          <message kind="error" line="52"/><message kind="error" line="53"/>
+          <message kind="error" line="54"/><message kind="error" line="55"/>
+          <message kind="error" line="56"/>
+  
+          <message kind="error" line="58"/><message kind="error" line="59"/>
+          <message kind="error" line="60"/><message kind="error" line="61"/>
+          <message kind="error" line="62"/>
+ 
+          <message kind="error" line="64"/><message kind="error" line="65"/>
+          <message kind="error" line="66"/><message kind="error" line="67"/>
+          <message kind="error" line="68"/>
+          
+          <message kind="error" line="70"/><message kind="error" line="71"/>
+          <message kind="error" line="72"/><message kind="error" line="73"/>
+          <message kind="error" line="74"/>
+ 
+          <message kind="error" line="76"/><message kind="error" line="77"/>
+          <message kind="error" line="78"/><message kind="error" line="79"/>
+          <message kind="error" line="80"/>
+  
+          <message kind="error" line="82"/><message kind="error" line="83"/>
+          <message kind="error" line="84"/><message kind="error" line="85"/>
+          <message kind="error" line="86"/>
+ 
+          <message kind="error" line="88"/><message kind="error" line="89"/>
+          <message kind="error" line="90"/><message kind="error" line="91"/>
+          <message kind="error" line="92"/>
+          
+          <message kind="error" line="94"/><message kind="error" line="95"/>
+          <message kind="error" line="96"/><message kind="error" line="97"/>
+          <message kind="error" line="98"/>
+ 
+          <message kind="error" line="100"/><message kind="error" line="101"/>
+          <message kind="error" line="102"/><message kind="error" line="103"/>
+          <message kind="error" line="104"/>
+  
+          <message kind="error" line="106"/><message kind="error" line="107"/>
+          <message kind="error" line="108"/><message kind="error" line="109"/>
+          <message kind="error" line="110"/>
+ 
+          <message kind="error" line="112"/><message kind="error" line="113"/>
+          <message kind="error" line="114"/><message kind="error" line="115"/>
+          <message kind="error" line="116"/>
+          
+          <message kind="error" line="118"/><message kind="error" line="119"/>
+          <message kind="error" line="120"/><message kind="error" line="121"/>
+          <message kind="error" line="122"/>
+  
+          <message kind="error" line="124"/><message kind="error" line="125"/>
+          <message kind="error" line="126"/><message kind="error" line="127"/>
+          <message kind="error" line="128"/>
+ 
+          <message kind="error" line="130"/>
+          
+        </compile>
+    </ajc-test>
+ 
 
 </suite>
diff --git a/tests/src/test/resources/org/aspectj/systemtest/java14/java14-tests.xml b/tests/src/test/resources/org/aspectj/systemtest/java14/java14-tests.xml
deleted file mode 100644
index 364c28e4f..000000000
--- a/tests/src/test/resources/org/aspectj/systemtest/java14/java14-tests.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<!-- Java 1.4 Specific Tests -->
-
-  <ajc-test dir="pureJava" title="assert flow"
-      keywords="from-14tests,purejava">
-        <compile options="-source,1.4" files="AssertsCF.java">
-            <message kind="error" line="8"/>
-            <message kind="error" line="11"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" title="assert flow - 2"
-      keywords="from-14tests,purejava">
-        <compile options="-source,1.4" files="AssertsCF2.java">
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" title="assert typing"
-      keywords="from-14tests,purejava,fail-publicType">
-        <compile options="-source,1.4" files="AssertsCF1.java">
-            <message kind="error" line="5"/>
-        </compile>
-    </ajc-test>
-
-   <ajc-test dir="pureJava" title="compiling asserts in methods"
-      keywords="from-14tests,purejava">
-        <compile options="-source,1.4" files="AssertInMethod.java"/>
-        <run class="AssertInMethod" vm="1.4"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava" title="asserts" keywords="from-14tests">
-        <compile options="-source,1.4" files="Asserts.java"/>
-        <run class="Asserts" vm="1.4"/>
-    </ajc-test>
-    
-    <ajc-test dir="pureJava" pr="725"
-      title="asserts in aspect and declared methods [requires 1.4]"
-      keywords="from-14tests" comment="not pure java!">
-        <compile options="-source,1.4"
-          files="IntroducedAssertion.java"/>
-        <run class="IntroducedAssertion" vm="1.4"/>
-    </ajc-test>
-
-    <!-- This test case requires bytecode generated according to the declaring type
-        rules in JLS 2nd edition.  -1.4 must be passed to the eclipse compiler for
-        this behavior. -->
-    <ajc-test dir="new"
-      title="Does the matrix coverage thing for the new method signatures"
-      keywords="from-resolved_10x">
-        <compile files="MethodSignatures.java" options="-1.4,-Xlint:ignore"/>
-        <run class="MethodSignatures" vm="1.4"/>
-    </ajc-test>  
-
-    <!-- This test case requires bytecode generated according to the declaring type
-        rules in JLS 2nd edition.  -1.4 must be passed to the eclipse compiler for
-        this behavior. -->
-    <ajc-test dir="new" title="correct types of parameters at call-sites"
-      keywords="from-resolved_10x">
-        <compile files="CallTypes.java" options="-1.4,-Xlint:ignore"/>
-        <run class="CallTypes" vm="1.4"/>
-    </ajc-test>
-
-    <!-- This test case requires bytecode generated according to the declaring type
-        rules in JLS 2nd edition.  -1.4 must be passed to the eclipse compiler for
-        this behavior.  That means that this case will only work under 1.4.  -->
-    <ajc-test dir="new"
-      title="target type matching with messy interface hierarchies"
-      keywords="from-resolved_10x">
-        <compile files="CallTypesI.java" options="-1.4,-Xlint:ignore"/>
-        <run class="CallTypesI" vm="1.4"/>
-    </ajc-test>
- 
-      <ajc-test dir="new" title="assert tests in introduction [requires 1.4]"
-      keywords="from-14tests,fail-unimplemented">
-        <compile options="-source,1.4" files="AssertInIntro.java"/>
-        <run class="AssertInIntro" vm="1.4"/>
-    </ajc-test>
-
- 
-    <ajc-test dir="base/test131"
-      title="various forms of package name pattern matching work"
-      keywords="from-broken14usejavac">
-        <compile files="Driver.java,p1/C1.java,p1/p2/C2.java" />
-        <run class="Driver"/>
-    </ajc-test>
-
-     <ajc-test dir="new" pr="657"
-      title="assert statement in advice coverage [requires 1.4]"
-      keywords="from-14tests,fail-in-eclipse">
-        <compile options="-source,1.4" files="AssertInAdvice.java"/>
-        <run class="AssertInAdvice" vm="1.4"/>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="657"
-      title="assert statement in advice  [requires 1.4]" 
-      keywords="from-14tests,fail-in-eclipse">
-        <compile options="-source,1.4" files="AssertInAdviceBug.java"/>
-        <run class="AssertInAdviceBug" vm="1.4"/>
-    </ajc-test>
-
-    <ajc-test dir="bugs" pr="28703" title="assert and pertarget crashes compiler">
-        <compile files="EnsureOverriding.java" options="-source,1.4"/>
-        <run class="EnsureOverriding" vm="1.4"/>
-    </ajc-test>
-    
-    <ajc-test dir="bugs/interSpecials" title="testing that assert works like .class"
-      pr="36110">
-        <compile files="p1/C.java,p2/A2.java" options="-source,1.4"/>
-        <run class="p2.A2" vm="1.4"/>
-    </ajc-test>
-
-   <ajc-test dir="bugs/jpOptimization" 
-    	pr="45441"
-    	title="JoinPoint Optimization when targetting 1.4">
-        <compile 
-        	files="de/test/MyMain.java,
-        		   de/test/MyAspect.java"
-            options="-1.4"/>
-        <run class="de.test.MyMain"/>
-    </ajc-test>
-
-	<ajc-test dir="bugs"
-		title="XLint warning for call PCD's using subtype of defining type (-1.4 -Xlint:ignore)"
-		pr="41952"
-		>
-		<compile
-			options="-Xlint:ignore,-1.4" 
-			files="DeclaringTypeWarning.java" >
-            <message kind="warning" line="12"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs"
-		title="XLint warning for call PCD's using subtype of defining type (-1.4)"
-		pr="41952"
-		>
-		<compile
-			options="-1.4" 
-			files="DeclaringTypeWarning.java" >
-			<message kind="warning" line="6" text="declaring type">
-				<source line="14" file="DeclaringTypeWarning.java"/>
-			</message>
-			<message kind="warning" line="12" text="declare warning">
-				<source line="19" file="DeclaringTypeWarning.java"/>
-			</message>
-		</compile>
-	</ajc-test>
- 
-    <ajc-test dir="bugs" pr="39711"
-   	 title="Class Literals as non final fields (also assert, and this$0)">
-        <compile files="ClassLiteralField.java" options="-source,1.4"/>
-        <run vm="1.4" class="ClassLiteralField"/>
-    </ajc-test>
- 
\ No newline at end of file
diff --git a/tests/src/test/resources/org/aspectj/systemtest/java14/java14.xml b/tests/src/test/resources/org/aspectj/systemtest/java14/java14.xml
index c25b999cf..53b3d59ff 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/java14/java14.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/java14/java14.xml
@@ -1,11 +1,157 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[
-<!ENTITY tests SYSTEM "../tests/src/org/aspectj/systemtest/java14/java14-tests.xml">
-]>
-
+<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
 <!-- Tests requiring JDK 1.4 or above -->
-
 <suite>
 
-&tests;
+  <ajc-test dir="pureJava" title="assert flow"
+      keywords="from-14tests,purejava">
+        <compile options="-source,1.4" files="AssertsCF.java">
+            <message kind="error" line="8"/>
+            <message kind="error" line="11"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="pureJava" title="assert flow - 2"
+      keywords="from-14tests,purejava">
+        <compile options="-source,1.4" files="AssertsCF2.java">
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="pureJava" title="assert typing"
+      keywords="from-14tests,purejava,fail-publicType">
+        <compile options="-source,1.4" files="AssertsCF1.java">
+            <message kind="error" line="5"/>
+        </compile>
+    </ajc-test>
+
+   <ajc-test dir="pureJava" title="compiling asserts in methods"
+      keywords="from-14tests,purejava">
+        <compile options="-source,1.4" files="AssertInMethod.java"/>
+        <run class="AssertInMethod" vm="1.4"/>
+    </ajc-test>
+
+    <ajc-test dir="pureJava" title="asserts" keywords="from-14tests">
+        <compile options="-source,1.4" files="Asserts.java"/>
+        <run class="Asserts" vm="1.4"/>
+    </ajc-test>
+    
+    <ajc-test dir="pureJava" pr="725"
+      title="asserts in aspect and declared methods [requires 1.4]"
+      keywords="from-14tests" comment="not pure java!">
+        <compile options="-source,1.4"
+          files="IntroducedAssertion.java"/>
+        <run class="IntroducedAssertion" vm="1.4"/>
+    </ajc-test>
+
+    <!-- This test case requires bytecode generated according to the declaring type
+        rules in JLS 2nd edition.  -1.4 must be passed to the eclipse compiler for
+        this behavior. -->
+    <ajc-test dir="new"
+      title="Does the matrix coverage thing for the new method signatures"
+      keywords="from-resolved_10x">
+        <compile files="MethodSignatures.java" options="-1.4,-Xlint:ignore"/>
+        <run class="MethodSignatures" vm="1.4"/>
+    </ajc-test>  
+
+    <!-- This test case requires bytecode generated according to the declaring type
+        rules in JLS 2nd edition.  -1.4 must be passed to the eclipse compiler for
+        this behavior. -->
+    <ajc-test dir="new" title="correct types of parameters at call-sites"
+      keywords="from-resolved_10x">
+        <compile files="CallTypes.java" options="-1.4,-Xlint:ignore"/>
+        <run class="CallTypes" vm="1.4"/>
+    </ajc-test>
+
+    <!-- This test case requires bytecode generated according to the declaring type
+        rules in JLS 2nd edition.  -1.4 must be passed to the eclipse compiler for
+        this behavior.  That means that this case will only work under 1.4.  -->
+    <ajc-test dir="new"
+      title="target type matching with messy interface hierarchies"
+      keywords="from-resolved_10x">
+        <compile files="CallTypesI.java" options="-1.4,-Xlint:ignore"/>
+        <run class="CallTypesI" vm="1.4"/>
+    </ajc-test>
+ 
+      <ajc-test dir="new" title="assert tests in introduction [requires 1.4]"
+      keywords="from-14tests,fail-unimplemented">
+        <compile options="-source,1.4" files="AssertInIntro.java"/>
+        <run class="AssertInIntro" vm="1.4"/>
+    </ajc-test>
+
+ 
+    <ajc-test dir="base/test131"
+      title="various forms of package name pattern matching work"
+      keywords="from-broken14usejavac">
+        <compile files="Driver.java,p1/C1.java,p1/p2/C2.java" />
+        <run class="Driver"/>
+    </ajc-test>
+
+     <ajc-test dir="new" pr="657"
+      title="assert statement in advice coverage [requires 1.4]"
+      keywords="from-14tests,fail-in-eclipse">
+        <compile options="-source,1.4" files="AssertInAdvice.java"/>
+        <run class="AssertInAdvice" vm="1.4"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="657"
+      title="assert statement in advice  [requires 1.4]" 
+      keywords="from-14tests,fail-in-eclipse">
+        <compile options="-source,1.4" files="AssertInAdviceBug.java"/>
+        <run class="AssertInAdviceBug" vm="1.4"/>
+    </ajc-test>
+
+    <ajc-test dir="bugs" pr="28703" title="assert and pertarget crashes compiler">
+        <compile files="EnsureOverriding.java" options="-source,1.4"/>
+        <run class="EnsureOverriding" vm="1.4"/>
+    </ajc-test>
+    
+    <ajc-test dir="bugs/interSpecials" title="testing that assert works like .class"
+      pr="36110">
+        <compile files="p1/C.java,p2/A2.java" options="-source,1.4"/>
+        <run class="p2.A2" vm="1.4"/>
+    </ajc-test>
+
+   <ajc-test dir="bugs/jpOptimization" 
+    	pr="45441"
+    	title="JoinPoint Optimization when targetting 1.4">
+        <compile 
+        	files="de/test/MyMain.java,
+        		   de/test/MyAspect.java"
+            options="-1.4"/>
+        <run class="de.test.MyMain"/>
+    </ajc-test>
+
+	<ajc-test dir="bugs"
+		title="XLint warning for call PCD's using subtype of defining type (-1.4 -Xlint:ignore)"
+		pr="41952"
+		>
+		<compile
+			options="-Xlint:ignore,-1.4" 
+			files="DeclaringTypeWarning.java" >
+            <message kind="warning" line="12"/>
+		</compile>
+	</ajc-test>
+	
+	<ajc-test dir="bugs"
+		title="XLint warning for call PCD's using subtype of defining type (-1.4)"
+		pr="41952"
+		>
+		<compile
+			options="-1.4" 
+			files="DeclaringTypeWarning.java" >
+			<message kind="warning" line="6" text="declaring type">
+				<source line="14" file="DeclaringTypeWarning.java"/>
+			</message>
+			<message kind="warning" line="12" text="declare warning">
+				<source line="19" file="DeclaringTypeWarning.java"/>
+			</message>
+		</compile>
+	</ajc-test>
+ 
+    <ajc-test dir="bugs" pr="39711"
+   	 title="Class Literals as non final fields (also assert, and this$0)">
+        <compile files="ClassLiteralField.java" options="-source,1.4"/>
+        <run vm="1.4" class="ClassLiteralField"/>
+    </ajc-test>
+ 
 
 </suite>
diff --git a/tests/src/test/resources/org/aspectj/systemtest/options/options-tests.xml b/tests/src/test/resources/org/aspectj/systemtest/options/options-tests.xml
deleted file mode 100644
index d109cd2d0..000000000
--- a/tests/src/test/resources/org/aspectj/systemtest/options/options-tests.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!-- Options Tests -->
-
-    <!-- .................................... option tests -->
-    <!-- .................................... -warn tests -->
-      <ajc-test dir="options/deprecated" 
-      title="options -warn:deprecation">
-        <compile files="WarnDeprecated.java,OldStuff.java"
-        	options="!eclipse,-warn:deprecation">
-            <message kind="warning" line="10"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="options/deprecated" 
-      title="options -warn:deprecation not enabled">
-        <compile files="WarnDeprecated.java,OldStuff.java"
-        	options="!eclipse">
-        </compile>
-    </ajc-test>
- 
-  
-   <ajc-test dir="harness" 
-        title="setting -warn:constructorName works">
-        <compile files="ConstructorNameWarning.java" 
-        	options="-warn:constructorName">
-        	<message kind="warning" line="5" text="constructor name"/>
-    	</compile>
-    </ajc-test>
- 
-     <ajc-test dir="bugs/deprecated" pr="54098"
-    	title="-deprecation not working?" >
-    	 <compile files="Deprecation.java, Deprecated.java" options="-deprecation">
-            <message kind="warning" line="5"/>
-            <message kind="warning" line="6"/>
-        </compile>
-    </ajc-test>
-    
- 
\ No newline at end of file
diff --git a/tests/src/test/resources/org/aspectj/systemtest/options/options.xml b/tests/src/test/resources/org/aspectj/systemtest/options/options.xml
index d877da040..c1ac0beec 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/options/options.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/options/options.xml
@@ -1,10 +1,40 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[
-<!ENTITY tests SYSTEM "../tests/src/org/aspectj/systemtest/options/options-tests.xml">
-]>
+<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
 <!-- Options Tests -->
-
 <suite>
 
-&tests;    
+    <!-- .................................... option tests -->
+    <!-- .................................... -warn tests -->
+      <ajc-test dir="options/deprecated" 
+      title="options -warn:deprecation">
+        <compile files="WarnDeprecated.java,OldStuff.java"
+        	options="!eclipse,-warn:deprecation">
+            <message kind="warning" line="10"/>
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="options/deprecated" 
+      title="options -warn:deprecation not enabled">
+        <compile files="WarnDeprecated.java,OldStuff.java"
+        	options="!eclipse">
+        </compile>
+    </ajc-test>
+ 
+  
+   <ajc-test dir="harness" 
+        title="setting -warn:constructorName works">
+        <compile files="ConstructorNameWarning.java" 
+        	options="-warn:constructorName">
+        	<message kind="warning" line="5" text="constructor name"/>
+    	</compile>
+    </ajc-test>
+ 
+     <ajc-test dir="bugs/deprecated" pr="54098"
+    	title="-deprecation not working?" >
+    	 <compile files="Deprecation.java, Deprecated.java" options="-deprecation">
+            <message kind="warning" line="5"/>
+            <message kind="warning" line="6"/>
+        </compile>
+    </ajc-test>
+    
  
 </suite>
\ No newline at end of file
diff --git a/tests/src/test/resources/org/aspectj/systemtest/pre10x/pre10x-tests.xml b/tests/src/test/resources/org/aspectj/systemtest/pre10x/pre10x-tests.xml
deleted file mode 100644
index 9b0837dbe..000000000
--- a/tests/src/test/resources/org/aspectj/systemtest/pre10x/pre10x-tests.xml
+++ /dev/null
@@ -1,638 +0,0 @@
-<!-- AspectJ v0.8 - 0.99 Tests -->
-
-
-    <ajc-test dir="pureJava" title="Using 'aspect' as identifier is legal TODO"
-      keywords="from-java" comment="keep this test in main suite">
-        <compile files="KeywordAspect.java"/>
-        <run class="KeywordAspect"/>
-    </ajc-test>
-
-    <ajc-test dir="pureJava"
-      title="Using 'pointcut' as identifier is legal TODO"
-      keywords="from-java" comment="keep this test in main suite">
-        <compile files="KeywordPointcut.java"/>
-        <run class="KeywordPointcut"/>
-    </ajc-test>
-
-    <ajc-test dir="new/introTypeMissing"
-      title="CF expected when enclosing class superclass used as this qualifier in inner class"
-      keywords="from-java">
-        <compile files="TargetClassCF.java,Util.java">
-            <message kind="error" line="22"/>
-            <message kind="error" line="23"/>
-            <message kind="error" line="27"/>
-            <message kind="error" line="28"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new/introTypeMissing"
-      title="enclosing class may be used as this qualifier in inner class"
-      keywords="from-java">
-        <compile files="TargetClassCP.java,Util.java"/>
-        <run class="TargetClassCP"/>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="reasonable error for crosscut reference with no formals specified"
-      keywords="from-errors">
-        <compile files="NoFormalsCrosscut.java">
-            <message kind="error" line="6"/>
-            <message kind="error" line="7"/>
-            <message kind="error" line="8"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="reasonable error for introduction on type whose source isn't found"
-      keywords="from-errors">
-        <compile files="NoSource.java">
-            <message kind="error" line="4"/>
-        </compile>
-    </ajc-test>
-
-
-    <ajc-test dir="errors"
-      title="handle errors in crosscut designators, insist that they end with a semicolon"
-      keywords="from-errors">
-        <compile files="BadDesignator.java">
-            <message kind="error" line="4"/>
-        </compile>
-    </ajc-test>
-
-
-    <ajc-test dir="errors"
-      title="try to return from a before, after, after throwing and after returning"
-      keywords="from-errors">
-        <compile files="InvalidReturn.java">
-            <message kind="error" line="12"/>
-            <message kind="error" line="16"/>
-            <message kind="error" line="19"/>
-            <message kind="error" line="22"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" pr="130"
-      title="the designator has a wildcard for method name but no return type specified"
-      keywords="from-errors">
-        <compile files="NoReturnTypeInDesignator.java">
-            <message kind="error" line="6"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="the designator for the introduction has no type after the | charcter"
-      keywords="from-errors">
-        <compile files="BadIntroductionDesignator.java">
-            <message kind="error" line="6"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" pr="140" title="crosscut signature does not match"
-      keywords="from-errors">
-        <compile files="BadCCutSig.java">
-            <message kind="error" line="8"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="proper exit conditions when errors fall through to javac"
-      keywords="from-errors">
-        <compile files="FromJavac.java">
-            <message kind="error" line="11"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" pr="213"
-      title="mismatched parens on advice (wasn't binding Tester)"
-      keywords="from-errors">
-        <compile files="MismatchedParens.java">
-            <message kind="error" line="16"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" pr="209" title="Non-static advice silently ignored"
-      keywords="from-errors">
-        <compile files="BadPointcutName.java">
-            <message kind="error" line="15"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" pr="219" title="extra closing brace"
-      keywords="from-errors">
-        <compile files="ExtraClosingBrace.java">
-            <message kind="error" line="8"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" pr="244"
-      title="decent errors for around return type not matching target point"
-      keywords="from-errors">
-        <compile files="AroundReturnType.java" options="-1.4">
-            <message kind="error" line="2"/>
-            <message kind="error" line="6"/>
-            <message kind="error" line="7"/>
-            <message kind="error" line="16"/>
-            <message kind="error" line="21"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="eachobject: can't call new on an aspect of"
-      keywords="from-errors">
-        <compile files="CantCallConstructorOnAspects.java">
-            <message kind="error" line="4"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="eachobject: only zero-argument constructors allowed in an aspect"
-      keywords="from-errors,fail-unimplemented">
-        <compile files="AspectsCantHaveYesArgumentConstructors.java">
-            <message kind="error" line="8"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="eachobject: can't extend a concrete aspect"
-      keywords="from-errors,fail-unimplemented">
-        <compile files="SubAspectsCantExtendNonAbstractAspects.java">
-            <message kind="error" line="14"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" pr="271" title="instanceof used without a class"
-      keywords="from-errors">
-        <compile files="InstanceofWithoutClass.java">
-            <message kind="error" line="14"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" pr="280" title="wildcard used for returns clause"
-      keywords="from-errors">
-        <compile files="WildcardForReturns.java">
-            <message kind="error" line="17"/>           
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" pr="280" title="no return statement in around advice"
-      keywords="from-errors,new-messages-vary">
-        <compile files="NoReturnStatement.java">
-            <message kind="error" line="14"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" pr="286"
-      title="inner aspects must be static (no longer matches PR#286)"
-      keywords="from-errors,fail-unimplemented">
-        <compile files="AbstractAspectOf.java">
-            <message kind="error" line="12"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="Casting class declarations as interfaces"
-      keywords="from-errors">
-        <compile files="InterfaceCast.java">
-            <message kind="error" line="14"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="omits a variable name and crashes with a null pointer"
-      keywords="from-errors">
-        <compile files="BindingNullPointer.java">
-            <message kind="error" line="7"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="Not generating an error for using new as a method name"
-      keywords="from-errors">
-        <compile files="New.java">
-            <message kind="error" line="12"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="ClassCastException on the int literal"
-      keywords="from-errors">
-        <compile files="IntLiteral.java">
-            <message kind="error" line="17"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Wrong strictfp keyword usage in interface function prototype [TODO: move to errors]"
-      keywords="from-errors">
-        <compile files="StrictFpCErr1.java">
-            <message kind="error" line="3"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Wrong strictfp keyword usage in field declaration [TODO: move to errors]"
-      keywords="from-errors">
-        <compile files="StrictFpCErr2.java">
-            <message kind="error" line="3"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Wrong strictfp keyword usage in constructor declaration [TODO: move to errors]"
-      keywords="from-errors">
-        <compile files="StrictFpCErr3.java">
-            <message kind="error" line="3"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="Incorrect static casts to primitively foldable arguments should not crash the compiler."
-      keywords="from-errors">
-        <compile files="BadStaticCast.java">
-            <message kind="error" line="5"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="Dominates with commas should signal an error."
-      keywords="from-errors">
-        <compile files="DominatesWithCommas.java">
-            <message kind="error" line="9"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" pr="95"
-      title="stack overflow with recursive crosscut specifier"
-      keywords="from-errors">
-        <compile files="RecursiveCCutSpecifier.java">
-            <message kind="error" line="10"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="Throwing a NullPointerException when formals can't be bound in named pointcut"
-      keywords="from-errors">
-        <compile files="BadFormalsToCalls.java">
-            <message kind="error" line="22"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" pr="385"
-      title="disallow defining more than one pointcut with the same name"
-      keywords="from-errors,fail-unimplemented">
-        <compile files="OverloadedPointcuts.java">
-            <message kind="error" line="4"/>
-            <message kind="error" line="5"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="pre 0.7 introduction form outside aspect body causes an EmptyStackException"
-      keywords="from-errors">
-        <compile files="BadIntroduction.java">
-            <message kind="error" line="1" />
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="a class can't extend an aspect"
-      keywords="from-errors,fail-unimplemented">
-        <compile files="ClassExtendingAspect.java">
-            <message kind="error" line="19"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="a before() clause at the class-level causes an EmptyStackException"
-      keywords="from-errors">
-        <compile files="TopLevelBefore.java">
-            <message kind="error" line="1"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="an after() clause at the class-level causes an EmptyStackException"
-      keywords="from-errors">
-        <compile files="TopLevelAfter.java">
-            <message kind="error" line="1"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="an around() clause at the class-level causes an EmptyStackException"
-      keywords="from-errors">
-        <compile files="TopLevelAround.java">
-            <message kind="error" line="1"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="Doesn't detect cyclic inheritance of aspects."
-      keywords="from-errors">
-        <compile files="CircularExtendsAspect.java">
-            <message kind="error" line="18"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="Binds the pointcut formals to member variables instead of pointcut formals."
-      keywords="from-errors">
-        <compile files="PointcutFormals.java" options="-Xlint:warning">
-            <message kind="error" line="14"/>
-            <message kind="error" line="15"/>
-            <message kind="warning" line="16"/>
-            <message kind="warning" line="17"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="ambiguous formal in formals pattern"
-      keywords="from-errors">
-        <compile files="AmbiguousFormal.java">
-            <message kind="error" line="6"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="good error for field name instead of type name"
-      keywords="from-errors">
-        <compile files="BadTypeName.java">
-            <message kind="error" line="2"/>
-            <message kind="error" line="4"/>
-            <message kind="error" line="6"/>
-            <message kind="error" line="8"/>
-            <message kind="error" line="10"/>
-            <message kind="error" line="12"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="errors in aspect inheritance - 1"
-      keywords="from-errors">
-        <compile files="AspectInheritance1.java">
-            <message kind="error" line="17"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="errors in aspect inheritance - 2"
-         keywords="from-errors">
-        <compile files="AspectInheritance2.java">
-            <message kind="error" line="8"/>
-            <message kind="error" line="16"/>
-            <message kind="error" line="20"/>
-            <message kind="error" line="26"/>
-            <message kind="error" line="30"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="errors in aspect inheritance - 3"
-      keywords="from-errors">
-        <compile files="AspectInheritance3.java">
-            <message kind="error" line="19"/>
-            <message kind="error" line="24"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="errors in aspect inheritance - 4"
-      keywords="from-errors">
-        <compile files="AspectInheritance4.java">
-            <message kind="error" line="17"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="circular dominates leading to irresolvable advice precedence"
-      keywords="from-errors">
-        <compile files="CircularDominates.java" options="-1.4">
-            <message kind="error" line="12"/>
-            <message kind="error" line="16"/>
-            <message kind="error" line="20"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="Should issue an error for using 'class' instead of 'aspect'"
-      keywords="from-errors">
-        <compile files="NoAspect.java">
-            <message kind="error" line="1" text="Syntax error on token &quot;{&quot;, ; expected"/>
-            <message kind="error" line="12" text="Syntax error on token &quot;{&quot;, pointcut expected after this token"/>
-            <message kind="error" line="12" text="Syntax error, insert &quot;;&quot; to complete ClassBodyDeclarations"/>
-            <message kind="error" line="12" text="Syntax error on token &quot;{&quot;, delete this token"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="Should signal an error when we need an exposed value but don't provide it"
-      keywords="from-errors">
-        <compile files="MissingExposure.java">
-            <message kind="error" line="13"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="StackOverFlowException with circular +implements's."
-      keywords="from-errors">
-        <compile files="CircularPlusImplementsIntros.java">
-            <message kind="error" line="19"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="Introducing protected methods is causing a crash"
-      keywords="from-errors">
-        <compile files="ProtectedIntro.java">
-            <message kind="error" line="14"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="Introducing protected fields is causing a crash"
-      keywords="from-errors">
-        <compile files="ProtectedFieldIntro.java">
-            <message kind="error" line="14"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" pr="388"
-      title="two classes with the same fully-qualified names [eachjvm]"
-      keywords="from-errors"
-      comment="XXX error not flagging initial type">
-        <compile files="DuplicatedNames.java">
-            <message kind="error" line="3"/>
-            <message kind="error" line="5"/>
-            <message kind="error" line="7"/>
-            <message kind="error" line="9"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" pr="396"
-      title="Undefined pointcuts were throwing exceptions in 07b11 [callsto]"
-      keywords="from-errors">
-        <compile files="UndefinedPointCut_PR396.java">
-            <message kind="error" line="8"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" pr="240" title="advice on abstract pointcuts"
-      keywords="from-errors">
-        <compile files="StaticAdviceOnAbstract.java">
-            <message kind="error" line="17"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="Whoops, I forgot to put a class in the field access PCD."
-      keywords="from-errors">
-        <compile files="BadGetPCD.java">
-            <message kind="error" line="5"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" pr="138"
-      title="the arounds return something but there is no returns statement"
-      keywords="from-errors">
-        <compile files="MissingReturns.java">
-            <message kind="error" line="14"/>
-            <message kind="error" line="20"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" title="multiple conflicting introductions"
-      keywords="from-errors">
-        <compile files="MultipleIntros.java">
-            <message kind="error" line="5"/>
-            <message kind="error" line="16"/>
-            <message kind="error" line="18"/>
-            <message kind="error" line="19"/>
-            <message kind="error" line="22"/>
-            <message kind="error" line="27"/>
-            <message kind="error" line="30"/>
-            <!-- new error due to 275032 - other end of itd clash has error recorded against it -->
-            <message kind="error" line="7"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="referencing non-static pointcuts in outer aspects"
-      keywords="from-errors">
-        <compile files="StaticPointcutRefs.java">
-            <message kind="error" line="8"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="javac correct compiler error if there is no return in around returning result"
-      keywords="from-errors">
-        <compile files="NoReturnInProceed.java">
-            <message kind="error" line="16"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="should give an error for introducing two members with the same name"
-      keywords="from-errors">
-        <compile files="TwoIntros.java">
-            <message kind="error" line="10"/>
-            <message kind="error" line="14"/>
-            <message kind="error" line="16"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="wimpy test for undeclared and uncaught exceptions"
-      keywords="from-errors">
-        <compile files="UndeclaredThrows.java">
-            <message kind="error" line="12"/>
-            <message kind="error" line="18"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new"
-      title="Given non-matching TypePattern, CE flags use of non-introduced method rather than failure to introduce"
-      keywords="from-errors">
-        <compile
-          files="typepatternmatch/pack1/IntroErrorLocation.java,typepatternmatch/pack2/TargetClass.java">
-            <message kind="error" line="28"
-              file="pack1/IntroErrorLocation.java"
-              text="TargetClass cannot be resolved"/>
-            <message kind="warning" line="33"
-              file="pack1/IntroErrorLocation.java"
-              text="no match for this type name: TargetClass"/>
-            <message kind="error" line="39"
-              file="pack1/IntroErrorLocation.java"
-              text="undefined for the type TargetClass"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="457"
-      title="Compiler should suggest using aspect when advice, pointcuts, or introduction is in a class"
-      keywords="from-errors,poorErrorMessages">
-        <compile files="RecognizeAspectCE.java">
-            <message kind="error" line="3"  
-            	file="RecognizeAspectCE.java"
-            	text="Syntax error on token &quot;}&quot;, pointcut expected after this token"/>
-            <message kind="error" line="2"  
-            	file="RecognizeAspectCE.java"
-            	text="Syntax error"/>
-            <message kind="error" line="6"  
-            	file="RecognizeAspectCE.java"
-            	text="Syntax error"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="declare error working with pointcut and-not (amp,amp,bang)"
-      keywords="from-errors">
-        <compile files="DeclareError.java">
-            <message kind="error" line="5"/>
-            <message kind="error" line="19"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="534"
-      title="aspect as member of interface (private and protected)"
-      keywords="from-errors">
-        <compile files="AspectInInterfaceCF.java">
-            <message kind="error" line="11"/>
-            <message kind="error" line="14"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="494"
-      title="introduced inner interfaces - compile should fail to bind interface name outside of Aspect or if implementing method is not public"
-      keywords="from-errors">
-        <compile files="IntroduceInnerInterfaceCF.java" options="-Xlint:ignore">
-            <message kind="error" line="18"/>
-            <message kind="error" line="19"/>
-            <message kind="error" line="20"/>
-            <message kind="error" line="24"/>
-            <message kind="error" line="42"/>
-            <message kind="error" line="45"/>
-            <message kind="error" line="48"/>
-            <message kind="error" line="50"/>
-            <message kind="error" line="58"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="aspects may not implement Serializable or Cloneable"
-      keywords="from-errors">
-        <compile files="AspectInterfaces.java">
-            <message kind="error" line="4"/>
-            <message kind="error" line="5"/>
-            <message kind="error" line="9"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors"
-      title="explicit constructor calls can throw exceptions"
-      keywords="from-errors">
-        <compile files="ExplicitConstructorThrows.java">
-            <message kind="error" line="3"/>
-            <message kind="error" line="12"/>
-            <message kind="error" line="18"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="errors" pr="664" title="bad proceed args good error messages"
-      keywords="from-errors">
-        <compile files="ProceedArgsCE.java">
-            <message kind="error" line="13"/>
-            <message kind="error" line="16"/>
-            <message kind="error" line="19"/>
-        </compile>
-    </ajc-test>
-
-
diff --git a/tests/src/test/resources/org/aspectj/systemtest/pre10x/pre10x.xml b/tests/src/test/resources/org/aspectj/systemtest/pre10x/pre10x.xml
index cfaa7480d..0e6215979 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/pre10x/pre10x.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/pre10x/pre10x.xml
@@ -1,10 +1,643 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[
-<!ENTITY tests SYSTEM "../tests/src/org/aspectj/systemtest/pre10x/pre10x-tests.xml">
-]>
+<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
 <!-- AspectJ v0.8 - 0.99 Tests -->
 
 <suite>
 
-&tests;
+    <ajc-test dir="pureJava" title="Using 'aspect' as identifier is legal TODO"
+      keywords="from-java" comment="keep this test in main suite">
+        <compile files="KeywordAspect.java"/>
+        <run class="KeywordAspect"/>
+    </ajc-test>
+
+    <ajc-test dir="pureJava"
+      title="Using 'pointcut' as identifier is legal TODO"
+      keywords="from-java" comment="keep this test in main suite">
+        <compile files="KeywordPointcut.java"/>
+        <run class="KeywordPointcut"/>
+    </ajc-test>
+
+    <ajc-test dir="new/introTypeMissing"
+      title="CF expected when enclosing class superclass used as this qualifier in inner class"
+      keywords="from-java">
+        <compile files="TargetClassCF.java,Util.java">
+            <message kind="error" line="22"/>
+            <message kind="error" line="23"/>
+            <message kind="error" line="27"/>
+            <message kind="error" line="28"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="new/introTypeMissing"
+      title="enclosing class may be used as this qualifier in inner class"
+      keywords="from-java">
+        <compile files="TargetClassCP.java,Util.java"/>
+        <run class="TargetClassCP"/>
+    </ajc-test>
+
+    <ajc-test dir="errors"
+      title="reasonable error for crosscut reference with no formals specified"
+      keywords="from-errors">
+        <compile files="NoFormalsCrosscut.java">
+            <message kind="error" line="6"/>
+            <message kind="error" line="7"/>
+            <message kind="error" line="8"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors"
+      title="reasonable error for introduction on type whose source isn't found"
+      keywords="from-errors">
+        <compile files="NoSource.java">
+            <message kind="error" line="4"/>
+        </compile>
+    </ajc-test>
+
+
+    <ajc-test dir="errors"
+      title="handle errors in crosscut designators, insist that they end with a semicolon"
+      keywords="from-errors">
+        <compile files="BadDesignator.java">
+            <message kind="error" line="4"/>
+        </compile>
+    </ajc-test>
+
+
+    <ajc-test dir="errors"
+      title="try to return from a before, after, after throwing and after returning"
+      keywords="from-errors">
+        <compile files="InvalidReturn.java">
+            <message kind="error" line="12"/>
+            <message kind="error" line="16"/>
+            <message kind="error" line="19"/>
+            <message kind="error" line="22"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors" pr="130"
+      title="the designator has a wildcard for method name but no return type specified"
+      keywords="from-errors">
+        <compile files="NoReturnTypeInDesignator.java">
+            <message kind="error" line="6"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors"
+      title="the designator for the introduction has no type after the | charcter"
+      keywords="from-errors">
+        <compile files="BadIntroductionDesignator.java">
+            <message kind="error" line="6"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors" pr="140" title="crosscut signature does not match"
+      keywords="from-errors">
+        <compile files="BadCCutSig.java">
+            <message kind="error" line="8"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors"
+      title="proper exit conditions when errors fall through to javac"
+      keywords="from-errors">
+        <compile files="FromJavac.java">
+            <message kind="error" line="11"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors" pr="213"
+      title="mismatched parens on advice (wasn't binding Tester)"
+      keywords="from-errors">
+        <compile files="MismatchedParens.java">
+            <message kind="error" line="16"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors" pr="209" title="Non-static advice silently ignored"
+      keywords="from-errors">
+        <compile files="BadPointcutName.java">
+            <message kind="error" line="15"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors" pr="219" title="extra closing brace"
+      keywords="from-errors">
+        <compile files="ExtraClosingBrace.java">
+            <message kind="error" line="8"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors" pr="244"
+      title="decent errors for around return type not matching target point"
+      keywords="from-errors">
+        <compile files="AroundReturnType.java" options="-1.4">
+            <message kind="error" line="2"/>
+            <message kind="error" line="6"/>
+            <message kind="error" line="7"/>
+            <message kind="error" line="16"/>
+            <message kind="error" line="21"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors" title="eachobject: can't call new on an aspect of"
+      keywords="from-errors">
+        <compile files="CantCallConstructorOnAspects.java">
+            <message kind="error" line="4"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors"
+      title="eachobject: only zero-argument constructors allowed in an aspect"
+      keywords="from-errors,fail-unimplemented">
+        <compile files="AspectsCantHaveYesArgumentConstructors.java">
+            <message kind="error" line="8"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors" title="eachobject: can't extend a concrete aspect"
+      keywords="from-errors,fail-unimplemented">
+        <compile files="SubAspectsCantExtendNonAbstractAspects.java">
+            <message kind="error" line="14"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors" pr="271" title="instanceof used without a class"
+      keywords="from-errors">
+        <compile files="InstanceofWithoutClass.java">
+            <message kind="error" line="14"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors" pr="280" title="wildcard used for returns clause"
+      keywords="from-errors">
+        <compile files="WildcardForReturns.java">
+            <message kind="error" line="17"/>           
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors" pr="280" title="no return statement in around advice"
+      keywords="from-errors,new-messages-vary">
+        <compile files="NoReturnStatement.java">
+            <message kind="error" line="14"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors" pr="286"
+      title="inner aspects must be static (no longer matches PR#286)"
+      keywords="from-errors,fail-unimplemented">
+        <compile files="AbstractAspectOf.java">
+            <message kind="error" line="12"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors"
+      title="Casting class declarations as interfaces"
+      keywords="from-errors">
+        <compile files="InterfaceCast.java">
+            <message kind="error" line="14"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors"
+      title="omits a variable name and crashes with a null pointer"
+      keywords="from-errors">
+        <compile files="BindingNullPointer.java">
+            <message kind="error" line="7"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors"
+      title="Not generating an error for using new as a method name"
+      keywords="from-errors">
+        <compile files="New.java">
+            <message kind="error" line="12"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors" title="ClassCastException on the int literal"
+      keywords="from-errors">
+        <compile files="IntLiteral.java">
+            <message kind="error" line="17"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="Wrong strictfp keyword usage in interface function prototype [TODO: move to errors]"
+      keywords="from-errors">
+        <compile files="StrictFpCErr1.java">
+            <message kind="error" line="3"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="Wrong strictfp keyword usage in field declaration [TODO: move to errors]"
+      keywords="from-errors">
+        <compile files="StrictFpCErr2.java">
+            <message kind="error" line="3"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="Wrong strictfp keyword usage in constructor declaration [TODO: move to errors]"
+      keywords="from-errors">
+        <compile files="StrictFpCErr3.java">
+            <message kind="error" line="3"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors"
+      title="Incorrect static casts to primitively foldable arguments should not crash the compiler."
+      keywords="from-errors">
+        <compile files="BadStaticCast.java">
+            <message kind="error" line="5"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors" title="Dominates with commas should signal an error."
+      keywords="from-errors">
+        <compile files="DominatesWithCommas.java">
+            <message kind="error" line="9"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors" pr="95"
+      title="stack overflow with recursive crosscut specifier"
+      keywords="from-errors">
+        <compile files="RecursiveCCutSpecifier.java">
+            <message kind="error" line="10"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors"
+      title="Throwing a NullPointerException when formals can't be bound in named pointcut"
+      keywords="from-errors">
+        <compile files="BadFormalsToCalls.java">
+            <message kind="error" line="22"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors" pr="385"
+      title="disallow defining more than one pointcut with the same name"
+      keywords="from-errors,fail-unimplemented">
+        <compile files="OverloadedPointcuts.java">
+            <message kind="error" line="4"/>
+            <message kind="error" line="5"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors"
+      title="pre 0.7 introduction form outside aspect body causes an EmptyStackException"
+      keywords="from-errors">
+        <compile files="BadIntroduction.java">
+            <message kind="error" line="1" />
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors" title="a class can't extend an aspect"
+      keywords="from-errors,fail-unimplemented">
+        <compile files="ClassExtendingAspect.java">
+            <message kind="error" line="19"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors"
+      title="a before() clause at the class-level causes an EmptyStackException"
+      keywords="from-errors">
+        <compile files="TopLevelBefore.java">
+            <message kind="error" line="1"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors"
+      title="an after() clause at the class-level causes an EmptyStackException"
+      keywords="from-errors">
+        <compile files="TopLevelAfter.java">
+            <message kind="error" line="1"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors"
+      title="an around() clause at the class-level causes an EmptyStackException"
+      keywords="from-errors">
+        <compile files="TopLevelAround.java">
+            <message kind="error" line="1"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors" title="Doesn't detect cyclic inheritance of aspects."
+      keywords="from-errors">
+        <compile files="CircularExtendsAspect.java">
+            <message kind="error" line="18"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors"
+      title="Binds the pointcut formals to member variables instead of pointcut formals."
+      keywords="from-errors">
+        <compile files="PointcutFormals.java" options="-Xlint:warning">
+            <message kind="error" line="14"/>
+            <message kind="error" line="15"/>
+            <message kind="warning" line="16"/>
+            <message kind="warning" line="17"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors" title="ambiguous formal in formals pattern"
+      keywords="from-errors">
+        <compile files="AmbiguousFormal.java">
+            <message kind="error" line="6"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors"
+      title="good error for field name instead of type name"
+      keywords="from-errors">
+        <compile files="BadTypeName.java">
+            <message kind="error" line="2"/>
+            <message kind="error" line="4"/>
+            <message kind="error" line="6"/>
+            <message kind="error" line="8"/>
+            <message kind="error" line="10"/>
+            <message kind="error" line="12"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors" title="errors in aspect inheritance - 1"
+      keywords="from-errors">
+        <compile files="AspectInheritance1.java">
+            <message kind="error" line="17"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors" title="errors in aspect inheritance - 2"
+         keywords="from-errors">
+        <compile files="AspectInheritance2.java">
+            <message kind="error" line="8"/>
+            <message kind="error" line="16"/>
+            <message kind="error" line="20"/>
+            <message kind="error" line="26"/>
+            <message kind="error" line="30"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors" title="errors in aspect inheritance - 3"
+      keywords="from-errors">
+        <compile files="AspectInheritance3.java">
+            <message kind="error" line="19"/>
+            <message kind="error" line="24"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors" title="errors in aspect inheritance - 4"
+      keywords="from-errors">
+        <compile files="AspectInheritance4.java">
+            <message kind="error" line="17"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors"
+      title="circular dominates leading to irresolvable advice precedence"
+      keywords="from-errors">
+        <compile files="CircularDominates.java" options="-1.4">
+            <message kind="error" line="12"/>
+            <message kind="error" line="16"/>
+            <message kind="error" line="20"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors"
+      title="Should issue an error for using 'class' instead of 'aspect'"
+      keywords="from-errors">
+        <compile files="NoAspect.java">
+            <message kind="error" line="1" text="Syntax error on token &quot;{&quot;, ; expected"/>
+            <message kind="error" line="12" text="Syntax error on token &quot;{&quot;, pointcut expected after this token"/>
+            <message kind="error" line="12" text="Syntax error, insert &quot;;&quot; to complete ClassBodyDeclarations"/>
+            <message kind="error" line="12" text="Syntax error on token &quot;{&quot;, delete this token"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors"
+      title="Should signal an error when we need an exposed value but don't provide it"
+      keywords="from-errors">
+        <compile files="MissingExposure.java">
+            <message kind="error" line="13"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors"
+      title="StackOverFlowException with circular +implements's."
+      keywords="from-errors">
+        <compile files="CircularPlusImplementsIntros.java">
+            <message kind="error" line="19"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors"
+      title="Introducing protected methods is causing a crash"
+      keywords="from-errors">
+        <compile files="ProtectedIntro.java">
+            <message kind="error" line="14"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors"
+      title="Introducing protected fields is causing a crash"
+      keywords="from-errors">
+        <compile files="ProtectedFieldIntro.java">
+            <message kind="error" line="14"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors" pr="388"
+      title="two classes with the same fully-qualified names [eachjvm]"
+      keywords="from-errors"
+      comment="XXX error not flagging initial type">
+        <compile files="DuplicatedNames.java">
+            <message kind="error" line="3"/>
+            <message kind="error" line="5"/>
+            <message kind="error" line="7"/>
+            <message kind="error" line="9"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors" pr="396"
+      title="Undefined pointcuts were throwing exceptions in 07b11 [callsto]"
+      keywords="from-errors">
+        <compile files="UndefinedPointCut_PR396.java">
+            <message kind="error" line="8"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors" pr="240" title="advice on abstract pointcuts"
+      keywords="from-errors">
+        <compile files="StaticAdviceOnAbstract.java">
+            <message kind="error" line="17"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors"
+      title="Whoops, I forgot to put a class in the field access PCD."
+      keywords="from-errors">
+        <compile files="BadGetPCD.java">
+            <message kind="error" line="5"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors" pr="138"
+      title="the arounds return something but there is no returns statement"
+      keywords="from-errors">
+        <compile files="MissingReturns.java">
+            <message kind="error" line="14"/>
+            <message kind="error" line="20"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors" title="multiple conflicting introductions"
+      keywords="from-errors">
+        <compile files="MultipleIntros.java">
+            <message kind="error" line="5"/>
+            <message kind="error" line="16"/>
+            <message kind="error" line="18"/>
+            <message kind="error" line="19"/>
+            <message kind="error" line="22"/>
+            <message kind="error" line="27"/>
+            <message kind="error" line="30"/>
+            <!-- new error due to 275032 - other end of itd clash has error recorded against it -->
+            <message kind="error" line="7"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors"
+      title="referencing non-static pointcuts in outer aspects"
+      keywords="from-errors">
+        <compile files="StaticPointcutRefs.java">
+            <message kind="error" line="8"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="javac correct compiler error if there is no return in around returning result"
+      keywords="from-errors">
+        <compile files="NoReturnInProceed.java">
+            <message kind="error" line="16"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors"
+      title="should give an error for introducing two members with the same name"
+      keywords="from-errors">
+        <compile files="TwoIntros.java">
+            <message kind="error" line="10"/>
+            <message kind="error" line="14"/>
+            <message kind="error" line="16"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors"
+      title="wimpy test for undeclared and uncaught exceptions"
+      keywords="from-errors">
+        <compile files="UndeclaredThrows.java">
+            <message kind="error" line="12"/>
+            <message kind="error" line="18"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="new"
+      title="Given non-matching TypePattern, CE flags use of non-introduced method rather than failure to introduce"
+      keywords="from-errors">
+        <compile
+          files="typepatternmatch/pack1/IntroErrorLocation.java,typepatternmatch/pack2/TargetClass.java">
+            <message kind="error" line="28"
+              file="pack1/IntroErrorLocation.java"
+              text="TargetClass cannot be resolved"/>
+            <message kind="warning" line="33"
+              file="pack1/IntroErrorLocation.java"
+              text="no match for this type name: TargetClass"/>
+            <message kind="error" line="39"
+              file="pack1/IntroErrorLocation.java"
+              text="undefined for the type TargetClass"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="457"
+      title="Compiler should suggest using aspect when advice, pointcuts, or introduction is in a class"
+      keywords="from-errors,poorErrorMessages">
+        <compile files="RecognizeAspectCE.java">
+            <message kind="error" line="3"  
+            	file="RecognizeAspectCE.java"
+            	text="Syntax error on token &quot;}&quot;, pointcut expected after this token"/>
+            <message kind="error" line="2"  
+            	file="RecognizeAspectCE.java"
+            	text="Syntax error"/>
+            <message kind="error" line="6"  
+            	file="RecognizeAspectCE.java"
+            	text="Syntax error"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors"
+      title="declare error working with pointcut and-not (amp,amp,bang)"
+      keywords="from-errors">
+        <compile files="DeclareError.java">
+            <message kind="error" line="5"/>
+            <message kind="error" line="19"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="534"
+      title="aspect as member of interface (private and protected)"
+      keywords="from-errors">
+        <compile files="AspectInInterfaceCF.java">
+            <message kind="error" line="11"/>
+            <message kind="error" line="14"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="494"
+      title="introduced inner interfaces - compile should fail to bind interface name outside of Aspect or if implementing method is not public"
+      keywords="from-errors">
+        <compile files="IntroduceInnerInterfaceCF.java" options="-Xlint:ignore">
+            <message kind="error" line="18"/>
+            <message kind="error" line="19"/>
+            <message kind="error" line="20"/>
+            <message kind="error" line="24"/>
+            <message kind="error" line="42"/>
+            <message kind="error" line="45"/>
+            <message kind="error" line="48"/>
+            <message kind="error" line="50"/>
+            <message kind="error" line="58"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors"
+      title="aspects may not implement Serializable or Cloneable"
+      keywords="from-errors">
+        <compile files="AspectInterfaces.java">
+            <message kind="error" line="4"/>
+            <message kind="error" line="5"/>
+            <message kind="error" line="9"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors"
+      title="explicit constructor calls can throw exceptions"
+      keywords="from-errors">
+        <compile files="ExplicitConstructorThrows.java">
+            <message kind="error" line="3"/>
+            <message kind="error" line="12"/>
+            <message kind="error" line="18"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="errors" pr="664" title="bad proceed args good error messages"
+      keywords="from-errors">
+        <compile files="ProceedArgsCE.java">
+            <message kind="error" line="13"/>
+            <message kind="error" line="16"/>
+            <message kind="error" line="19"/>
+        </compile>
+    </ajc-test>
+
+
+
 
 </suite>
\ No newline at end of file
diff --git a/tests/src/test/resources/org/aspectj/systemtest/serialVerUID/serialVerUID-tests.xml b/tests/src/test/resources/org/aspectj/systemtest/serialVerUID/serialVerUID-tests.xml
deleted file mode 100644
index d6346ceac..000000000
--- a/tests/src/test/resources/org/aspectj/systemtest/serialVerUID/serialVerUID-tests.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<!-- SUID Tests -->
-
-    <ajc-test dir="bugs/serialVersionUID"
-		title="SUID: Before execution advice" pr="41181">
-		<compile files="Test.java, Util.java"/>
-        <run class="Test"/>
-		<compile files="Test.java, Util.java, BeforeExecutionAdvice.aj" options="-Xlint:warning"/>
-        <run class="Util"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs/serialVersionUID"
-		title="SUID: Around execution advice" comment="OK because around_body private" pr="41181">
-		<compile files="Test.java, Util.java"/>
-        <run class="Test"/>
-		<compile files="Test.java, Util.java, AroundExecutionAdvice.aj" options="-Xlint:warning"/>
-        <run class="Util"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs/serialVersionUID" 
-	    title="SUID: Around closure execution advice (-Xlint:ignore)" comment="OK because ignoring warnings"
-		pr="41181">
-		<compile files="Test.java, Util.java"/>
-        <run class="Test"/>
-		<compile files="Test.java, Util.java, AroundClosureExecutionAdvice.aj" options="-Xlint:ignore"/>
-        <run class="Util" options="-fail"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs/serialVersionUID"
-		title="SUID: Around closure execution advice" comment="Warning because around_body non-private"
-		pr="41181">
-		<compile files="Test.java, Util.java"/>
-        <run class="Test"/>
-		<compile files="Test.java, Util.java, AroundClosureExecutionAdvice.aj"
-		  xlintfile="Xlint.properties">
-            <message kind="warning" line="9"/>
-		</compile>
-        <run class="Util" options="-fail"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs/serialVersionUID"
-		title="SUID: thisJoinPoint" comment="Warning because of introduced clinit"	pr="41181">
-		<compile files="Test.java, Util.java"/>
-        <run class="Test"/>
-		<compile
-			files="Test.java, Util.java, TJP.aj" options="-Xlint:warning">
-            <message kind="warning" line="6"/>
-            <message kind="warning" line="13"/>
-            <message kind="warning" line="17"/>
-            <message kind="warning" line="24"/>
-            <message kind="warning" line="31"/>
-		</compile>
-        <run class="Util" options="-fail"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs/serialVersionUID"
-		title="SUID: thisJoinPoint with clinit method" comment="OK if tjp private and existing clinit"
-		pr="41181">
-		<compile files="ClinitTest.java, Util.java"/>
-        <run class="ClinitTest"/>
-		<compile files="ClinitTest.java, Util.java, TJP.aj" options="-Xlint:warning -1.4">
-		  <message kind="warning" line="24" text="can not build"/>
-		  <message kind="warning" line="31" text="can not build"/>
-		</compile>
-        <run class="Util" options="-read"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs/serialVersionUID"
-		title="SUID: After returning staticinitialization advice" comment="Warning because of added clinit"
-		pr="41181">
-		<compile files="Test.java, Util.java"/>
-        <run class="Test"/>
-		<compile
-		  files="Test.java, Util.java, AfterReturningStaticinitializationAdvice.aj" options="-Xlint:warning">
-            <message kind="warning" line="6"/>
-		</compile>
-        <run class="Util" options="-fail"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs/serialVersionUID"
-		title="SUID: After returning staticinitialization advice with serialVersionUID field"
-		comment="OK because of serialVersionUID field" pr="41181">
-		<compile files="SuidTest.java, Util.java" />
-        <run class="SuidTest"/>
-		<compile files="SuidTest.java, Util.java, AfterReturningStaticinitializationAdvice.aj" options="-Xlint:warning"/>
-        <run class="Util"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs/serialVersionUID"
-		title="SUID: ITD field" comment="Error because added field may not be initialized" pr="41181">
-		<compile files="Test.java, Util.java"/>
-        <run class="Test"/>
-		<compile files="Test.java, Util.java, ITDField.aj" options="-Xlint:error">
-			<message kind="error" line="1"/> <!-- two messages about new getter/setter affecting suid for private itd field -->
-            <message kind="error" line="3"/>
-		</compile>
-	</ajc-test>
-
-	<ajc-test dir="bugs/serialVersionUID"
-		title="SUID: ITD method" comment="Warning because of added method" pr="41181">
-		<compile files="Test.java, Util.java" />
-        <run class="Test"/>
-		<compile files="Test.java, Util.java, ITDMethod.aj" options="-Xlint:warning">
-            <message kind="warning" line="3"/>
-		</compile>
-        <run class="Util" options="-fail"/>
-	</ajc-test>
-    
-	<ajc-test dir="bugs/serialVersionUID"
-		title="SUID: Declare extends" comment="OK" pr="41181">
-		<compile files="Test.java, Util.java" />
-        <run class="Test"/>
-		<compile files="Test.java, Util.java, DeclareExtends.aj" options="-Xlint:warning"/>
-        <run class="Util"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs/serialVersionUID"
-		title="SUID: Declare implements (compile)" comment="Warning because of added interface" pr="41181">
-		<compile files="Test.java, Util.java" />
-        <run class="Test"/>
-		<compile files="Test.java, Util.java, DeclareImplements.aj" options="-Xlint:warning">
-            <message kind="warning" line="3"/>
-		</compile>
-        <run class="Util" options="-fail"/>
-	</ajc-test>
- 
- 	<ajc-test dir="bugs/serialVersionUID"
-		title="SUID: Declare implements non-Serializable (compile)" comment="OK because not Serializable"
-		pr="41181">
-		<compile files="NonSerializableTest.java, DeclareImplements.aj" options="-Xlint:warning"/>
-	</ajc-test>
- 
- 	<ajc-test dir="bugs/serialVersionUID"
-		title="SUID: Declare implements Serializable (compile)" comment="OK because adding Serializable"
-		pr="41181">
-		<compile files="NonSerializableTest.java, DeclareImplementsSerializable.aj" options="-Xlint:warning"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs/serialVersionUID"
-		title="SUID: Declare implements (weave)" comment="Warning because of added interface" pr="41181">
-		<compile files="Test.java, Util.java" />
-        <run class="Test"/>
-		<compile files="injar.jar, DeclareImplements.aj" options="-Xlint:warning">
-            <message kind="warning" line="3"/>
-		</compile>
-        <run class="Util" options="-fail"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs/serialVersionUID" title="SUID: Priviliged aspect" pr="41181">
-		<compile files="Test.java, Util.java"/>
-        <run class="Test"/>
-		<compile files="Test.java, Util.java, PrivilegedAspect.aj" options="-Xlint:warning">
-            <message kind="warning" line="0"/>
-		</compile>
-        <run class="Util" options="-fail"/>
-	</ajc-test>
-
-	<ajc-test dir="bugs/serialVersionUID"
-		title="SUID: Perthis aspect"
-		comment="Warning because added of added interface MightHaveAspect. Added field is private transient"
-		pr="41181">
-		<compile files="Test.java, Util.java" />
-        <run class="Test"/>
-		<compile files="Test.java, Util.java, PerThisAspect.aj" options="-Xlint:warning">
-            <message kind="warning" line="0"/>
-		</compile>
-        <run class="Util" options="-fail"/>
-	</ajc-test>
-    
-
diff --git a/tests/src/test/resources/org/aspectj/systemtest/serialVerUID/serialVerUID.xml b/tests/src/test/resources/org/aspectj/systemtest/serialVerUID/serialVerUID.xml
index 20bfa889d..3d10e8d63 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/serialVerUID/serialVerUID.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/serialVerUID/serialVerUID.xml
@@ -1,10 +1,174 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[
-<!ENTITY tests SYSTEM "../tests/src/org/aspectj/systemtest/serialVerUID/serialVerUID-tests.xml">
-]>
+<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
 <!-- SUID Tests -->
-
 <suite>
 
-&tests;
+    <ajc-test dir="bugs/serialVersionUID"
+		title="SUID: Before execution advice" pr="41181">
+		<compile files="Test.java, Util.java"/>
+        <run class="Test"/>
+		<compile files="Test.java, Util.java, BeforeExecutionAdvice.aj" options="-Xlint:warning"/>
+        <run class="Util"/>
+	</ajc-test>
+
+	<ajc-test dir="bugs/serialVersionUID"
+		title="SUID: Around execution advice" comment="OK because around_body private" pr="41181">
+		<compile files="Test.java, Util.java"/>
+        <run class="Test"/>
+		<compile files="Test.java, Util.java, AroundExecutionAdvice.aj" options="-Xlint:warning"/>
+        <run class="Util"/>
+	</ajc-test>
+
+	<ajc-test dir="bugs/serialVersionUID" 
+	    title="SUID: Around closure execution advice (-Xlint:ignore)" comment="OK because ignoring warnings"
+		pr="41181">
+		<compile files="Test.java, Util.java"/>
+        <run class="Test"/>
+		<compile files="Test.java, Util.java, AroundClosureExecutionAdvice.aj" options="-Xlint:ignore"/>
+        <run class="Util" options="-fail"/>
+	</ajc-test>
+
+	<ajc-test dir="bugs/serialVersionUID"
+		title="SUID: Around closure execution advice" comment="Warning because around_body non-private"
+		pr="41181">
+		<compile files="Test.java, Util.java"/>
+        <run class="Test"/>
+		<compile files="Test.java, Util.java, AroundClosureExecutionAdvice.aj"
+		  xlintfile="Xlint.properties">
+            <message kind="warning" line="9"/>
+		</compile>
+        <run class="Util" options="-fail"/>
+	</ajc-test>
+
+	<ajc-test dir="bugs/serialVersionUID"
+		title="SUID: thisJoinPoint" comment="Warning because of introduced clinit"	pr="41181">
+		<compile files="Test.java, Util.java"/>
+        <run class="Test"/>
+		<compile
+			files="Test.java, Util.java, TJP.aj" options="-Xlint:warning">
+            <message kind="warning" line="6"/>
+            <message kind="warning" line="13"/>
+            <message kind="warning" line="17"/>
+            <message kind="warning" line="24"/>
+            <message kind="warning" line="31"/>
+		</compile>
+        <run class="Util" options="-fail"/>
+	</ajc-test>
+
+	<ajc-test dir="bugs/serialVersionUID"
+		title="SUID: thisJoinPoint with clinit method" comment="OK if tjp private and existing clinit"
+		pr="41181">
+		<compile files="ClinitTest.java, Util.java"/>
+        <run class="ClinitTest"/>
+		<compile files="ClinitTest.java, Util.java, TJP.aj" options="-Xlint:warning -1.4">
+		  <message kind="warning" line="24" text="can not build"/>
+		  <message kind="warning" line="31" text="can not build"/>
+		</compile>
+        <run class="Util" options="-read"/>
+	</ajc-test>
+
+	<ajc-test dir="bugs/serialVersionUID"
+		title="SUID: After returning staticinitialization advice" comment="Warning because of added clinit"
+		pr="41181">
+		<compile files="Test.java, Util.java"/>
+        <run class="Test"/>
+		<compile
+		  files="Test.java, Util.java, AfterReturningStaticinitializationAdvice.aj" options="-Xlint:warning">
+            <message kind="warning" line="6"/>
+		</compile>
+        <run class="Util" options="-fail"/>
+	</ajc-test>
+
+	<ajc-test dir="bugs/serialVersionUID"
+		title="SUID: After returning staticinitialization advice with serialVersionUID field"
+		comment="OK because of serialVersionUID field" pr="41181">
+		<compile files="SuidTest.java, Util.java" />
+        <run class="SuidTest"/>
+		<compile files="SuidTest.java, Util.java, AfterReturningStaticinitializationAdvice.aj" options="-Xlint:warning"/>
+        <run class="Util"/>
+	</ajc-test>
+
+	<ajc-test dir="bugs/serialVersionUID"
+		title="SUID: ITD field" comment="Error because added field may not be initialized" pr="41181">
+		<compile files="Test.java, Util.java"/>
+        <run class="Test"/>
+		<compile files="Test.java, Util.java, ITDField.aj" options="-Xlint:error">
+			<message kind="error" line="1"/> <!-- two messages about new getter/setter affecting suid for private itd field -->
+            <message kind="error" line="3"/>
+		</compile>
+	</ajc-test>
+
+	<ajc-test dir="bugs/serialVersionUID"
+		title="SUID: ITD method" comment="Warning because of added method" pr="41181">
+		<compile files="Test.java, Util.java" />
+        <run class="Test"/>
+		<compile files="Test.java, Util.java, ITDMethod.aj" options="-Xlint:warning">
+            <message kind="warning" line="3"/>
+		</compile>
+        <run class="Util" options="-fail"/>
+	</ajc-test>
+    
+	<ajc-test dir="bugs/serialVersionUID"
+		title="SUID: Declare extends" comment="OK" pr="41181">
+		<compile files="Test.java, Util.java" />
+        <run class="Test"/>
+		<compile files="Test.java, Util.java, DeclareExtends.aj" options="-Xlint:warning"/>
+        <run class="Util"/>
+	</ajc-test>
+
+	<ajc-test dir="bugs/serialVersionUID"
+		title="SUID: Declare implements (compile)" comment="Warning because of added interface" pr="41181">
+		<compile files="Test.java, Util.java" />
+        <run class="Test"/>
+		<compile files="Test.java, Util.java, DeclareImplements.aj" options="-Xlint:warning">
+            <message kind="warning" line="3"/>
+		</compile>
+        <run class="Util" options="-fail"/>
+	</ajc-test>
+ 
+ 	<ajc-test dir="bugs/serialVersionUID"
+		title="SUID: Declare implements non-Serializable (compile)" comment="OK because not Serializable"
+		pr="41181">
+		<compile files="NonSerializableTest.java, DeclareImplements.aj" options="-Xlint:warning"/>
+	</ajc-test>
+ 
+ 	<ajc-test dir="bugs/serialVersionUID"
+		title="SUID: Declare implements Serializable (compile)" comment="OK because adding Serializable"
+		pr="41181">
+		<compile files="NonSerializableTest.java, DeclareImplementsSerializable.aj" options="-Xlint:warning"/>
+	</ajc-test>
+
+	<ajc-test dir="bugs/serialVersionUID"
+		title="SUID: Declare implements (weave)" comment="Warning because of added interface" pr="41181">
+		<compile files="Test.java, Util.java" />
+        <run class="Test"/>
+		<compile files="injar.jar, DeclareImplements.aj" options="-Xlint:warning">
+            <message kind="warning" line="3"/>
+		</compile>
+        <run class="Util" options="-fail"/>
+	</ajc-test>
+
+	<ajc-test dir="bugs/serialVersionUID" title="SUID: Priviliged aspect" pr="41181">
+		<compile files="Test.java, Util.java"/>
+        <run class="Test"/>
+		<compile files="Test.java, Util.java, PrivilegedAspect.aj" options="-Xlint:warning">
+            <message kind="warning" line="0"/>
+		</compile>
+        <run class="Util" options="-fail"/>
+	</ajc-test>
+
+	<ajc-test dir="bugs/serialVersionUID"
+		title="SUID: Perthis aspect"
+		comment="Warning because added of added interface MightHaveAspect. Added field is private transient"
+		pr="41181">
+		<compile files="Test.java, Util.java" />
+        <run class="Test"/>
+		<compile files="Test.java, Util.java, PerThisAspect.aj" options="-Xlint:warning">
+            <message kind="warning" line="0"/>
+		</compile>
+        <run class="Util" options="-fail"/>
+	</ajc-test>
+    
+
+
 
 </suite>
diff --git a/tests/src/test/resources/org/aspectj/systemtest/xlint/xlint-tests.xml b/tests/src/test/resources/org/aspectj/systemtest/xlint/xlint-tests.xml
deleted file mode 100644
index 4bbf23841..000000000
--- a/tests/src/test/resources/org/aspectj/systemtest/xlint/xlint-tests.xml
+++ /dev/null
@@ -1,267 +0,0 @@
-<!-- XLint Tests -->
-
-   <!-- .................................... -Xlint tests -->
-    <!-- ............... positive -Xlint tests -->
-    
-    <ajc-test dir="bugs/lazyTjpXLintWarning"
-		title="no XLint warning: thisJoinPoint potentially lazy and nothing stopping it">
-		<compile options="-Xlint:warning" files="Scenario1.aj"/>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/lazyTjpXLintWarning"
-		title="XLint warning: thisJoinPoint potentially lazy but stopped by around advice which doesn't use tjp">
-		<compile options="-Xlint:warning" files="Scenario2.aj">
-			<message kind="warning" line="21" text="can not implement lazyTjp on this joinpoint method-execution(void Test.main(java.lang.String[])) because around advice is used [Xlint:canNotImplementLazyTjp]"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/lazyTjpXLintWarning"
-		title="no XLint warning: thisJoinPoint not lazy (no if PCD) but would have been stopped anyway by around advice">
-		<compile options="-Xlint:warning" files="Scenario3.aj">
-			<message kind="warning" line="14" text="can not build thisJoinPoint lazily for this advice since it has no suitable guard [Xlint:noGuardForLazyTjp]"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/lazyTjpXLintWarning" title="no XLint warning: thisJoinPoint cannot be built lazily">
-		<compile options="-Xlint:warning" files="Scenario4.aj">
-			<message kind="warning" line="9" text="can not build thisJoinPoint lazily for this advice since it has no suitable guard"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/lazyTjpXLintWarning"
-		title="XLint warning: thisJoinPoint potentially lazy but stopped by around advice which uses tjp">
-		<compile options="-Xlint:warning" files="Scenario5.aj">
-			<message kind="warning" line="22" text="can not implement lazyTjp on this joinpoint method-execution(void Test.main(java.lang.String[])) because around advice is used [Xlint:canNotImplementLazyTjp]"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/lazyTjpXLintWarning"
-		title="check for xlazytjp warning if actually supplied">
-		<compile options="-XlazyTjp -Xlint:warning" files="Scenario1.aj">
-		  <message kind="warning" text="-XlazyTjp should no longer be used, build tjps lazily is now the default"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/lazyTjpXLintWarning"
-		title="lazytjp: warning when around advice uses tjp">
-		<compile options="-Xlint:warning" files="LazyTjpTest1.java">
-			<message kind="warning" line="4" text="can not implement lazyTjp on this joinpoint method-execution(void LazyTjpTest1.test2()) because around advice is used [Xlint:canNotImplementLazyTjp]"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/lazyTjpXLintWarning"
-		title="lazytjp: warning when if missing on before advice">
-		<compile options="-Xlint:warning" files="LazyTjpTest2.java">
-		  <message kind="warning" line="16" text="can not build thisJoinPoint lazily for this advice since it has no suitable guard"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/lazyTjpXLintWarning"
-		title="lazytjp: warning when if missing on after advice">
-		<compile options="-Xlint:warning" files="LazyTjpTest3.java">
-		  <message kind="warning" line="17" text="can not build thisJoinPoint lazily for this advice since it has no suitable guard"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/lazyTjpXLintWarning"
-		title="lazytjp: multiple clashing advice preventing lazytjp">
-		<compile options="-Xlint:warning" files="LazyTjpTest4.java">
-		  <message kind="warning" line="13" text="can not build thisJoinPoint lazily for this advice since it has no suitable guard"/>
-		  <message kind="warning" line="3"  text="can not implement lazyTjp at joinpoint method-execution(void LazyTjpTest4.test1()) because of advice conflicts, see secondary locations to find conflicting advice"/>
-		  <message kind="warning" line="17" text="can not build thisJoinPoint lazily for this advice since it has no suitable guard"/>
-		</compile>
-	</ajc-test>
-	
-	<ajc-test dir="bugs/lazyTjpXLintWarning"
-		title="lazytjp: interfering before and around">
-		<compile options="-Xlint:warning" files="LazyTjpTest5.java">
-		  <message kind="warning" line="3" text="can not implement lazyTjp at joinpoint method-execution(void LazyTjpTest5.test1()) because of advice conflicts, see secondary locations to find conflicting advice"/>
-		  <message kind="warning" line="13" text="can not build thisJoinPoint lazily for this advice since it has no suitable guard"/>
-		</compile>
-	</ajc-test>
-    
-    <ajc-test dir="options" 
-      title="options -Xlint args()" 
-      keywords="lint">
-        <compile files="XLintTypeArgsPCD.java">
-            <message kind="warning" line="10"/>
-        </compile>
-    </ajc-test>
- 
-    <ajc-test dir="options" 
-      title="options declare field on bad type">
-        <compile files="XLintTypeDeclareField.java" options="!eclipse">
-            <message kind="error" line="10"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="options" 
-      title="options declare method on bad type">
-        <compile files="XLintTypeDeclareMethod.java" options="!eclipse">
-            <message kind="error" line="10"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="options" 
-      title="options -Xlint declare parent" 
-      keywords="lint">
-        <compile files="XLintTypeDeclareParent.java">
-            <message kind="warning" line="10"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="options" 
-      title="options -Xlint target()" 
-      keywords="lint">
-        <compile files="XLintTypeTargetPCD.java">
-            <message kind="warning" line="10"/>
-        </compile>
-    </ajc-test>
-    
-    <ajc-test dir="options" 
-      title="options -Xlint this()" 
-      keywords="lint">
-        <compile files="XLintTypeThisPCD.java">
-            <message kind="warning" line="10"/>
-        </compile>
-    </ajc-test>
-
-    <!-- ............... negative -Xlint tests -->
-    <ajc-test dir="options" 
-      title="options negative -Xlint args()" 
-      keywords="lint">
-        <compile files="XLintTypeArgsPCD.java" options="-Xlint:ignore"/>
-    </ajc-test>
-    
-    <ajc-test dir="options" 
-      title="options negative -Xlint declare parent" 
-      keywords="lint">
-        <compile files="XLintTypeDeclareParent.java" options="-Xlint:ignore"/>
-    </ajc-test>
-    
-    <ajc-test dir="options" 
-      title="options negative -Xlint target()" 
-      keywords="lint">
-        <compile files="XLintTypeTargetPCD.java" options="-Xlint:ignore"/>
-    </ajc-test>
-    
-    <ajc-test dir="options" 
-      title="options negative -Xlint this()" 
-      keywords="lint">
-        <compile files="XLintTypeThisPCD.java" options="-Xlint:ignore"/>
-    </ajc-test>
-
-       
-    <ajc-test dir="new"
-      title="unmatched type name in a declare parents should result in a warning in -Xlint mode"
-      keywords="tofix">
-        <compile options="-Xlint" files="MissingTypeInDeclareParents.java">
-            <message kind="warning" line="20"/>
-        </compile>
-        <run class="MissingTypeInDeclareParents"/>
-    </ajc-test>
-   
-       
-	<!-- The correct behavior of this program is to produce an Xlint
-	     warning for the lack of access to the needed type, and then
-	     to generate code with link errors that will throw a NoSuchMethodError
-	     when run.
-	-->
-    <ajc-test dir="bugs" pr="906"
-      title="privileged access to code outside the control of the compiler">
-        <compile files="PrivilegeBeyondScope.java" options="-Xlint:warning">
-		  <message kind="warning" line="23"/>
-        </compile>
-    </ajc-test>    
-
-   <ajc-test dir="bugs" pr="37739"
-   	 title="Unexpected Xlint:unresolvableMember warning with withincode">
-        <compile files="CatchSig.java">
-        </compile>
-        <run class="CatchSig"/>
-    </ajc-test>
- 
- 
-    <ajc-test dir="harness" 
-        title="valid XLintWarningTest file, default level of warning">
-        <compile files="XLintWarningTest.java" options="-1.4">
-        	<message kind="warning" line="5"
-        		 text="Xlint:invalidAbsoluteTypeName"/> 
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="harness" 
-        title="XLint:ignore suppresses XLint warnings">
-        <compile files="XLintWarningTest.java" options="-Xlint:ignore"/>
-    </ajc-test>
-
-     <ajc-test dir="harness" 
-        title="XLint:error promotes XLint warnings to error">
-        <compile files="XLintWarningTest.java" options="-Xlint:error">
-        	<message kind="error" line="5" 
-        		text="Xlint:invalidAbsoluteTypeName"/> 
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="bugs" pr="49250"
-      title="alias getCause for getWrappedThrowable in SoftException">
-        <compile files="GetCauseOnSoftException.java" options="-Xlint:warning">
-        </compile>
-        <run vm="1.3" class="GetCauseOnSoftException"/>
-    </ajc-test>
-
-	<ajc-test dir="bugs"
-		title="XLint warning for call PCD's using subtype of defining type"
-		pr="41952"
-		>
-		<compile 
-			files="DeclaringTypeWarning.java"
-			options="-1.3" >
-			<message kind="warning" line="6" text="declaring type">
-				<source line="12" file="DeclaringTypeWarning.java" />
-			</message>
-			<message kind="warning" line="6"  text="declaring type">
-				<source line="14" file="DeclaringTypeWarning.java" />
-			</message>			
-		</compile>
-		</ajc-test>
-
-   <ajc-test dir="bugs"
-		title="XLint warning for call PCD's using subtype of defining type (-1.3 -Xlint:ignore)"
-		pr="41952"
-		>
-		<compile
-			options="-Xlint:ignore,-1.3" 
-			files="DeclaringTypeWarning.java" >
-		</compile>
-	</ajc-test>
-
-<!--	
-   <ajc-test dir="bugs/seven/lint" title="7 lint warnings" pr="91719">
-  <compile options="-1.5" files="Main.java">
-   <message kind="warning" line="31"  text="no match for this type name: java.xxx.Object [Xlint:invalidAbsoluteTypeName]">
-   </message> 
-   <message kind="warning" line="34"  text="no match for this type name: java.lang.Xxx [Xlint:invalidAbsoluteTypeName]">
-   </message>
-   <message kind="warning" line="41"  text="no match for this type name: java.lang.Xxx [Xlint:invalidAbsoluteTypeName]">
-   </message>
-   <message kind="warning" line="69"  text="this affected type is not exposed to the weaver: java.lang.Object [Xlint:typeNotExposedToWeaver]">
-   </message>
-   <message kind="warning" line="87"  text="does not match because declaring type is java.lang.Object, if match desired use target(Car) [Xlint:unmatchedSuperTypeInCall]">
-   </message>
-   <message kind="warning" line="92"  text="advice defined in XlintTest has not been applied [Xlint:adviceDidNotMatch]">
-   </message>
-   <message kind="warning" line="157"  text="no interface constructor-execution join point - use java.util.List+ for implementing classes [Xlint:noInterfaceCtorJoinpoint]">
-   </message>
-  </compile>
-  </ajc-test>
--->
-
-    <ajc-test dir="harness" 
-        title="Two Xlint warnings wth cflow?">
-        <compile files="XLintcflow.java" options="-1.5">
-        	<message kind="warning" line="4"  text="advice defined in A has not been applied [Xlint:adviceDidNotMatch]"/>
-        </compile>
-    </ajc-test>
-	
- 
\ No newline at end of file
diff --git a/tests/src/test/resources/org/aspectj/systemtest/xlint/xlint.xml b/tests/src/test/resources/org/aspectj/systemtest/xlint/xlint.xml
index efe2a0014..6f344a380 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/xlint/xlint.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/xlint/xlint.xml
@@ -1,10 +1,268 @@
-<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[
-<!ENTITY tests SYSTEM "../tests/src/org/aspectj/systemtest/xlint/xlint-tests.xml">
-]>
-<!-- XLint Tests -->
-
+<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
 <suite>
+   <!-- .................................... -Xlint tests -->
+    <!-- ............... positive -Xlint tests -->
+    
+    <ajc-test dir="bugs/lazyTjpXLintWarning"
+		title="no XLint warning: thisJoinPoint potentially lazy and nothing stopping it">
+		<compile options="-Xlint:warning" files="Scenario1.aj"/>
+	</ajc-test>
+	
+	<ajc-test dir="bugs/lazyTjpXLintWarning"
+		title="XLint warning: thisJoinPoint potentially lazy but stopped by around advice which doesn't use tjp">
+		<compile options="-Xlint:warning" files="Scenario2.aj">
+			<message kind="warning" line="21" text="can not implement lazyTjp on this joinpoint method-execution(void Test.main(java.lang.String[])) because around advice is used [Xlint:canNotImplementLazyTjp]"/>
+		</compile>
+	</ajc-test>
+	
+	<ajc-test dir="bugs/lazyTjpXLintWarning"
+		title="no XLint warning: thisJoinPoint not lazy (no if PCD) but would have been stopped anyway by around advice">
+		<compile options="-Xlint:warning" files="Scenario3.aj">
+			<message kind="warning" line="14" text="can not build thisJoinPoint lazily for this advice since it has no suitable guard [Xlint:noGuardForLazyTjp]"/>
+		</compile>
+	</ajc-test>
+	
+	<ajc-test dir="bugs/lazyTjpXLintWarning" title="no XLint warning: thisJoinPoint cannot be built lazily">
+		<compile options="-Xlint:warning" files="Scenario4.aj">
+			<message kind="warning" line="9" text="can not build thisJoinPoint lazily for this advice since it has no suitable guard"/>
+		</compile>
+	</ajc-test>
+	
+	<ajc-test dir="bugs/lazyTjpXLintWarning"
+		title="XLint warning: thisJoinPoint potentially lazy but stopped by around advice which uses tjp">
+		<compile options="-Xlint:warning" files="Scenario5.aj">
+			<message kind="warning" line="22" text="can not implement lazyTjp on this joinpoint method-execution(void Test.main(java.lang.String[])) because around advice is used [Xlint:canNotImplementLazyTjp]"/>
+		</compile>
+	</ajc-test>
+	
+	<ajc-test dir="bugs/lazyTjpXLintWarning"
+		title="check for xlazytjp warning if actually supplied">
+		<compile options="-XlazyTjp -Xlint:warning" files="Scenario1.aj">
+		  <message kind="warning" text="-XlazyTjp should no longer be used, build tjps lazily is now the default"/>
+		</compile>
+	</ajc-test>
+	
+	<ajc-test dir="bugs/lazyTjpXLintWarning"
+		title="lazytjp: warning when around advice uses tjp">
+		<compile options="-Xlint:warning" files="LazyTjpTest1.java">
+			<message kind="warning" line="4" text="can not implement lazyTjp on this joinpoint method-execution(void LazyTjpTest1.test2()) because around advice is used [Xlint:canNotImplementLazyTjp]"/>
+		</compile>
+	</ajc-test>
+	
+	<ajc-test dir="bugs/lazyTjpXLintWarning"
+		title="lazytjp: warning when if missing on before advice">
+		<compile options="-Xlint:warning" files="LazyTjpTest2.java">
+		  <message kind="warning" line="16" text="can not build thisJoinPoint lazily for this advice since it has no suitable guard"/>
+		</compile>
+	</ajc-test>
+	
+	<ajc-test dir="bugs/lazyTjpXLintWarning"
+		title="lazytjp: warning when if missing on after advice">
+		<compile options="-Xlint:warning" files="LazyTjpTest3.java">
+		  <message kind="warning" line="17" text="can not build thisJoinPoint lazily for this advice since it has no suitable guard"/>
+		</compile>
+	</ajc-test>
+	
+	<ajc-test dir="bugs/lazyTjpXLintWarning"
+		title="lazytjp: multiple clashing advice preventing lazytjp">
+		<compile options="-Xlint:warning" files="LazyTjpTest4.java">
+		  <message kind="warning" line="13" text="can not build thisJoinPoint lazily for this advice since it has no suitable guard"/>
+		  <message kind="warning" line="3"  text="can not implement lazyTjp at joinpoint method-execution(void LazyTjpTest4.test1()) because of advice conflicts, see secondary locations to find conflicting advice"/>
+		  <message kind="warning" line="17" text="can not build thisJoinPoint lazily for this advice since it has no suitable guard"/>
+		</compile>
+	</ajc-test>
+	
+	<ajc-test dir="bugs/lazyTjpXLintWarning"
+		title="lazytjp: interfering before and around">
+		<compile options="-Xlint:warning" files="LazyTjpTest5.java">
+		  <message kind="warning" line="3" text="can not implement lazyTjp at joinpoint method-execution(void LazyTjpTest5.test1()) because of advice conflicts, see secondary locations to find conflicting advice"/>
+		  <message kind="warning" line="13" text="can not build thisJoinPoint lazily for this advice since it has no suitable guard"/>
+		</compile>
+	</ajc-test>
+    
+    <ajc-test dir="options" 
+      title="options -Xlint args()" 
+      keywords="lint">
+        <compile files="XLintTypeArgsPCD.java">
+            <message kind="warning" line="10"/>
+        </compile>
+    </ajc-test>
+ 
+    <ajc-test dir="options" 
+      title="options declare field on bad type">
+        <compile files="XLintTypeDeclareField.java" options="!eclipse">
+            <message kind="error" line="10"/>
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="options" 
+      title="options declare method on bad type">
+        <compile files="XLintTypeDeclareMethod.java" options="!eclipse">
+            <message kind="error" line="10"/>
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="options" 
+      title="options -Xlint declare parent" 
+      keywords="lint">
+        <compile files="XLintTypeDeclareParent.java">
+            <message kind="warning" line="10"/>
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="options" 
+      title="options -Xlint target()" 
+      keywords="lint">
+        <compile files="XLintTypeTargetPCD.java">
+            <message kind="warning" line="10"/>
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="options" 
+      title="options -Xlint this()" 
+      keywords="lint">
+        <compile files="XLintTypeThisPCD.java">
+            <message kind="warning" line="10"/>
+        </compile>
+    </ajc-test>
+
+    <!-- ............... negative -Xlint tests -->
+    <ajc-test dir="options" 
+      title="options negative -Xlint args()" 
+      keywords="lint">
+        <compile files="XLintTypeArgsPCD.java" options="-Xlint:ignore"/>
+    </ajc-test>
+    
+    <ajc-test dir="options" 
+      title="options negative -Xlint declare parent" 
+      keywords="lint">
+        <compile files="XLintTypeDeclareParent.java" options="-Xlint:ignore"/>
+    </ajc-test>
+    
+    <ajc-test dir="options" 
+      title="options negative -Xlint target()" 
+      keywords="lint">
+        <compile files="XLintTypeTargetPCD.java" options="-Xlint:ignore"/>
+    </ajc-test>
+    
+    <ajc-test dir="options" 
+      title="options negative -Xlint this()" 
+      keywords="lint">
+        <compile files="XLintTypeThisPCD.java" options="-Xlint:ignore"/>
+    </ajc-test>
+
+       
+    <ajc-test dir="new"
+      title="unmatched type name in a declare parents should result in a warning in -Xlint mode"
+      keywords="tofix">
+        <compile options="-Xlint" files="MissingTypeInDeclareParents.java">
+            <message kind="warning" line="20"/>
+        </compile>
+        <run class="MissingTypeInDeclareParents"/>
+    </ajc-test>
+   
+       
+	<!-- The correct behavior of this program is to produce an Xlint
+	     warning for the lack of access to the needed type, and then
+	     to generate code with link errors that will throw a NoSuchMethodError
+	     when run.
+	-->
+    <ajc-test dir="bugs" pr="906"
+      title="privileged access to code outside the control of the compiler">
+        <compile files="PrivilegeBeyondScope.java" options="-Xlint:warning">
+		  <message kind="warning" line="23"/>
+        </compile>
+    </ajc-test>    
+
+   <ajc-test dir="bugs" pr="37739"
+   	 title="Unexpected Xlint:unresolvableMember warning with withincode">
+        <compile files="CatchSig.java">
+        </compile>
+        <run class="CatchSig"/>
+    </ajc-test>
+ 
+ 
+    <ajc-test dir="harness" 
+        title="valid XLintWarningTest file, default level of warning">
+        <compile files="XLintWarningTest.java" options="-1.4">
+        	<message kind="warning" line="5"
+        		 text="Xlint:invalidAbsoluteTypeName"/> 
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="harness" 
+        title="XLint:ignore suppresses XLint warnings">
+        <compile files="XLintWarningTest.java" options="-Xlint:ignore"/>
+    </ajc-test>
+
+     <ajc-test dir="harness" 
+        title="XLint:error promotes XLint warnings to error">
+        <compile files="XLintWarningTest.java" options="-Xlint:error">
+        	<message kind="error" line="5" 
+        		text="Xlint:invalidAbsoluteTypeName"/> 
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="bugs" pr="49250"
+      title="alias getCause for getWrappedThrowable in SoftException">
+        <compile files="GetCauseOnSoftException.java" options="-Xlint:warning">
+        </compile>
+        <run vm="1.3" class="GetCauseOnSoftException"/>
+    </ajc-test>
+
+	<ajc-test dir="bugs"
+		title="XLint warning for call PCD's using subtype of defining type"
+		pr="41952"
+		>
+		<compile 
+			files="DeclaringTypeWarning.java"
+			options="-1.3" >
+			<message kind="warning" line="6" text="declaring type">
+				<source line="12" file="DeclaringTypeWarning.java" />
+			</message>
+			<message kind="warning" line="6"  text="declaring type">
+				<source line="14" file="DeclaringTypeWarning.java" />
+			</message>			
+		</compile>
+		</ajc-test>
+
+   <ajc-test dir="bugs"
+		title="XLint warning for call PCD's using subtype of defining type (-1.3 -Xlint:ignore)"
+		pr="41952"
+		>
+		<compile
+			options="-Xlint:ignore,-1.3" 
+			files="DeclaringTypeWarning.java" >
+		</compile>
+	</ajc-test>
 
-&tests;
+<!--	
+   <ajc-test dir="bugs/seven/lint" title="7 lint warnings" pr="91719">
+  <compile options="-1.5" files="Main.java">
+   <message kind="warning" line="31"  text="no match for this type name: java.xxx.Object [Xlint:invalidAbsoluteTypeName]">
+   </message> 
+   <message kind="warning" line="34"  text="no match for this type name: java.lang.Xxx [Xlint:invalidAbsoluteTypeName]">
+   </message>
+   <message kind="warning" line="41"  text="no match for this type name: java.lang.Xxx [Xlint:invalidAbsoluteTypeName]">
+   </message>
+   <message kind="warning" line="69"  text="this affected type is not exposed to the weaver: java.lang.Object [Xlint:typeNotExposedToWeaver]">
+   </message>
+   <message kind="warning" line="87"  text="does not match because declaring type is java.lang.Object, if match desired use target(Car) [Xlint:unmatchedSuperTypeInCall]">
+   </message>
+   <message kind="warning" line="92"  text="advice defined in XlintTest has not been applied [Xlint:adviceDidNotMatch]">
+   </message>
+   <message kind="warning" line="157"  text="no interface constructor-execution join point - use java.util.List+ for implementing classes [Xlint:noInterfaceCtorJoinpoint]">
+   </message>
+  </compile>
+  </ajc-test>
+-->
 
+    <ajc-test dir="harness" 
+        title="Two Xlint warnings wth cflow?">
+        <compile files="XLintcflow.java" options="-1.5">
+        	<message kind="warning" line="4"  text="advice defined in A has not been applied [Xlint:adviceDidNotMatch]"/>
+        </compile>
+    </ajc-test>
+	
+ 
 </suite>
\ No newline at end of file
-- 
2.39.5