147 files changed, 445 insertions, 62 deletions
diff --git a/testing/.classpath b/testing/.classpath
deleted file mode 100644
index 55bc2144b..000000000
--- a/testing/.classpath
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="testsrc"/>
-	<classpathentry kind="lib" path="/lib/ant/lib/ant.jar" sourcepath="/lib/ant/ant-src.zip"/>
-	<classpathentry kind="lib" path="/lib/junit/junit.jar" sourcepath="/lib/junit/junit-src.jar"/>
-	<classpathentry kind="lib" path="/lib/jdiff/jdiff.jar"/>
-	<classpathentry kind="lib" path="/lib/regexp/jakarta-regexp-1.2.jar"/>
-	<classpathentry kind="src" path="/bridge"/>
-	<classpathentry kind="src" path="/util"/>
-	<classpathentry kind="src" path="/testing-client"/>
-	<classpathentry kind="lib" path="/lib/ant/lib/xercesImpl.jar"/>
-	<classpathentry kind="lib" path="/lib/ant/lib/xml-apis.jar"/>
-	<classpathentry exported="true" kind="lib" path="/lib/commons/commons.jar" sourcepath="/lib/commons/commons-src.zip"/>
-	<classpathentry kind="src" path="/testing-util"/>
-	<classpathentry kind="src" path="/ajde"/>
-	<classpathentry kind="src" path="/asm"/>
-	<classpathentry kind="src" path="/taskdefs"/>
-	<classpathentry kind="src" path="newsrc"/>
-	<classpathentry kind="src" path="/org.aspectj.ajdt.core"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/weaver"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/loadtime"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ajde.core"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.aspectj.matcher"/>
-	<classpathentry kind="lib" path="/lib/bcel/bcel.jar" sourcepath="/lib/bcel/bcel-src.zip"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/testing/.cvsignore b/testing/.cvsignore
deleted file mode 100644
index 38972d828..000000000
--- a/testing/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-bintest
diff --git a/testing/.isJava5 b/testing/.isJava5
deleted file mode 100644
index c18a7b867..000000000
--- a/testing/.isJava5
+++ /dev/null
@@ -1 +0,0 @@
-.isJava5
-\ No newline at end of file
diff --git a/testing/.project b/testing/.project
deleted file mode 100644
index 1f079f0eb..000000000
--- a/testing/.project
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>testing</name>
-	<comment></comment>
-	<projects>
-		<project>ajde</project>
-		<project>asm</project>
-		<project>bridge</project>
-		<project>taskdefs</project>
-		<project>testing-client</project>
-		<project>testing-util</project>
-		<project>util</project>
-		<project>weaver</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/testing/build.xml b/testing/build.xml
deleted file mode 100644
index 4a7a25ae3..000000000
--- a/testing/build.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<!-- see ../build/*.html for explanation -->
-<project name="testing" default="test" basedir=".">
-    <import file="${basedir}/../build/build.xml"/>  
-</project>
-
diff --git a/testing/figures-coverage/.cvsignore b/testing/figures-coverage/.cvsignore
new file mode 100644
index 000000000..c6495af69
--- /dev/null
+++ b/testing/figures-coverage/.cvsignore
@@ -0,0 +1 @@
+all.ajsym
diff --git a/testing/figures-coverage/all.lst b/testing/figures-coverage/all.lst
new file mode 100644
index 000000000..3879af0b1
--- /dev/null
+++ b/testing/figures-coverage/all.lst
@@ -0,0 +1,8 @@
+figures/Debug.java
+figures/Figure.java
+figures/FigureElement.java
+figures/Main.java
+figures/composites/Line.java
+figures/composites/Square.java
+figures/primitives/planar/Point.java
+figures/primitives/solid/SolidPoint.java
diff --git a/testing/figures-coverage/bin/figures/Checks.class b/testing/figures-coverage/bin/figures/Checks.class
new file mode 100644
index 000000000..729d06c42
--- /dev/null
+++ b/testing/figures-coverage/bin/figures/Checks.class
diff --git a/testing/figures-coverage/bin/figures/Debug.class b/testing/figures-coverage/bin/figures/Debug.class
new file mode 100644
index 000000000..da1dcc1f8
--- /dev/null
+++ b/testing/figures-coverage/bin/figures/Debug.class
diff --git a/testing/figures-coverage/bin/figures/Element.class b/testing/figures-coverage/bin/figures/Element.class
new file mode 100644
index 000000000..ef4f449fa
--- /dev/null
+++ b/testing/figures-coverage/bin/figures/Element.class
diff --git a/testing/figures-coverage/bin/figures/Figure.class b/testing/figures-coverage/bin/figures/Figure.class
new file mode 100644
index 000000000..98685e17c
--- /dev/null
+++ b/testing/figures-coverage/bin/figures/Figure.class
diff --git a/testing/figures-coverage/bin/figures/FigureElement.class b/testing/figures-coverage/bin/figures/FigureElement.class
new file mode 100644
index 000000000..c77045592
--- /dev/null
+++ b/testing/figures-coverage/bin/figures/FigureElement.class
diff --git a/testing/figures-coverage/bin/figures/Main$TestGUI.class b/testing/figures-coverage/bin/figures/Main$TestGUI.class
new file mode 100644
index 000000000..94fdfabaf
--- /dev/null
+++ b/testing/figures-coverage/bin/figures/Main$TestGUI.class
diff --git a/testing/figures-coverage/bin/figures/Main.class b/testing/figures-coverage/bin/figures/Main.class
new file mode 100644
index 000000000..41a9482e2
--- /dev/null
+++ b/testing/figures-coverage/bin/figures/Main.class
diff --git a/testing/figures-coverage/bin/figures/Test.class b/testing/figures-coverage/bin/figures/Test.class
new file mode 100644
index 000000000..04768405a
--- /dev/null
+++ b/testing/figures-coverage/bin/figures/Test.class
diff --git a/testing/figures-coverage/bin/figures/composites/BoundedLine.class b/testing/figures-coverage/bin/figures/composites/BoundedLine.class
new file mode 100644
index 000000000..12eda2226
--- /dev/null
+++ b/testing/figures-coverage/bin/figures/composites/BoundedLine.class
diff --git a/testing/figures-coverage/bin/figures/composites/Line.class b/testing/figures-coverage/bin/figures/composites/Line.class
new file mode 100644
index 000000000..ceb1b35dd
--- /dev/null
+++ b/testing/figures-coverage/bin/figures/composites/Line.class
diff --git a/testing/figures-coverage/bin/figures/composites/Square.class b/testing/figures-coverage/bin/figures/composites/Square.class
new file mode 100644
index 000000000..9334b6836
--- /dev/null
+++ b/testing/figures-coverage/bin/figures/composites/Square.class
diff --git a/testing/figures-coverage/bin/figures/primitives/planar/BoundedPoint.class b/testing/figures-coverage/bin/figures/primitives/planar/BoundedPoint.class
new file mode 100644
index 000000000..6d51d46e3
--- /dev/null
+++ b/testing/figures-coverage/bin/figures/primitives/planar/BoundedPoint.class
diff --git a/testing/figures-coverage/bin/figures/primitives/planar/Point.class b/testing/figures-coverage/bin/figures/primitives/planar/Point.class
new file mode 100644
index 000000000..c14c89149
--- /dev/null
+++ b/testing/figures-coverage/bin/figures/primitives/planar/Point.class
diff --git a/testing/figures-coverage/bin/figures/primitives/planar/PointBoundsException.class b/testing/figures-coverage/bin/figures/primitives/planar/PointBoundsException.class
new file mode 100644
index 000000000..d62ce0f17
--- /dev/null
+++ b/testing/figures-coverage/bin/figures/primitives/planar/PointBoundsException.class
diff --git a/testing/figures-coverage/bin/figures/primitives/planar/StrictlyBoundedPoint.class b/testing/figures-coverage/bin/figures/primitives/planar/StrictlyBoundedPoint.class
new file mode 100644
index 000000000..9f985f6a2
--- /dev/null
+++ b/testing/figures-coverage/bin/figures/primitives/planar/StrictlyBoundedPoint.class
diff --git a/testing/figures-coverage/bin/figures/primitives/solid/SolidPoint.class b/testing/figures-coverage/bin/figures/primitives/solid/SolidPoint.class
new file mode 100644
index 000000000..f95982af8
--- /dev/null
+++ b/testing/figures-coverage/bin/figures/primitives/solid/SolidPoint.class
diff --git a/testing/figures-coverage/editor/Editor.java b/testing/figures-coverage/editor/Editor.java
new file mode 100644
index 000000000..99e2b5d5b
--- /dev/null
+++ b/testing/figures-coverage/editor/Editor.java
@@ -0,0 +1,4 @@
+
+package editor;
+
+class Editor { }
diff --git a/testing/figures-coverage/figures/.cvsignore b/testing/figures-coverage/figures/.cvsignore
new file mode 100644
index 000000000..9a2b438e3
--- /dev/null
+++ b/testing/figures-coverage/figures/.cvsignore
@@ -0,0 +1,8 @@
+Checks.class
+Debug.class
+Element.class
+Figure.class
+FigureElement.class
+Main.class
+Main$TestGUI.class
+Test.class
diff --git a/testing/figures-coverage/figures/Debug.java b/testing/figures-coverage/figures/Debug.java
new file mode 100644
index 000000000..01e895abc
--- /dev/null
+++ b/testing/figures-coverage/figures/Debug.java
@@ -0,0 +1,7 @@
+
+package figures;
+
+aspect Debug {
+
+}
+
diff --git a/testing/figures-coverage/figures/Figure.java b/testing/figures-coverage/figures/Figure.java
new file mode 100644
index 000000000..b5e0e246a
--- /dev/null
+++ b/testing/figures-coverage/figures/Figure.java
@@ -0,0 +1,92 @@
+
+package figures;
+
+import figures.primitives.planar.Point;
+
+import java.awt.Canvas;
+
+aspect Figure {
+    //pointcut sendSuccess(): cflow(setX()) && !handler(Exception);
+
+    public String Point.getName() {
+        return Point.name;
+    } 
+
+    public int figures.primitives.planar.Point.DEFAULT_X = 0; 
+
+    public pointcut constructions(): call(Point.new(int, int)) || call(SolidPoint.new(int, int, int));
+
+    public pointcut moves(FigureElement fe): target(fe) &&
+        (call(String Point.getName()) ||
+	 call(void FigureElement.incrXY(int, int)) ||
+         call(void Point.setX(int)) ||
+         call(void Point.setY(int)) ||
+         call(void SolidPoint.setZ(int)));
+    
+    pointcut mainExecution(): 
+	execution(int main(*));
+
+    pointcut runtimeHandlers(): mainExecution() 
+	|| handler(RuntimeException);
+
+    public pointcut mumble(): runtimeHandlers();
+
+    before(int newValue): set(int *.*) && args(newValue) {   }
+
+    before(): get(int *.*) { }
+
+    before(): constructions() {
+	    System.out.println("> before construction, jp: " + thisJoinPoint.getSignature());
+    } 
+
+    before(FigureElement fe): moves(fe) {
+	    System.out.println("> about to move FigureElement at X-coord: ");
+	}
+
+    after(): initialization(Point.new(..)) || staticinitialization(Point) {
+        System.out.println("> Point initialized");
+    }
+
+    // should be around
+    after(): mumble() {
+        System.err.println(">> in after advice...");
+        //proceed();
+    }
+
+    after(FigureElement fe): target(fe) &&
+        (call(void FigureElement.incrXY(int, int)) ||
+         call(void Point.setX(int)) ||
+         call(void Point.setY(int)) ||
+         call(void SolidPoint.setZ(int))) {
+        System.out.println("> yo.");
+    }
+
+    after(FigureElement fe):
+	target(fe) &&
+	(call(void FigureElement.incrXY(int, int)) ||
+	 call(void Line.setP1(Point))              ||
+	 call(void Line.setP2(Point))              ||
+	 call(void Point.setX(int))                ||
+	 call(void Point.setY(int))) { }
+
+    declare parents: Point extends java.io.Serializable;
+
+    declare parents: Point implements java.util.Observable;
+
+	// AMC - this next line doesn't make sense!! Can these tests ever
+	// have been run???
+    //declare soft: Point: call(* *(..));
+}
+
+aspect Checks {
+    pointcut illegalNewFigElt():  call(FigureElement+.new(..))  &&
+	                          !withincode(* Main.main(..));
+
+//	pointcut illegalNewFigElt(): execution(FigureElement+.new(..));
+
+    declare error: illegalNewFigElt():
+	    "Illegal figure element constructor call.";
+
+    declare warning: illegalNewFigElt():
+	    "Illegal figure element constructor call.";
+}
diff --git a/testing/figures-coverage/figures/FigureElement.java b/testing/figures-coverage/figures/FigureElement.java
new file mode 100644
index 000000000..d2ce9eb82
--- /dev/null
+++ b/testing/figures-coverage/figures/FigureElement.java
@@ -0,0 +1,9 @@
+
+package figures;
+
+public interface FigureElement extends Element {
+
+    public void incrXY(int dx, int dy);
+}
+
+interface Element { }
diff --git a/testing/figures-coverage/figures/Main.java b/testing/figures-coverage/figures/Main.java
new file mode 100644
index 000000000..189f05cee
--- /dev/null
+++ b/testing/figures-coverage/figures/Main.java
@@ -0,0 +1,56 @@
+
+package figures;
+
+import figures.primitives.planar.Point;
+import figures.primitives.solid.SolidPoint;
+
+class Main {
+
+    private static Point startPoint;
+
+    public static void main(String[] args) {
+        try {
+            System.out.println("> starting...");
+
+            startPoint = makeStartPoint();
+            //startPoint.setX(3); new Point(0, 0);
+//	        SolidPoint sp1 = new SolidPoint(1, 3, 3);
+
+//	        sp1.setZ(1);
+//	        p1.incrXY(3, 3);
+        } catch (RuntimeException re) {
+            re.printStackTrace();
+        }
+        System.out.println("> finished.");
+    }
+
+    /** @deprecated     use something else */
+    public static Point makeStartPoint() {
+	 //return new Point(1, 2);
+         return null;
+    }
+
+    /** This should produce a deprecation warning with JDK > 1.2 */
+    static class TestGUI extends javax.swing.JFrame {
+        TestGUI() {
+           this.disable();
+        }
+    }
+
+    /** This should produce a porting-deprecation warning. */
+    //static pointcut mainExecution(): execution(void main(*));
+}
+
+privileged aspect Test {
+    pointcut testptct(): call(* *.*(..));
+
+    before(Point p, int newval): target(p) && set(int Point.xx) && args(newval) {
+        System.err.println("> new value of x is: " + p.x + ", setting to: " + newval);
+    }
+
+	before(int newValue): set(int Point.*) && args(newValue) {
+	    if (newValue < 0) {
+	        throw new IllegalArgumentException("too small");
+	    } 
+	}
+}
diff --git a/testing/figures-coverage/figures/composites/.cvsignore b/testing/figures-coverage/figures/composites/.cvsignore
new file mode 100644
index 000000000..d9011a888
--- /dev/null
+++ b/testing/figures-coverage/figures/composites/.cvsignore
@@ -0,0 +1,3 @@
+BoundedLine.class
+Line.class
+Square.class
diff --git a/testing/figures-coverage/figures/composites/Line.java b/testing/figures-coverage/figures/composites/Line.java
new file mode 100644
index 000000000..1f7ee5dc8
--- /dev/null
+++ b/testing/figures-coverage/figures/composites/Line.java
@@ -0,0 +1,6 @@
+
+package figures.composites;
+
+class Line { }
+
+class BoundedLine extends Line { } 
diff --git a/testing/figures-coverage/figures/composites/Square.java b/testing/figures-coverage/figures/composites/Square.java
new file mode 100644
index 000000000..8ba3825d6
--- /dev/null
+++ b/testing/figures-coverage/figures/composites/Square.java
@@ -0,0 +1,6 @@
+
+package figures.composites;
+
+class Square { 
+   private String name = "Square";
+}
diff --git a/testing/figures-coverage/figures/primitives/planar/.cvsignore b/testing/figures-coverage/figures/primitives/planar/.cvsignore
new file mode 100644
index 000000000..1dd78c3c0
--- /dev/null
+++ b/testing/figures-coverage/figures/primitives/planar/.cvsignore
@@ -0,0 +1,4 @@
+StrictlyBoundedPoint.class
+PointBoundsException.class
+Point.class
+BoundedPoint.class
diff --git a/testing/figures-coverage/figures/primitives/planar/Point.java b/testing/figures-coverage/figures/primitives/planar/Point.java
new file mode 100644
index 000000000..d389be386
--- /dev/null
+++ b/testing/figures-coverage/figures/primitives/planar/Point.java
@@ -0,0 +1,73 @@
+
+package figures.primitives.planar;
+
+import figures.*;
+import java.util.Collection;
+
+public class Point implements FigureElement {
+
+    static int xx = -1;
+    private int x;
+    private int y;
+    transient int currVal = 0;
+    public static String name;  
+
+    { 
+	y = -1;
+    }
+
+    static {
+	xx = -10;
+    }
+
+    int c; int b; int a; 
+    {
+        x = 0;
+        y = 0;
+    }
+
+    static {
+        Point.name = "2-Dimensional Point";
+    }
+
+    public Point(int x, int y) {
+        this.x = x;
+        this.y = y;
+    }
+
+    int getCurrVal() {
+	return currVal;
+    }
+
+    /**
+     * @see Figure#moves
+     */
+    public int getX() { return x; }
+
+    public int getY() { return y; }
+
+    public void setX(int x) { this.x = x; }
+
+    public void setY(int x) { this.y = x; }
+
+    public void incrXY(int dx, int dy) {
+        setX(getX() + dx);
+        setY(getY() + dy);
+    }
+    public void check(int dx, int dy) 
+	throws ArithmeticException, PointBoundsException {
+	if (dx < 0 || dy < 0) throw new PointBoundsException();
+    }
+}
+
+class PointBoundsException extends Exception { }
+
+class BoundedPoint extends Point { 
+    public BoundedPoint(int x, int y) { super(x, y); }
+}
+
+class StrictlyBoundedPoint extends BoundedPoint { 
+    public StrictlyBoundedPoint(int x, int y) { super(x, y); }
+}
+
+
diff --git a/testing/figures-coverage/figures/primitives/solid/.cvsignore b/testing/figures-coverage/figures/primitives/solid/.cvsignore
new file mode 100644
index 000000000..fd0572c5e
--- /dev/null
+++ b/testing/figures-coverage/figures/primitives/solid/.cvsignore
@@ -0,0 +1 @@
+SolidPoint.class
diff --git a/testing/figures-coverage/figures/primitives/solid/SolidPoint.java b/testing/figures-coverage/figures/primitives/solid/SolidPoint.java
new file mode 100644
index 000000000..80c1fc1ca
--- /dev/null
+++ b/testing/figures-coverage/figures/primitives/solid/SolidPoint.java
@@ -0,0 +1,24 @@
+
+package figures.primitives.solid;
+
+import java.util.Collection;
+import java.lang.String;
+import figures.primitives.planar.*;
+
+public class SolidPoint extends Point {
+    private int z;
+
+    public SolidPoint(int x, int y, int z) {
+        super(x, y);
+        this.z = z;
+    }
+
+    public int getZ() { return z; }
+
+    public void setZ(int z) { this.z = z; }
+
+    public void incrXY(int dx, int dy) {
+        super.incrXY(dx, dy);
+        setZ(getZ() + dx + dy);
+    }
+}
diff --git a/testing/pom.xml b/testing/pom.xml
new file mode 100644
index 000000000..310d20acf
--- /dev/null
+++ b/testing/pom.xml
@@ -0,0 +1,143 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.aspectj</groupId>
+    <artifactId>aspectj-parent</artifactId>
+    <version>1.9.3.BUILD-SNAPSHOT</version>
+    <relativePath>..</relativePath>
+  </parent>
+
+  <artifactId>testing</artifactId>
+  <packaging>jar</packaging>
+  <name>testing</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>util</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>bridge</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>ajde</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>asm</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>org.aspectj.matcher</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>ajde.core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>bcel-builder</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>testing-client</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>org.aspectj.ajdt.core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>testing-util</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>taskdefs</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>weaver</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>loadtime</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>jdiff</groupId>
+      <artifactId>jdiff</artifactId>
+      <version>1.0</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/../lib/jdiff/jdiff.jar</systemPath>
+    </dependency>
+    <dependency>
+      <groupId>ant</groupId>
+      <artifactId>ant</artifactId>
+      <version>1.0</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/../lib/ant/lib/ant.jar</systemPath>
+    </dependency>
+    <dependency>
+      <groupId>jakarta-regexp</groupId>
+      <artifactId>jakarta-regexp</artifactId>
+      <version>1.0</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/../lib/regexp/jakarta-regexp-1.2.jar</systemPath>
+    </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>org.aspectj.ajdt.core</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+    </dependency>
+    <dependency>
+      <groupId>xercesImpl</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>1.0</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/../lib/ant/lib/xercesImpl.jar</systemPath>
+    </dependency>
+    <dependency>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
+      <version>1.0</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/../lib/ant/lib/xml-apis.jar</systemPath>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+    </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/testing/src/org/aspectj/internal/tools/ant/taskdefs/Ajctest.java b/testing/src/main/java/org/aspectj/internal/tools/ant/taskdefs/Ajctest.java
index 8fb274176..8fb274176 100644
--- a/testing/src/org/aspectj/internal/tools/ant/taskdefs/Ajctest.java
+++ b/testing/src/main/java/org/aspectj/internal/tools/ant/taskdefs/Ajctest.java
diff --git a/testing/src/org/aspectj/internal/tools/ant/taskdefs/MainWrapper.java b/testing/src/main/java/org/aspectj/internal/tools/ant/taskdefs/MainWrapper.java
index 6ce22df24..6ce22df24 100644
--- a/testing/src/org/aspectj/internal/tools/ant/taskdefs/MainWrapper.java
+++ b/testing/src/main/java/org/aspectj/internal/tools/ant/taskdefs/MainWrapper.java
diff --git a/testing/newsrc/org/aspectj/testing/AjcTest.java b/testing/src/main/java/org/aspectj/testing/AjcTest.java
index 4cb9a8722..4cb9a8722 100644
--- a/testing/newsrc/org/aspectj/testing/AjcTest.java
+++ b/testing/src/main/java/org/aspectj/testing/AjcTest.java
diff --git a/testing/newsrc/org/aspectj/testing/AntSpec.java b/testing/src/main/java/org/aspectj/testing/AntSpec.java
index ceba08b29..ceba08b29 100644
--- a/testing/newsrc/org/aspectj/testing/AntSpec.java
+++ b/testing/src/main/java/org/aspectj/testing/AntSpec.java
diff --git a/testing/newsrc/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java b/testing/src/main/java/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java
index 467d9f236..467d9f236 100644
--- a/testing/newsrc/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java
+++ b/testing/src/main/java/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java
diff --git a/testing/newsrc/org/aspectj/testing/CompileSpec.java b/testing/src/main/java/org/aspectj/testing/CompileSpec.java
index 22570e3d1..22570e3d1 100644
--- a/testing/newsrc/org/aspectj/testing/CompileSpec.java
+++ b/testing/src/main/java/org/aspectj/testing/CompileSpec.java
diff --git a/testing/newsrc/org/aspectj/testing/ExpectedMessageSpec.java b/testing/src/main/java/org/aspectj/testing/ExpectedMessageSpec.java
index 2193b55ae..2193b55ae 100644
--- a/testing/newsrc/org/aspectj/testing/ExpectedMessageSpec.java
+++ b/testing/src/main/java/org/aspectj/testing/ExpectedMessageSpec.java
diff --git a/testing/newsrc/org/aspectj/testing/FileSpec.java b/testing/src/main/java/org/aspectj/testing/FileSpec.java
index 2164f38f1..2164f38f1 100644
--- a/testing/newsrc/org/aspectj/testing/FileSpec.java
+++ b/testing/src/main/java/org/aspectj/testing/FileSpec.java
diff --git a/testing/newsrc/org/aspectj/testing/ITestStep.java b/testing/src/main/java/org/aspectj/testing/ITestStep.java
index 673d6c66d..673d6c66d 100644
--- a/testing/newsrc/org/aspectj/testing/ITestStep.java
+++ b/testing/src/main/java/org/aspectj/testing/ITestStep.java
diff --git a/testing/newsrc/org/aspectj/testing/MakeTestClass.java b/testing/src/main/java/org/aspectj/testing/MakeTestClass.java
index 721cb623b..721cb623b 100644
--- a/testing/newsrc/org/aspectj/testing/MakeTestClass.java
+++ b/testing/src/main/java/org/aspectj/testing/MakeTestClass.java
diff --git a/testing/newsrc/org/aspectj/testing/OutputLine.java b/testing/src/main/java/org/aspectj/testing/OutputLine.java
index fc6fe4ce9..fc6fe4ce9 100644
--- a/testing/newsrc/org/aspectj/testing/OutputLine.java
+++ b/testing/src/main/java/org/aspectj/testing/OutputLine.java
diff --git a/testing/newsrc/org/aspectj/testing/OutputSpec.java b/testing/src/main/java/org/aspectj/testing/OutputSpec.java
index 9eab46098..9eab46098 100644
--- a/testing/newsrc/org/aspectj/testing/OutputSpec.java
+++ b/testing/src/main/java/org/aspectj/testing/OutputSpec.java
diff --git a/testing/newsrc/org/aspectj/testing/RunSpec.java b/testing/src/main/java/org/aspectj/testing/RunSpec.java
index 62b93bcb0..62b93bcb0 100644
--- a/testing/newsrc/org/aspectj/testing/RunSpec.java
+++ b/testing/src/main/java/org/aspectj/testing/RunSpec.java
diff --git a/testing/newsrc/org/aspectj/testing/WeaveSpec.java b/testing/src/main/java/org/aspectj/testing/WeaveSpec.java
index 2793b63ac..2793b63ac 100644
--- a/testing/newsrc/org/aspectj/testing/WeaveSpec.java
+++ b/testing/src/main/java/org/aspectj/testing/WeaveSpec.java
diff --git a/testing/newsrc/org/aspectj/testing/XMLBasedAjcTestCase.java b/testing/src/main/java/org/aspectj/testing/XMLBasedAjcTestCase.java
index 13bbf844e..13bbf844e 100644
--- a/testing/newsrc/org/aspectj/testing/XMLBasedAjcTestCase.java
+++ b/testing/src/main/java/org/aspectj/testing/XMLBasedAjcTestCase.java
diff --git a/testing/newsrc/org/aspectj/testing/XMLBasedAjcTestCaseForJava10OrLater.java b/testing/src/main/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava10OrLater.java
index 4a8c63f11..4a8c63f11 100644
--- a/testing/newsrc/org/aspectj/testing/XMLBasedAjcTestCaseForJava10OrLater.java
+++ b/testing/src/main/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava10OrLater.java
diff --git a/testing/newsrc/org/aspectj/testing/XMLBasedAjcTestCaseForJava11OrLater.java b/testing/src/main/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava11OrLater.java
index b71fc19e9..b71fc19e9 100644
--- a/testing/newsrc/org/aspectj/testing/XMLBasedAjcTestCaseForJava11OrLater.java
+++ b/testing/src/main/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava11OrLater.java
diff --git a/testing/newsrc/org/aspectj/testing/XMLBasedAjcTestCaseForJava9OrLater.java b/testing/src/main/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava9OrLater.java
index 205b55273..205b55273 100644
--- a/testing/newsrc/org/aspectj/testing/XMLBasedAjcTestCaseForJava9OrLater.java
+++ b/testing/src/main/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava9OrLater.java
diff --git a/testing/src/org/aspectj/testing/ajde/CompileCommand.java b/testing/src/main/java/org/aspectj/testing/ajde/CompileCommand.java
index 86c5fbaf7..86c5fbaf7 100644
--- a/testing/src/org/aspectj/testing/ajde/CompileCommand.java
+++ b/testing/src/main/java/org/aspectj/testing/ajde/CompileCommand.java
diff --git a/testing/src/org/aspectj/testing/harness/bridge/AbstractRunSpec.java b/testing/src/main/java/org/aspectj/testing/harness/bridge/AbstractRunSpec.java
index 4e61a512c..4e61a512c 100644
--- a/testing/src/org/aspectj/testing/harness/bridge/AbstractRunSpec.java
+++ b/testing/src/main/java/org/aspectj/testing/harness/bridge/AbstractRunSpec.java
diff --git a/testing/src/org/aspectj/testing/harness/bridge/AjcMessageHandler.java b/testing/src/main/java/org/aspectj/testing/harness/bridge/AjcMessageHandler.java
index f4a88c3b2..f4a88c3b2 100644
--- a/testing/src/org/aspectj/testing/harness/bridge/AjcMessageHandler.java
+++ b/testing/src/main/java/org/aspectj/testing/harness/bridge/AjcMessageHandler.java
diff --git a/testing/src/org/aspectj/testing/harness/bridge/AjcTest.java b/testing/src/main/java/org/aspectj/testing/harness/bridge/AjcTest.java
index bdebae02c..bdebae02c 100644
--- a/testing/src/org/aspectj/testing/harness/bridge/AjcTest.java
+++ b/testing/src/main/java/org/aspectj/testing/harness/bridge/AjcTest.java
diff --git a/testing/src/org/aspectj/testing/harness/bridge/CompilerRun.java b/testing/src/main/java/org/aspectj/testing/harness/bridge/CompilerRun.java
index 8d6c587fe..8d6c587fe 100644
--- a/testing/src/org/aspectj/testing/harness/bridge/CompilerRun.java
+++ b/testing/src/main/java/org/aspectj/testing/harness/bridge/CompilerRun.java
diff --git a/testing/src/org/aspectj/testing/harness/bridge/DirChanges.java b/testing/src/main/java/org/aspectj/testing/harness/bridge/DirChanges.java
index 13281607b..13281607b 100644
--- a/testing/src/org/aspectj/testing/harness/bridge/DirChanges.java
+++ b/testing/src/main/java/org/aspectj/testing/harness/bridge/DirChanges.java
diff --git a/testing/src/org/aspectj/testing/harness/bridge/FlatSuiteReader.java b/testing/src/main/java/org/aspectj/testing/harness/bridge/FlatSuiteReader.java
index 8d75d5620..8d75d5620 100644
--- a/testing/src/org/aspectj/testing/harness/bridge/FlatSuiteReader.java
+++ b/testing/src/main/java/org/aspectj/testing/harness/bridge/FlatSuiteReader.java
diff --git a/testing/src/org/aspectj/testing/harness/bridge/Globals.java b/testing/src/main/java/org/aspectj/testing/harness/bridge/Globals.java
index ad62c9735..ad62c9735 100644
--- a/testing/src/org/aspectj/testing/harness/bridge/Globals.java
+++ b/testing/src/main/java/org/aspectj/testing/harness/bridge/Globals.java
diff --git a/testing/src/org/aspectj/testing/harness/bridge/IAjcRun.java b/testing/src/main/java/org/aspectj/testing/harness/bridge/IAjcRun.java
index e685df5dd..e685df5dd 100644
--- a/testing/src/org/aspectj/testing/harness/bridge/IAjcRun.java
+++ b/testing/src/main/java/org/aspectj/testing/harness/bridge/IAjcRun.java
diff --git a/testing/src/org/aspectj/testing/harness/bridge/IRunSpec.java b/testing/src/main/java/org/aspectj/testing/harness/bridge/IRunSpec.java
index dc35b493d..dc35b493d 100644
--- a/testing/src/org/aspectj/testing/harness/bridge/IRunSpec.java
+++ b/testing/src/main/java/org/aspectj/testing/harness/bridge/IRunSpec.java
diff --git a/testing/src/org/aspectj/testing/harness/bridge/IncCompilerRun.java b/testing/src/main/java/org/aspectj/testing/harness/bridge/IncCompilerRun.java
index 7c7f2c54e..7c7f2c54e 100644
--- a/testing/src/org/aspectj/testing/harness/bridge/IncCompilerRun.java
+++ b/testing/src/main/java/org/aspectj/testing/harness/bridge/IncCompilerRun.java
diff --git a/testing/src/org/aspectj/testing/harness/bridge/JavaRun.java b/testing/src/main/java/org/aspectj/testing/harness/bridge/JavaRun.java
index aade35f48..aade35f48 100644
--- a/testing/src/org/aspectj/testing/harness/bridge/JavaRun.java
+++ b/testing/src/main/java/org/aspectj/testing/harness/bridge/JavaRun.java
diff --git a/testing/src/org/aspectj/testing/harness/bridge/RunSpecIterator.java b/testing/src/main/java/org/aspectj/testing/harness/bridge/RunSpecIterator.java
index e5792236b..e5792236b 100644
--- a/testing/src/org/aspectj/testing/harness/bridge/RunSpecIterator.java
+++ b/testing/src/main/java/org/aspectj/testing/harness/bridge/RunSpecIterator.java
diff --git a/testing/src/org/aspectj/testing/harness/bridge/Sandbox.java b/testing/src/main/java/org/aspectj/testing/harness/bridge/Sandbox.java
index f7f4df31e..f7f4df31e 100644
--- a/testing/src/org/aspectj/testing/harness/bridge/Sandbox.java
+++ b/testing/src/main/java/org/aspectj/testing/harness/bridge/Sandbox.java
diff --git a/testing/src/org/aspectj/testing/harness/bridge/Validator.java b/testing/src/main/java/org/aspectj/testing/harness/bridge/Validator.java
index 37ddd005e..37ddd005e 100644
--- a/testing/src/org/aspectj/testing/harness/bridge/Validator.java
+++ b/testing/src/main/java/org/aspectj/testing/harness/bridge/Validator.java
diff --git a/testing/src/org/aspectj/testing/run/IRun.java b/testing/src/main/java/org/aspectj/testing/run/IRun.java
index 57639016b..57639016b 100644
--- a/testing/src/org/aspectj/testing/run/IRun.java
+++ b/testing/src/main/java/org/aspectj/testing/run/IRun.java
diff --git a/testing/src/org/aspectj/testing/run/IRunIterator.java b/testing/src/main/java/org/aspectj/testing/run/IRunIterator.java
index 5035b216f..5035b216f 100644
--- a/testing/src/org/aspectj/testing/run/IRunIterator.java
+++ b/testing/src/main/java/org/aspectj/testing/run/IRunIterator.java
diff --git a/testing/src/org/aspectj/testing/run/IRunListener.java b/testing/src/main/java/org/aspectj/testing/run/IRunListener.java
index 4318d618f..4318d618f 100644
--- a/testing/src/org/aspectj/testing/run/IRunListener.java
+++ b/testing/src/main/java/org/aspectj/testing/run/IRunListener.java
diff --git a/testing/src/org/aspectj/testing/run/IRunStatus.java b/testing/src/main/java/org/aspectj/testing/run/IRunStatus.java
index 9c8665728..9c8665728 100644
--- a/testing/src/org/aspectj/testing/run/IRunStatus.java
+++ b/testing/src/main/java/org/aspectj/testing/run/IRunStatus.java
diff --git a/testing/src/org/aspectj/testing/run/IRunValidator.java b/testing/src/main/java/org/aspectj/testing/run/IRunValidator.java
index a341aa167..a341aa167 100644
--- a/testing/src/org/aspectj/testing/run/IRunValidator.java
+++ b/testing/src/main/java/org/aspectj/testing/run/IRunValidator.java
diff --git a/testing/src/org/aspectj/testing/run/RunIterator.java b/testing/src/main/java/org/aspectj/testing/run/RunIterator.java
index 1b5c8f307..1b5c8f307 100644
--- a/testing/src/org/aspectj/testing/run/RunIterator.java
+++ b/testing/src/main/java/org/aspectj/testing/run/RunIterator.java
diff --git a/testing/src/org/aspectj/testing/run/RunListener.java b/testing/src/main/java/org/aspectj/testing/run/RunListener.java
index 0d7c9fc76..0d7c9fc76 100644
--- a/testing/src/org/aspectj/testing/run/RunListener.java
+++ b/testing/src/main/java/org/aspectj/testing/run/RunListener.java
diff --git a/testing/src/org/aspectj/testing/run/RunListeners.java b/testing/src/main/java/org/aspectj/testing/run/RunListeners.java
index 4eb8e7a74..4eb8e7a74 100644
--- a/testing/src/org/aspectj/testing/run/RunListeners.java
+++ b/testing/src/main/java/org/aspectj/testing/run/RunListeners.java
diff --git a/testing/src/org/aspectj/testing/run/RunStatus.java b/testing/src/main/java/org/aspectj/testing/run/RunStatus.java
index ac22280ba..ac22280ba 100644
--- a/testing/src/org/aspectj/testing/run/RunStatus.java
+++ b/testing/src/main/java/org/aspectj/testing/run/RunStatus.java
diff --git a/testing/src/org/aspectj/testing/run/RunValidator.java b/testing/src/main/java/org/aspectj/testing/run/RunValidator.java
index 70131f71a..70131f71a 100644
--- a/testing/src/org/aspectj/testing/run/RunValidator.java
+++ b/testing/src/main/java/org/aspectj/testing/run/RunValidator.java
diff --git a/testing/src/org/aspectj/testing/run/Runner.java b/testing/src/main/java/org/aspectj/testing/run/Runner.java
index 58860be6f..58860be6f 100644
--- a/testing/src/org/aspectj/testing/run/Runner.java
+++ b/testing/src/main/java/org/aspectj/testing/run/Runner.java
diff --git a/testing/src/org/aspectj/testing/run/WrappedRunIterator.java b/testing/src/main/java/org/aspectj/testing/run/WrappedRunIterator.java
index 75be92cb7..75be92cb7 100644
--- a/testing/src/org/aspectj/testing/run/WrappedRunIterator.java
+++ b/testing/src/main/java/org/aspectj/testing/run/WrappedRunIterator.java
diff --git a/testing/src/org/aspectj/testing/taskdefs/AjcTaskCompileCommand.java b/testing/src/main/java/org/aspectj/testing/taskdefs/AjcTaskCompileCommand.java
index 1f5325e82..1f5325e82 100644
--- a/testing/src/org/aspectj/testing/taskdefs/AjcTaskCompileCommand.java
+++ b/testing/src/main/java/org/aspectj/testing/taskdefs/AjcTaskCompileCommand.java
diff --git a/testing/src/org/aspectj/testing/util/AccumulatingFileFilter.java b/testing/src/main/java/org/aspectj/testing/util/AccumulatingFileFilter.java
index e01f71874..e01f71874 100644
--- a/testing/src/org/aspectj/testing/util/AccumulatingFileFilter.java
+++ b/testing/src/main/java/org/aspectj/testing/util/AccumulatingFileFilter.java
diff --git a/testing/src/org/aspectj/testing/util/BridgeUtil.java b/testing/src/main/java/org/aspectj/testing/util/BridgeUtil.java
index f06e93850..f06e93850 100644
--- a/testing/src/org/aspectj/testing/util/BridgeUtil.java
+++ b/testing/src/main/java/org/aspectj/testing/util/BridgeUtil.java
diff --git a/testing/src/org/aspectj/testing/util/CollectorFileFilter.java b/testing/src/main/java/org/aspectj/testing/util/CollectorFileFilter.java
index 7c63c3b6c..7c63c3b6c 100644
--- a/testing/src/org/aspectj/testing/util/CollectorFileFilter.java
+++ b/testing/src/main/java/org/aspectj/testing/util/CollectorFileFilter.java
diff --git a/testing/src/org/aspectj/testing/util/Diffs.java b/testing/src/main/java/org/aspectj/testing/util/Diffs.java
index a6edf0d87..a6edf0d87 100644
--- a/testing/src/org/aspectj/testing/util/Diffs.java
+++ b/testing/src/main/java/org/aspectj/testing/util/Diffs.java
diff --git a/testing/src/org/aspectj/testing/util/FileUtil.java b/testing/src/main/java/org/aspectj/testing/util/FileUtil.java
index db77cbd10..db77cbd10 100644
--- a/testing/src/org/aspectj/testing/util/FileUtil.java
+++ b/testing/src/main/java/org/aspectj/testing/util/FileUtil.java
diff --git a/testing/src/org/aspectj/testing/util/IntRange.java b/testing/src/main/java/org/aspectj/testing/util/IntRange.java
index 1f44f69bd..1f44f69bd 100644
--- a/testing/src/org/aspectj/testing/util/IntRange.java
+++ b/testing/src/main/java/org/aspectj/testing/util/IntRange.java
diff --git a/testing/src/org/aspectj/testing/util/IntValidator.java b/testing/src/main/java/org/aspectj/testing/util/IntValidator.java
index e3697d1aa..e3697d1aa 100644
--- a/testing/src/org/aspectj/testing/util/IntValidator.java
+++ b/testing/src/main/java/org/aspectj/testing/util/IntValidator.java
diff --git a/testing/src/org/aspectj/testing/util/IteratorWrapper.java b/testing/src/main/java/org/aspectj/testing/util/IteratorWrapper.java
index 5b7c13af9..5b7c13af9 100644
--- a/testing/src/org/aspectj/testing/util/IteratorWrapper.java
+++ b/testing/src/main/java/org/aspectj/testing/util/IteratorWrapper.java
diff --git a/testing/src/org/aspectj/testing/util/LangUtil.java b/testing/src/main/java/org/aspectj/testing/util/LangUtil.java
index 2baf81c48..2baf81c48 100644
--- a/testing/src/org/aspectj/testing/util/LangUtil.java
+++ b/testing/src/main/java/org/aspectj/testing/util/LangUtil.java
diff --git a/testing/src/org/aspectj/testing/util/LineReader.java b/testing/src/main/java/org/aspectj/testing/util/LineReader.java
index a6af8266a..a6af8266a 100644
--- a/testing/src/org/aspectj/testing/util/LineReader.java
+++ b/testing/src/main/java/org/aspectj/testing/util/LineReader.java
diff --git a/testing/src/org/aspectj/testing/util/LinkCheck.java b/testing/src/main/java/org/aspectj/testing/util/LinkCheck.java
index 3f1ef92a1..3f1ef92a1 100644
--- a/testing/src/org/aspectj/testing/util/LinkCheck.java
+++ b/testing/src/main/java/org/aspectj/testing/util/LinkCheck.java
diff --git a/testing/src/org/aspectj/testing/util/Node.java b/testing/src/main/java/org/aspectj/testing/util/Node.java
index 9439e57e4..9439e57e4 100644
--- a/testing/src/org/aspectj/testing/util/Node.java
+++ b/testing/src/main/java/org/aspectj/testing/util/Node.java
diff --git a/testing/src/org/aspectj/testing/util/NullPrintStream.java b/testing/src/main/java/org/aspectj/testing/util/NullPrintStream.java
index 686c9c8e2..686c9c8e2 100644
--- a/testing/src/org/aspectj/testing/util/NullPrintStream.java
+++ b/testing/src/main/java/org/aspectj/testing/util/NullPrintStream.java
diff --git a/testing/src/org/aspectj/testing/util/ObjectChecker.java b/testing/src/main/java/org/aspectj/testing/util/ObjectChecker.java
index 25985ae5e..25985ae5e 100644
--- a/testing/src/org/aspectj/testing/util/ObjectChecker.java
+++ b/testing/src/main/java/org/aspectj/testing/util/ObjectChecker.java
diff --git a/testing/src/org/aspectj/testing/util/ProxyPrintStream.java b/testing/src/main/java/org/aspectj/testing/util/ProxyPrintStream.java
index 5c5bbe9de..5c5bbe9de 100644
--- a/testing/src/org/aspectj/testing/util/ProxyPrintStream.java
+++ b/testing/src/main/java/org/aspectj/testing/util/ProxyPrintStream.java
diff --git a/testing/src/org/aspectj/testing/util/RunUtils.java b/testing/src/main/java/org/aspectj/testing/util/RunUtils.java
index 86c29a4a2..86c29a4a2 100644
--- a/testing/src/org/aspectj/testing/util/RunUtils.java
+++ b/testing/src/main/java/org/aspectj/testing/util/RunUtils.java
diff --git a/testing/src/org/aspectj/testing/util/SFileReader.java b/testing/src/main/java/org/aspectj/testing/util/SFileReader.java
index eecf2d304..eecf2d304 100644
--- a/testing/src/org/aspectj/testing/util/SFileReader.java
+++ b/testing/src/main/java/org/aspectj/testing/util/SFileReader.java
diff --git a/testing/src/org/aspectj/testing/util/StandardObjectChecker.java b/testing/src/main/java/org/aspectj/testing/util/StandardObjectChecker.java
index bc2f520ad..bc2f520ad 100644
--- a/testing/src/org/aspectj/testing/util/StandardObjectChecker.java
+++ b/testing/src/main/java/org/aspectj/testing/util/StandardObjectChecker.java
diff --git a/testing/src/org/aspectj/testing/util/StreamSniffer.java b/testing/src/main/java/org/aspectj/testing/util/StreamSniffer.java
index cb143604e..cb143604e 100644
--- a/testing/src/org/aspectj/testing/util/StreamSniffer.java
+++ b/testing/src/main/java/org/aspectj/testing/util/StreamSniffer.java
diff --git a/testing/src/org/aspectj/testing/util/StreamsHandler.java b/testing/src/main/java/org/aspectj/testing/util/StreamsHandler.java
index fc69d9900..fc69d9900 100644
--- a/testing/src/org/aspectj/testing/util/StreamsHandler.java
+++ b/testing/src/main/java/org/aspectj/testing/util/StreamsHandler.java
diff --git a/testing/src/org/aspectj/testing/util/StringAccumulator.java b/testing/src/main/java/org/aspectj/testing/util/StringAccumulator.java
index 234592386..234592386 100644
--- a/testing/src/org/aspectj/testing/util/StringAccumulator.java
+++ b/testing/src/main/java/org/aspectj/testing/util/StringAccumulator.java
diff --git a/testing/src/org/aspectj/testing/util/StringVisitor.java b/testing/src/main/java/org/aspectj/testing/util/StringVisitor.java
index 123376df4..123376df4 100644
--- a/testing/src/org/aspectj/testing/util/StringVisitor.java
+++ b/testing/src/main/java/org/aspectj/testing/util/StringVisitor.java
diff --git a/testing/src/org/aspectj/testing/util/StructureModelUtil.java b/testing/src/main/java/org/aspectj/testing/util/StructureModelUtil.java
index 10e03dd22..10e03dd22 100644
--- a/testing/src/org/aspectj/testing/util/StructureModelUtil.java
+++ b/testing/src/main/java/org/aspectj/testing/util/StructureModelUtil.java
diff --git a/testing/src/org/aspectj/testing/util/TestClassLoader.java b/testing/src/main/java/org/aspectj/testing/util/TestClassLoader.java
index dd9c10c8f..dd9c10c8f 100644
--- a/testing/src/org/aspectj/testing/util/TestClassLoader.java
+++ b/testing/src/main/java/org/aspectj/testing/util/TestClassLoader.java
diff --git a/testing/src/org/aspectj/testing/util/TestDiffs.java b/testing/src/main/java/org/aspectj/testing/util/TestDiffs.java
index 54f72e9b9..54f72e9b9 100644
--- a/testing/src/org/aspectj/testing/util/TestDiffs.java
+++ b/testing/src/main/java/org/aspectj/testing/util/TestDiffs.java
diff --git a/testing/src/org/aspectj/testing/util/UtilLineReader.java b/testing/src/main/java/org/aspectj/testing/util/UtilLineReader.java
index ebb6c9d98..ebb6c9d98 100644
--- a/testing/src/org/aspectj/testing/util/UtilLineReader.java
+++ b/testing/src/main/java/org/aspectj/testing/util/UtilLineReader.java
diff --git a/testing/src/org/aspectj/testing/util/ValidFileFilter.java b/testing/src/main/java/org/aspectj/testing/util/ValidFileFilter.java
index 8d069af0f..8d069af0f 100644
--- a/testing/src/org/aspectj/testing/util/ValidFileFilter.java
+++ b/testing/src/main/java/org/aspectj/testing/util/ValidFileFilter.java
diff --git a/testing/src/org/aspectj/testing/util/WebInstall.java b/testing/src/main/java/org/aspectj/testing/util/WebInstall.java
index 3433d55b6..3433d55b6 100644
--- a/testing/src/org/aspectj/testing/util/WebInstall.java
+++ b/testing/src/main/java/org/aspectj/testing/util/WebInstall.java
diff --git a/testing/src/org/aspectj/testing/util/options/Option.java b/testing/src/main/java/org/aspectj/testing/util/options/Option.java
index e845a89bf..e845a89bf 100644
--- a/testing/src/org/aspectj/testing/util/options/Option.java
+++ b/testing/src/main/java/org/aspectj/testing/util/options/Option.java
diff --git a/testing/src/org/aspectj/testing/util/options/Options.java b/testing/src/main/java/org/aspectj/testing/util/options/Options.java
index 04a968d88..04a968d88 100644
--- a/testing/src/org/aspectj/testing/util/options/Options.java
+++ b/testing/src/main/java/org/aspectj/testing/util/options/Options.java
diff --git a/testing/src/org/aspectj/testing/util/options/Values.java b/testing/src/main/java/org/aspectj/testing/util/options/Values.java
index 574969080..574969080 100644
--- a/testing/src/org/aspectj/testing/util/options/Values.java
+++ b/testing/src/main/java/org/aspectj/testing/util/options/Values.java
diff --git a/testing/src/org/aspectj/testing/xml/AjcSpecXmlReader.java b/testing/src/main/java/org/aspectj/testing/xml/AjcSpecXmlReader.java
index 370a9ac91..370a9ac91 100644
--- a/testing/src/org/aspectj/testing/xml/AjcSpecXmlReader.java
+++ b/testing/src/main/java/org/aspectj/testing/xml/AjcSpecXmlReader.java
diff --git a/testing/src/org/aspectj/testing/xml/IXmlWritable.java b/testing/src/main/java/org/aspectj/testing/xml/IXmlWritable.java
index a11b32be3..a11b32be3 100644
--- a/testing/src/org/aspectj/testing/xml/IXmlWritable.java
+++ b/testing/src/main/java/org/aspectj/testing/xml/IXmlWritable.java
diff --git a/testing/src/org/aspectj/testing/xml/MessageListXmlReader.java b/testing/src/main/java/org/aspectj/testing/xml/MessageListXmlReader.java
index cde5e99dd..cde5e99dd 100644
--- a/testing/src/org/aspectj/testing/xml/MessageListXmlReader.java
+++ b/testing/src/main/java/org/aspectj/testing/xml/MessageListXmlReader.java
diff --git a/testing/src/org/aspectj/testing/xml/SoftMessage.java b/testing/src/main/java/org/aspectj/testing/xml/SoftMessage.java
index f59bf397e..f59bf397e 100644
--- a/testing/src/org/aspectj/testing/xml/SoftMessage.java
+++ b/testing/src/main/java/org/aspectj/testing/xml/SoftMessage.java
diff --git a/testing/src/org/aspectj/testing/xml/SoftSourceLocation.java b/testing/src/main/java/org/aspectj/testing/xml/SoftSourceLocation.java
index 17f5ae673..17f5ae673 100644
--- a/testing/src/org/aspectj/testing/xml/SoftSourceLocation.java
+++ b/testing/src/main/java/org/aspectj/testing/xml/SoftSourceLocation.java
diff --git a/testing/src/org/aspectj/testing/xml/XMLWriter.java b/testing/src/main/java/org/aspectj/testing/xml/XMLWriter.java
index 422576c56..422576c56 100644
--- a/testing/src/org/aspectj/testing/xml/XMLWriter.java
+++ b/testing/src/main/java/org/aspectj/testing/xml/XMLWriter.java
diff --git a/testing/testsrc/org/aspectj/testing/TestingModuleTests.java b/testing/src/test/java/org/aspectj/testing/TestingModuleTests.java
index b6c20b215..b6c20b215 100644
--- a/testing/testsrc/org/aspectj/testing/TestingModuleTests.java
+++ b/testing/src/test/java/org/aspectj/testing/TestingModuleTests.java
diff --git a/testing/testsrc/org/aspectj/testing/harness/bridge/AbstractRunSpecTest.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/AbstractRunSpecTest.java
index 1f6ab38ab..1f6ab38ab 100644
--- a/testing/testsrc/org/aspectj/testing/harness/bridge/AbstractRunSpecTest.java
+++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/AbstractRunSpecTest.java
diff --git a/testing/testsrc/org/aspectj/testing/harness/bridge/AjcSpecTest.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/AjcSpecTest.java
index 0c469ec3a..0c469ec3a 100644
--- a/testing/testsrc/org/aspectj/testing/harness/bridge/AjcSpecTest.java
+++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/AjcSpecTest.java
diff --git a/testing/testsrc/org/aspectj/testing/harness/bridge/CompilerRunSpecTest.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/CompilerRunSpecTest.java
index 83e14cf10..83e14cf10 100644
--- a/testing/testsrc/org/aspectj/testing/harness/bridge/CompilerRunSpecTest.java
+++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/CompilerRunSpecTest.java
diff --git a/testing/testsrc/org/aspectj/testing/harness/bridge/CompilerRunTest.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/CompilerRunTest.java
index ddfaee1f4..ddfaee1f4 100644
--- a/testing/testsrc/org/aspectj/testing/harness/bridge/CompilerRunTest.java
+++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/CompilerRunTest.java
diff --git a/testing/testsrc/org/aspectj/testing/harness/bridge/DirChangesTest.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/DirChangesTest.java
index 3ee0fd041..3ee0fd041 100644
--- a/testing/testsrc/org/aspectj/testing/harness/bridge/DirChangesTest.java
+++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/DirChangesTest.java
diff --git a/testing/testsrc/org/aspectj/testing/harness/bridge/ParseTestCase.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/ParseTestCase.java
index cfbc6b0e1..cfbc6b0e1 100644
--- a/testing/testsrc/org/aspectj/testing/harness/bridge/ParseTestCase.java
+++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/ParseTestCase.java
diff --git a/testing/testsrc/org/aspectj/testing/harness/bridge/TestingBridgeTests.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/TestingBridgeTests.java
index 1fd4cb342..1fd4cb342 100644
--- a/testing/testsrc/org/aspectj/testing/harness/bridge/TestingBridgeTests.java
+++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/TestingBridgeTests.java
diff --git a/testing/testsrc/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java b/testing/src/test/java/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java
index 42a2063a4..42a2063a4 100644
--- a/testing/testsrc/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java
+++ b/testing/src/test/java/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java
diff --git a/testing/testsrc/org/aspectj/testing/taskdefs/TaskdefTests.java b/testing/src/test/java/org/aspectj/testing/taskdefs/TaskdefTests.java
index 5a86f8558..5a86f8558 100644
--- a/testing/testsrc/org/aspectj/testing/taskdefs/TaskdefTests.java
+++ b/testing/src/test/java/org/aspectj/testing/taskdefs/TaskdefTests.java
diff --git a/testing/testsrc/org/aspectj/testing/util/BridgeUtilTest.java b/testing/src/test/java/org/aspectj/testing/util/BridgeUtilTest.java
index a0299889b..a0299889b 100644
--- a/testing/testsrc/org/aspectj/testing/util/BridgeUtilTest.java
+++ b/testing/src/test/java/org/aspectj/testing/util/BridgeUtilTest.java
diff --git a/testing/testsrc/org/aspectj/testing/util/FileUtilTest.java b/testing/src/test/java/org/aspectj/testing/util/FileUtilTest.java
index ddafcfb53..ddafcfb53 100644
--- a/testing/testsrc/org/aspectj/testing/util/FileUtilTest.java
+++ b/testing/src/test/java/org/aspectj/testing/util/FileUtilTest.java
diff --git a/testing/testsrc/org/aspectj/testing/util/IteratorWrapperTest.java b/testing/src/test/java/org/aspectj/testing/util/IteratorWrapperTest.java
index a079a2685..a079a2685 100644
--- a/testing/testsrc/org/aspectj/testing/util/IteratorWrapperTest.java
+++ b/testing/src/test/java/org/aspectj/testing/util/IteratorWrapperTest.java
diff --git a/testing/testsrc/org/aspectj/testing/util/LangUtilTest.java b/testing/src/test/java/org/aspectj/testing/util/LangUtilTest.java
index 8131fdf7e..8131fdf7e 100644
--- a/testing/testsrc/org/aspectj/testing/util/LangUtilTest.java
+++ b/testing/src/test/java/org/aspectj/testing/util/LangUtilTest.java
diff --git a/testing/testsrc/org/aspectj/testing/util/MessageUtilTest.java b/testing/src/test/java/org/aspectj/testing/util/MessageUtilTest.java
index 51ec73efd..51ec73efd 100644
--- a/testing/testsrc/org/aspectj/testing/util/MessageUtilTest.java
+++ b/testing/src/test/java/org/aspectj/testing/util/MessageUtilTest.java
diff --git a/testing/testsrc/org/aspectj/testing/util/StreamGrabberTest.java b/testing/src/test/java/org/aspectj/testing/util/StreamGrabberTest.java
index 80ff2ea1a..80ff2ea1a 100644
--- a/testing/testsrc/org/aspectj/testing/util/StreamGrabberTest.java
+++ b/testing/src/test/java/org/aspectj/testing/util/StreamGrabberTest.java
diff --git a/testing/testsrc/org/aspectj/testing/util/StructureModelUtilTest.java b/testing/src/test/java/org/aspectj/testing/util/StructureModelUtilTest.java
index e3f91decc..e3f91decc 100644
--- a/testing/testsrc/org/aspectj/testing/util/StructureModelUtilTest.java
+++ b/testing/src/test/java/org/aspectj/testing/util/StructureModelUtilTest.java
diff --git a/testing/testsrc/org/aspectj/testing/util/TestDiffsTest.java b/testing/src/test/java/org/aspectj/testing/util/TestDiffsTest.java
index af13aed03..af13aed03 100644
--- a/testing/testsrc/org/aspectj/testing/util/TestDiffsTest.java
+++ b/testing/src/test/java/org/aspectj/testing/util/TestDiffsTest.java
diff --git a/testing/testsrc/org/aspectj/testing/util/UtilTests.java b/testing/src/test/java/org/aspectj/testing/util/UtilTests.java
index f5583725d..f5583725d 100644
--- a/testing/testsrc/org/aspectj/testing/util/UtilTests.java
+++ b/testing/src/test/java/org/aspectj/testing/util/UtilTests.java
diff --git a/testing/testsrc/org/aspectj/testing/util/options/OptionChecker.java b/testing/src/test/java/org/aspectj/testing/util/options/OptionChecker.java
index a8b3b2c5a..a8b3b2c5a 100644
--- a/testing/testsrc/org/aspectj/testing/util/options/OptionChecker.java
+++ b/testing/src/test/java/org/aspectj/testing/util/options/OptionChecker.java
diff --git a/testing/testsrc/org/aspectj/testing/util/options/OptionsTest.java b/testing/src/test/java/org/aspectj/testing/util/options/OptionsTest.java
index 4d8efdf2e..4d8efdf2e 100644
--- a/testing/testsrc/org/aspectj/testing/util/options/OptionsTest.java
+++ b/testing/src/test/java/org/aspectj/testing/util/options/OptionsTest.java
diff --git a/testing/testsrc/org/aspectj/testing/util/options/OptionsTests.java b/testing/src/test/java/org/aspectj/testing/util/options/OptionsTests.java
index 0b82c7dc9..0b82c7dc9 100644
--- a/testing/testsrc/org/aspectj/testing/util/options/OptionsTests.java
+++ b/testing/src/test/java/org/aspectj/testing/util/options/OptionsTests.java
diff --git a/testing/testsrc/org/aspectj/testing/util/options/ValuesTest.java b/testing/src/test/java/org/aspectj/testing/util/options/ValuesTest.java
index e1a3b3c01..e1a3b3c01 100644
--- a/testing/testsrc/org/aspectj/testing/util/options/ValuesTest.java
+++ b/testing/src/test/java/org/aspectj/testing/util/options/ValuesTest.java
diff --git a/testing/testsrc/org/aspectj/testing/xml/AjcSpecXmlReaderTest.java b/testing/src/test/java/org/aspectj/testing/xml/AjcSpecXmlReaderTest.java
index bff18c024..bff18c024 100644
--- a/testing/testsrc/org/aspectj/testing/xml/AjcSpecXmlReaderTest.java
+++ b/testing/src/test/java/org/aspectj/testing/xml/AjcSpecXmlReaderTest.java
diff --git a/testing/testsrc/org/aspectj/testing/xml/MessageListXmlReaderTest.java b/testing/src/test/java/org/aspectj/testing/xml/MessageListXmlReaderTest.java
index aa393f5de..aa393f5de 100644
--- a/testing/testsrc/org/aspectj/testing/xml/MessageListXmlReaderTest.java
+++ b/testing/src/test/java/org/aspectj/testing/xml/MessageListXmlReaderTest.java
diff --git a/testing/testsrc/org/aspectj/testing/xml/TestingXmlTests.java b/testing/src/test/java/org/aspectj/testing/xml/TestingXmlTests.java
index ff8093c32..ff8093c32 100644
--- a/testing/testsrc/org/aspectj/testing/xml/TestingXmlTests.java
+++ b/testing/src/test/java/org/aspectj/testing/xml/TestingXmlTests.java
diff --git a/testing/testsrc/org/aspectj/testing/xml/XMLWriterTest.java b/testing/src/test/java/org/aspectj/testing/xml/XMLWriterTest.java
index 13d2652e0..13d2652e0 100644
--- a/testing/testsrc/org/aspectj/testing/xml/XMLWriterTest.java
+++ b/testing/src/test/java/org/aspectj/testing/xml/XMLWriterTest.java