mavenizing testing - done

89 files changed, 0 insertions, 207 deletions

diff --git a/testing/src/main/java/org/aspectj/internal/tools/ant/taskdefs/Ajctest.java b/testing/src/test/java/org/aspectj/internal/tools/ant/taskdefs/Ajctest.java
index 8fb274176..8fb274176 100644
--- a/testing/src/main/java/org/aspectj/internal/tools/ant/taskdefs/Ajctest.java
+++ b/testing/src/test/java/org/aspectj/internal/tools/ant/taskdefs/Ajctest.java
diff --git a/testing/src/main/java/org/aspectj/internal/tools/ant/taskdefs/MainWrapper.java b/testing/src/test/java/org/aspectj/internal/tools/ant/taskdefs/MainWrapper.java
index 6ce22df24..6ce22df24 100644
--- a/testing/src/main/java/org/aspectj/internal/tools/ant/taskdefs/MainWrapper.java
+++ b/testing/src/test/java/org/aspectj/internal/tools/ant/taskdefs/MainWrapper.java
diff --git a/testing/src/main/java/org/aspectj/testing/AjcTest.java b/testing/src/test/java/org/aspectj/testing/AjcTest.java
index 4cb9a8722..4cb9a8722 100644
--- a/testing/src/main/java/org/aspectj/testing/AjcTest.java
+++ b/testing/src/test/java/org/aspectj/testing/AjcTest.java
diff --git a/testing/src/main/java/org/aspectj/testing/AntSpec.java b/testing/src/test/java/org/aspectj/testing/AntSpec.java
index ceba08b29..ceba08b29 100644
--- a/testing/src/main/java/org/aspectj/testing/AntSpec.java
+++ b/testing/src/test/java/org/aspectj/testing/AntSpec.java
diff --git a/testing/src/main/java/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java b/testing/src/test/java/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java
index 467d9f236..467d9f236 100644
--- a/testing/src/main/java/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java
+++ b/testing/src/test/java/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java
diff --git a/testing/src/main/java/org/aspectj/testing/CompileSpec.java b/testing/src/test/java/org/aspectj/testing/CompileSpec.java
index 22570e3d1..22570e3d1 100644
--- a/testing/src/main/java/org/aspectj/testing/CompileSpec.java
+++ b/testing/src/test/java/org/aspectj/testing/CompileSpec.java
diff --git a/testing/src/main/java/org/aspectj/testing/ExpectedMessageSpec.java b/testing/src/test/java/org/aspectj/testing/ExpectedMessageSpec.java
index 2193b55ae..2193b55ae 100644
--- a/testing/src/main/java/org/aspectj/testing/ExpectedMessageSpec.java
+++ b/testing/src/test/java/org/aspectj/testing/ExpectedMessageSpec.java
diff --git a/testing/src/main/java/org/aspectj/testing/FileSpec.java b/testing/src/test/java/org/aspectj/testing/FileSpec.java
index 2164f38f1..2164f38f1 100644
--- a/testing/src/main/java/org/aspectj/testing/FileSpec.java
+++ b/testing/src/test/java/org/aspectj/testing/FileSpec.java
diff --git a/testing/src/main/java/org/aspectj/testing/ITestStep.java b/testing/src/test/java/org/aspectj/testing/ITestStep.java
index 673d6c66d..673d6c66d 100644
--- a/testing/src/main/java/org/aspectj/testing/ITestStep.java
+++ b/testing/src/test/java/org/aspectj/testing/ITestStep.java
diff --git a/testing/src/main/java/org/aspectj/testing/MakeTestClass.java b/testing/src/test/java/org/aspectj/testing/MakeTestClass.java
index 721cb623b..721cb623b 100644
--- a/testing/src/main/java/org/aspectj/testing/MakeTestClass.java
+++ b/testing/src/test/java/org/aspectj/testing/MakeTestClass.java
diff --git a/testing/src/main/java/org/aspectj/testing/OutputLine.java b/testing/src/test/java/org/aspectj/testing/OutputLine.java
index fc6fe4ce9..fc6fe4ce9 100644
--- a/testing/src/main/java/org/aspectj/testing/OutputLine.java
+++ b/testing/src/test/java/org/aspectj/testing/OutputLine.java
diff --git a/testing/src/main/java/org/aspectj/testing/OutputSpec.java b/testing/src/test/java/org/aspectj/testing/OutputSpec.java
index 9eab46098..9eab46098 100644
--- a/testing/src/main/java/org/aspectj/testing/OutputSpec.java
+++ b/testing/src/test/java/org/aspectj/testing/OutputSpec.java
diff --git a/testing/src/main/java/org/aspectj/testing/RunSpec.java b/testing/src/test/java/org/aspectj/testing/RunSpec.java
index 62b93bcb0..62b93bcb0 100644
--- a/testing/src/main/java/org/aspectj/testing/RunSpec.java
+++ b/testing/src/test/java/org/aspectj/testing/RunSpec.java
diff --git a/testing/src/test/java/org/aspectj/testing/TestingModuleTests.java b/testing/src/test/java/org/aspectj/testing/TestingModuleTests.java
deleted file mode 100644
index b6c20b215..000000000
--- a/testing/src/test/java/org/aspectj/testing/TestingModuleTests.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.aspectj.testing;
-/* *******************************************************************
- * Copyright (c) 1999-2001 Xerox Corporation, 
- *               2002 Palo Alto Research Center, Incorporated (PARC).
- * 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 
- *  
- * Contributors: 
- *     Xerox/PARC     initial implementation 
- * ******************************************************************/
-
-
-// default package
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class TestingModuleTests extends TestCase {
-
-    public static Test suite() { 
-        TestSuite suite = new TestSuite(TestingModuleTests.class.getName());
-        suite.addTest(org.aspectj.testing.harness.bridge.TestingBridgeTests.suite()); 
-        suite.addTest(org.aspectj.testing.taskdefs.TaskdefTests.suite()); 
-        suite.addTest(org.aspectj.testing.util.UtilTests.suite()); 
-        suite.addTest(org.aspectj.testing.util.options.OptionsTests.suite()); 
-        suite.addTest(org.aspectj.testing.xml.TestingXmlTests.suite()); 
-        return suite;
-    }
-
-    public TestingModuleTests(String name) { super(name); }
-
-}  
diff --git a/testing/src/main/java/org/aspectj/testing/WeaveSpec.java b/testing/src/test/java/org/aspectj/testing/WeaveSpec.java
index 2793b63ac..2793b63ac 100644
--- a/testing/src/main/java/org/aspectj/testing/WeaveSpec.java
+++ b/testing/src/test/java/org/aspectj/testing/WeaveSpec.java
diff --git a/testing/src/main/java/org/aspectj/testing/XMLBasedAjcTestCase.java b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCase.java
index 13bbf844e..13bbf844e 100644
--- a/testing/src/main/java/org/aspectj/testing/XMLBasedAjcTestCase.java
+++ b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCase.java
diff --git a/testing/src/main/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava10OrLater.java b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava10OrLater.java
index 4a8c63f11..4a8c63f11 100644
--- a/testing/src/main/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava10OrLater.java
+++ b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava10OrLater.java
diff --git a/testing/src/main/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava11OrLater.java b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava11OrLater.java
index b71fc19e9..b71fc19e9 100644
--- a/testing/src/main/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava11OrLater.java
+++ b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava11OrLater.java
diff --git a/testing/src/main/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava9OrLater.java b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava9OrLater.java
index 205b55273..205b55273 100644
--- a/testing/src/main/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava9OrLater.java
+++ b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava9OrLater.java
diff --git a/testing/src/main/java/org/aspectj/testing/ajde/CompileCommand.java b/testing/src/test/java/org/aspectj/testing/ajde/CompileCommand.java
index 86c5fbaf7..86c5fbaf7 100644
--- a/testing/src/main/java/org/aspectj/testing/ajde/CompileCommand.java
+++ b/testing/src/test/java/org/aspectj/testing/ajde/CompileCommand.java
diff --git a/testing/src/main/java/org/aspectj/testing/harness/bridge/AbstractRunSpec.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/AbstractRunSpec.java
index 4e61a512c..4e61a512c 100644
--- a/testing/src/main/java/org/aspectj/testing/harness/bridge/AbstractRunSpec.java
+++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/AbstractRunSpec.java
diff --git a/testing/src/main/java/org/aspectj/testing/harness/bridge/AjcMessageHandler.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/AjcMessageHandler.java
index f4a88c3b2..f4a88c3b2 100644
--- a/testing/src/main/java/org/aspectj/testing/harness/bridge/AjcMessageHandler.java
+++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/AjcMessageHandler.java
diff --git a/testing/src/main/java/org/aspectj/testing/harness/bridge/AjcTest.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/AjcTest.java
index bdebae02c..bdebae02c 100644
--- a/testing/src/main/java/org/aspectj/testing/harness/bridge/AjcTest.java
+++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/AjcTest.java
diff --git a/testing/src/main/java/org/aspectj/testing/harness/bridge/CompilerRun.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/CompilerRun.java
index 8d6c587fe..8d6c587fe 100644
--- a/testing/src/main/java/org/aspectj/testing/harness/bridge/CompilerRun.java
+++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/CompilerRun.java
diff --git a/testing/src/main/java/org/aspectj/testing/harness/bridge/DirChanges.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/DirChanges.java
index 13281607b..13281607b 100644
--- a/testing/src/main/java/org/aspectj/testing/harness/bridge/DirChanges.java
+++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/DirChanges.java
diff --git a/testing/src/main/java/org/aspectj/testing/harness/bridge/FlatSuiteReader.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/FlatSuiteReader.java
index 8d75d5620..8d75d5620 100644
--- a/testing/src/main/java/org/aspectj/testing/harness/bridge/FlatSuiteReader.java
+++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/FlatSuiteReader.java
diff --git a/testing/src/main/java/org/aspectj/testing/harness/bridge/Globals.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/Globals.java
index ad62c9735..ad62c9735 100644
--- a/testing/src/main/java/org/aspectj/testing/harness/bridge/Globals.java
+++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/Globals.java
diff --git a/testing/src/main/java/org/aspectj/testing/harness/bridge/IAjcRun.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/IAjcRun.java
index e685df5dd..e685df5dd 100644
--- a/testing/src/main/java/org/aspectj/testing/harness/bridge/IAjcRun.java
+++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/IAjcRun.java
diff --git a/testing/src/main/java/org/aspectj/testing/harness/bridge/IRunSpec.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/IRunSpec.java
index dc35b493d..dc35b493d 100644
--- a/testing/src/main/java/org/aspectj/testing/harness/bridge/IRunSpec.java
+++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/IRunSpec.java
diff --git a/testing/src/main/java/org/aspectj/testing/harness/bridge/IncCompilerRun.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/IncCompilerRun.java
index 7c7f2c54e..7c7f2c54e 100644
--- a/testing/src/main/java/org/aspectj/testing/harness/bridge/IncCompilerRun.java
+++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/IncCompilerRun.java
diff --git a/testing/src/main/java/org/aspectj/testing/harness/bridge/JavaRun.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/JavaRun.java
index aade35f48..aade35f48 100644
--- a/testing/src/main/java/org/aspectj/testing/harness/bridge/JavaRun.java
+++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/JavaRun.java
diff --git a/testing/src/main/java/org/aspectj/testing/harness/bridge/RunSpecIterator.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/RunSpecIterator.java
index e5792236b..e5792236b 100644
--- a/testing/src/main/java/org/aspectj/testing/harness/bridge/RunSpecIterator.java
+++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/RunSpecIterator.java
diff --git a/testing/src/main/java/org/aspectj/testing/harness/bridge/Sandbox.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/Sandbox.java
index f7f4df31e..f7f4df31e 100644
--- a/testing/src/main/java/org/aspectj/testing/harness/bridge/Sandbox.java
+++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/Sandbox.java
diff --git a/testing/src/test/java/org/aspectj/testing/harness/bridge/TestingBridgeTests.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/TestingBridgeTests.java
deleted file mode 100644
index 1fd4cb342..000000000
--- a/testing/src/test/java/org/aspectj/testing/harness/bridge/TestingBridgeTests.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* *******************************************************************
- * Copyright (c) 1999-2001 Xerox Corporation, 
- *               2002 Palo Alto Research Center, Incorporated (PARC).
- * 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 
- *  
- * Contributors: 
- *     Xerox/PARC     initial implementation 
- * ******************************************************************/
-
-
-package org.aspectj.testing.harness.bridge;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class TestingBridgeTests extends TestCase {
-
-    public static Test suite() { 
-        TestSuite suite = new TestSuite(TestingBridgeTests.class.getName());
-        // XXX disabled DirChangesTest pending implementation
-        //$JUnit-BEGIN$
-        suite.addTestSuite(AbstractRunSpecTest.class); 
-        suite.addTestSuite(AjcSpecTest.class); 
-        suite.addTestSuite(CompilerRunTest.class); 
-        suite.addTestSuite(CompilerRunSpecTest.class); 
-        suite.addTestSuite(ParseTestCase.class); 
-        //$JUnit-END$
-        return suite;
-    }
-
-    public TestingBridgeTests(String name) { super(name); }
-
-}  
diff --git a/testing/src/main/java/org/aspectj/testing/harness/bridge/Validator.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/Validator.java
index 37ddd005e..37ddd005e 100644
--- a/testing/src/main/java/org/aspectj/testing/harness/bridge/Validator.java
+++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/Validator.java
diff --git a/testing/src/main/java/org/aspectj/testing/run/IRun.java b/testing/src/test/java/org/aspectj/testing/run/IRun.java
index 57639016b..57639016b 100644
--- a/testing/src/main/java/org/aspectj/testing/run/IRun.java
+++ b/testing/src/test/java/org/aspectj/testing/run/IRun.java
diff --git a/testing/src/main/java/org/aspectj/testing/run/IRunIterator.java b/testing/src/test/java/org/aspectj/testing/run/IRunIterator.java
index 5035b216f..5035b216f 100644
--- a/testing/src/main/java/org/aspectj/testing/run/IRunIterator.java
+++ b/testing/src/test/java/org/aspectj/testing/run/IRunIterator.java
diff --git a/testing/src/main/java/org/aspectj/testing/run/IRunListener.java b/testing/src/test/java/org/aspectj/testing/run/IRunListener.java
index 4318d618f..4318d618f 100644
--- a/testing/src/main/java/org/aspectj/testing/run/IRunListener.java
+++ b/testing/src/test/java/org/aspectj/testing/run/IRunListener.java
diff --git a/testing/src/main/java/org/aspectj/testing/run/IRunStatus.java b/testing/src/test/java/org/aspectj/testing/run/IRunStatus.java
index 9c8665728..9c8665728 100644
--- a/testing/src/main/java/org/aspectj/testing/run/IRunStatus.java
+++ b/testing/src/test/java/org/aspectj/testing/run/IRunStatus.java
diff --git a/testing/src/main/java/org/aspectj/testing/run/IRunValidator.java b/testing/src/test/java/org/aspectj/testing/run/IRunValidator.java
index a341aa167..a341aa167 100644
--- a/testing/src/main/java/org/aspectj/testing/run/IRunValidator.java
+++ b/testing/src/test/java/org/aspectj/testing/run/IRunValidator.java
diff --git a/testing/src/main/java/org/aspectj/testing/run/RunIterator.java b/testing/src/test/java/org/aspectj/testing/run/RunIterator.java
index 1b5c8f307..1b5c8f307 100644
--- a/testing/src/main/java/org/aspectj/testing/run/RunIterator.java
+++ b/testing/src/test/java/org/aspectj/testing/run/RunIterator.java
diff --git a/testing/src/main/java/org/aspectj/testing/run/RunListener.java b/testing/src/test/java/org/aspectj/testing/run/RunListener.java
index 0d7c9fc76..0d7c9fc76 100644
--- a/testing/src/main/java/org/aspectj/testing/run/RunListener.java
+++ b/testing/src/test/java/org/aspectj/testing/run/RunListener.java
diff --git a/testing/src/main/java/org/aspectj/testing/run/RunListeners.java b/testing/src/test/java/org/aspectj/testing/run/RunListeners.java
index 4eb8e7a74..4eb8e7a74 100644
--- a/testing/src/main/java/org/aspectj/testing/run/RunListeners.java
+++ b/testing/src/test/java/org/aspectj/testing/run/RunListeners.java
diff --git a/testing/src/main/java/org/aspectj/testing/run/RunStatus.java b/testing/src/test/java/org/aspectj/testing/run/RunStatus.java
index ac22280ba..ac22280ba 100644
--- a/testing/src/main/java/org/aspectj/testing/run/RunStatus.java
+++ b/testing/src/test/java/org/aspectj/testing/run/RunStatus.java
diff --git a/testing/src/main/java/org/aspectj/testing/run/RunValidator.java b/testing/src/test/java/org/aspectj/testing/run/RunValidator.java
index 70131f71a..70131f71a 100644
--- a/testing/src/main/java/org/aspectj/testing/run/RunValidator.java
+++ b/testing/src/test/java/org/aspectj/testing/run/RunValidator.java
diff --git a/testing/src/main/java/org/aspectj/testing/run/Runner.java b/testing/src/test/java/org/aspectj/testing/run/Runner.java
index 58860be6f..58860be6f 100644
--- a/testing/src/main/java/org/aspectj/testing/run/Runner.java
+++ b/testing/src/test/java/org/aspectj/testing/run/Runner.java
diff --git a/testing/src/main/java/org/aspectj/testing/run/WrappedRunIterator.java b/testing/src/test/java/org/aspectj/testing/run/WrappedRunIterator.java
index 75be92cb7..75be92cb7 100644
--- a/testing/src/main/java/org/aspectj/testing/run/WrappedRunIterator.java
+++ b/testing/src/test/java/org/aspectj/testing/run/WrappedRunIterator.java
diff --git a/testing/src/main/java/org/aspectj/testing/taskdefs/AjcTaskCompileCommand.java b/testing/src/test/java/org/aspectj/testing/taskdefs/AjcTaskCompileCommand.java
index 1f5325e82..1f5325e82 100644
--- a/testing/src/main/java/org/aspectj/testing/taskdefs/AjcTaskCompileCommand.java
+++ b/testing/src/test/java/org/aspectj/testing/taskdefs/AjcTaskCompileCommand.java
diff --git a/testing/src/test/java/org/aspectj/testing/taskdefs/TaskdefTests.java b/testing/src/test/java/org/aspectj/testing/taskdefs/TaskdefTests.java
deleted file mode 100644
index 5a86f8558..000000000
--- a/testing/src/test/java/org/aspectj/testing/taskdefs/TaskdefTests.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/* *******************************************************************
- * Copyright (c) 2003 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 
- *  
- * Contributors: 
- *     Wes Isberg     initial implementation 
- * ******************************************************************/
-
-package org.aspectj.testing.taskdefs;
-
-import junit.framework.*;
-
-public class TaskdefTests extends TestCase {
-
-    public static Test suite() { 
-        TestSuite suite = new TestSuite(TaskdefTests.class.getName());
-        //$JUnit-BEGIN$
-        suite.addTestSuite(AjcTaskCompileCommandTest.class); 
-        //$JUnit-END$
-        return suite;
-    }
-
-    public TaskdefTests(String name) { super(name); }
-
-}  
diff --git a/testing/src/main/java/org/aspectj/testing/util/AccumulatingFileFilter.java b/testing/src/test/java/org/aspectj/testing/util/AccumulatingFileFilter.java
index e01f71874..e01f71874 100644
--- a/testing/src/main/java/org/aspectj/testing/util/AccumulatingFileFilter.java
+++ b/testing/src/test/java/org/aspectj/testing/util/AccumulatingFileFilter.java
diff --git a/testing/src/main/java/org/aspectj/testing/util/BridgeUtil.java b/testing/src/test/java/org/aspectj/testing/util/BridgeUtil.java
index f06e93850..f06e93850 100644
--- a/testing/src/main/java/org/aspectj/testing/util/BridgeUtil.java
+++ b/testing/src/test/java/org/aspectj/testing/util/BridgeUtil.java
diff --git a/testing/src/main/java/org/aspectj/testing/util/CollectorFileFilter.java b/testing/src/test/java/org/aspectj/testing/util/CollectorFileFilter.java
index 7c63c3b6c..7c63c3b6c 100644
--- a/testing/src/main/java/org/aspectj/testing/util/CollectorFileFilter.java
+++ b/testing/src/test/java/org/aspectj/testing/util/CollectorFileFilter.java
diff --git a/testing/src/main/java/org/aspectj/testing/util/Diffs.java b/testing/src/test/java/org/aspectj/testing/util/Diffs.java
index a6edf0d87..a6edf0d87 100644
--- a/testing/src/main/java/org/aspectj/testing/util/Diffs.java
+++ b/testing/src/test/java/org/aspectj/testing/util/Diffs.java
diff --git a/testing/src/main/java/org/aspectj/testing/util/FileUtil.java b/testing/src/test/java/org/aspectj/testing/util/FileUtil.java
index db77cbd10..db77cbd10 100644
--- a/testing/src/main/java/org/aspectj/testing/util/FileUtil.java
+++ b/testing/src/test/java/org/aspectj/testing/util/FileUtil.java
diff --git a/testing/src/main/java/org/aspectj/testing/util/IntRange.java b/testing/src/test/java/org/aspectj/testing/util/IntRange.java
index 1f44f69bd..1f44f69bd 100644
--- a/testing/src/main/java/org/aspectj/testing/util/IntRange.java
+++ b/testing/src/test/java/org/aspectj/testing/util/IntRange.java
diff --git a/testing/src/main/java/org/aspectj/testing/util/IntValidator.java b/testing/src/test/java/org/aspectj/testing/util/IntValidator.java
index e3697d1aa..e3697d1aa 100644
--- a/testing/src/main/java/org/aspectj/testing/util/IntValidator.java
+++ b/testing/src/test/java/org/aspectj/testing/util/IntValidator.java
diff --git a/testing/src/main/java/org/aspectj/testing/util/IteratorWrapper.java b/testing/src/test/java/org/aspectj/testing/util/IteratorWrapper.java
index 5b7c13af9..5b7c13af9 100644
--- a/testing/src/main/java/org/aspectj/testing/util/IteratorWrapper.java
+++ b/testing/src/test/java/org/aspectj/testing/util/IteratorWrapper.java
diff --git a/testing/src/main/java/org/aspectj/testing/util/LangUtil.java b/testing/src/test/java/org/aspectj/testing/util/LangUtil.java
index 2baf81c48..2baf81c48 100644
--- a/testing/src/main/java/org/aspectj/testing/util/LangUtil.java
+++ b/testing/src/test/java/org/aspectj/testing/util/LangUtil.java
diff --git a/testing/src/main/java/org/aspectj/testing/util/LineReader.java b/testing/src/test/java/org/aspectj/testing/util/LineReader.java
index a6af8266a..a6af8266a 100644
--- a/testing/src/main/java/org/aspectj/testing/util/LineReader.java
+++ b/testing/src/test/java/org/aspectj/testing/util/LineReader.java
diff --git a/testing/src/main/java/org/aspectj/testing/util/LinkCheck.java b/testing/src/test/java/org/aspectj/testing/util/LinkCheck.java
index 3f1ef92a1..3f1ef92a1 100644
--- a/testing/src/main/java/org/aspectj/testing/util/LinkCheck.java
+++ b/testing/src/test/java/org/aspectj/testing/util/LinkCheck.java
diff --git a/testing/src/main/java/org/aspectj/testing/util/Node.java b/testing/src/test/java/org/aspectj/testing/util/Node.java
index 9439e57e4..9439e57e4 100644
--- a/testing/src/main/java/org/aspectj/testing/util/Node.java
+++ b/testing/src/test/java/org/aspectj/testing/util/Node.java
diff --git a/testing/src/main/java/org/aspectj/testing/util/NullPrintStream.java b/testing/src/test/java/org/aspectj/testing/util/NullPrintStream.java
index 686c9c8e2..686c9c8e2 100644
--- a/testing/src/main/java/org/aspectj/testing/util/NullPrintStream.java
+++ b/testing/src/test/java/org/aspectj/testing/util/NullPrintStream.java
diff --git a/testing/src/main/java/org/aspectj/testing/util/ObjectChecker.java b/testing/src/test/java/org/aspectj/testing/util/ObjectChecker.java
index 25985ae5e..25985ae5e 100644
--- a/testing/src/main/java/org/aspectj/testing/util/ObjectChecker.java
+++ b/testing/src/test/java/org/aspectj/testing/util/ObjectChecker.java
diff --git a/testing/src/main/java/org/aspectj/testing/util/ProxyPrintStream.java b/testing/src/test/java/org/aspectj/testing/util/ProxyPrintStream.java
index 5c5bbe9de..5c5bbe9de 100644
--- a/testing/src/main/java/org/aspectj/testing/util/ProxyPrintStream.java
+++ b/testing/src/test/java/org/aspectj/testing/util/ProxyPrintStream.java
diff --git a/testing/src/main/java/org/aspectj/testing/util/RunUtils.java b/testing/src/test/java/org/aspectj/testing/util/RunUtils.java
index 86c29a4a2..86c29a4a2 100644
--- a/testing/src/main/java/org/aspectj/testing/util/RunUtils.java
+++ b/testing/src/test/java/org/aspectj/testing/util/RunUtils.java
diff --git a/testing/src/main/java/org/aspectj/testing/util/SFileReader.java b/testing/src/test/java/org/aspectj/testing/util/SFileReader.java
index eecf2d304..eecf2d304 100644
--- a/testing/src/main/java/org/aspectj/testing/util/SFileReader.java
+++ b/testing/src/test/java/org/aspectj/testing/util/SFileReader.java
diff --git a/testing/src/main/java/org/aspectj/testing/util/StandardObjectChecker.java b/testing/src/test/java/org/aspectj/testing/util/StandardObjectChecker.java
index bc2f520ad..bc2f520ad 100644
--- a/testing/src/main/java/org/aspectj/testing/util/StandardObjectChecker.java
+++ b/testing/src/test/java/org/aspectj/testing/util/StandardObjectChecker.java
diff --git a/testing/src/main/java/org/aspectj/testing/util/StreamSniffer.java b/testing/src/test/java/org/aspectj/testing/util/StreamSniffer.java
index cb143604e..cb143604e 100644
--- a/testing/src/main/java/org/aspectj/testing/util/StreamSniffer.java
+++ b/testing/src/test/java/org/aspectj/testing/util/StreamSniffer.java
diff --git a/testing/src/main/java/org/aspectj/testing/util/StreamsHandler.java b/testing/src/test/java/org/aspectj/testing/util/StreamsHandler.java
index fc69d9900..fc69d9900 100644
--- a/testing/src/main/java/org/aspectj/testing/util/StreamsHandler.java
+++ b/testing/src/test/java/org/aspectj/testing/util/StreamsHandler.java
diff --git a/testing/src/main/java/org/aspectj/testing/util/StringAccumulator.java b/testing/src/test/java/org/aspectj/testing/util/StringAccumulator.java
index 234592386..234592386 100644
--- a/testing/src/main/java/org/aspectj/testing/util/StringAccumulator.java
+++ b/testing/src/test/java/org/aspectj/testing/util/StringAccumulator.java
diff --git a/testing/src/main/java/org/aspectj/testing/util/StringVisitor.java b/testing/src/test/java/org/aspectj/testing/util/StringVisitor.java
index 123376df4..123376df4 100644
--- a/testing/src/main/java/org/aspectj/testing/util/StringVisitor.java
+++ b/testing/src/test/java/org/aspectj/testing/util/StringVisitor.java
diff --git a/testing/src/main/java/org/aspectj/testing/util/StructureModelUtil.java b/testing/src/test/java/org/aspectj/testing/util/StructureModelUtil.java
index 10e03dd22..10e03dd22 100644
--- a/testing/src/main/java/org/aspectj/testing/util/StructureModelUtil.java
+++ b/testing/src/test/java/org/aspectj/testing/util/StructureModelUtil.java
diff --git a/testing/src/main/java/org/aspectj/testing/util/TestClassLoader.java b/testing/src/test/java/org/aspectj/testing/util/TestClassLoader.java
index dd9c10c8f..dd9c10c8f 100644
--- a/testing/src/main/java/org/aspectj/testing/util/TestClassLoader.java
+++ b/testing/src/test/java/org/aspectj/testing/util/TestClassLoader.java
diff --git a/testing/src/main/java/org/aspectj/testing/util/TestDiffs.java b/testing/src/test/java/org/aspectj/testing/util/TestDiffs.java
index 54f72e9b9..54f72e9b9 100644
--- a/testing/src/main/java/org/aspectj/testing/util/TestDiffs.java
+++ b/testing/src/test/java/org/aspectj/testing/util/TestDiffs.java
diff --git a/testing/src/main/java/org/aspectj/testing/util/UtilLineReader.java b/testing/src/test/java/org/aspectj/testing/util/UtilLineReader.java
index ebb6c9d98..ebb6c9d98 100644
--- a/testing/src/main/java/org/aspectj/testing/util/UtilLineReader.java
+++ b/testing/src/test/java/org/aspectj/testing/util/UtilLineReader.java
diff --git a/testing/src/test/java/org/aspectj/testing/util/UtilTests.java b/testing/src/test/java/org/aspectj/testing/util/UtilTests.java
deleted file mode 100644
index f5583725d..000000000
--- a/testing/src/test/java/org/aspectj/testing/util/UtilTests.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/* *******************************************************************
- * Copyright (c) 1999-2001 Xerox Corporation, 
- *               2002 Palo Alto Research Center, Incorporated (PARC).
- * 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 
- *  
- * Contributors: 
- *     Xerox/PARC     initial implementation 
- * ******************************************************************/
-
-
-package org.aspectj.testing.util;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class UtilTests extends TestCase {
-
-    public static Test suite() { 
-        TestSuite suite = new TestSuite(UtilTests.class.getName());
-        //$JUnit-BEGIN$
-        suite.addTestSuite(BridgeUtilTest.class); 
-        suite.addTestSuite(FileUtilTest.class); 
-        suite.addTestSuite(IteratorWrapperTest.class); 
-        suite.addTestSuite(LangUtilTest.class); 
-        suite.addTestSuite(MessageUtilTest.class); 
-        suite.addTestSuite(StreamGrabberTest.class); 
-        suite.addTestSuite(StructureModelUtilTest.class);
-        //$JUnit-END$
-        return suite;
-    }
-
-    public UtilTests(String name) { super(name); }
-
-}  
diff --git a/testing/src/main/java/org/aspectj/testing/util/ValidFileFilter.java b/testing/src/test/java/org/aspectj/testing/util/ValidFileFilter.java
index 8d069af0f..8d069af0f 100644
--- a/testing/src/main/java/org/aspectj/testing/util/ValidFileFilter.java
+++ b/testing/src/test/java/org/aspectj/testing/util/ValidFileFilter.java
diff --git a/testing/src/main/java/org/aspectj/testing/util/WebInstall.java b/testing/src/test/java/org/aspectj/testing/util/WebInstall.java
index 3433d55b6..3433d55b6 100644
--- a/testing/src/main/java/org/aspectj/testing/util/WebInstall.java
+++ b/testing/src/test/java/org/aspectj/testing/util/WebInstall.java
diff --git a/testing/src/main/java/org/aspectj/testing/util/options/Option.java b/testing/src/test/java/org/aspectj/testing/util/options/Option.java
index e845a89bf..e845a89bf 100644
--- a/testing/src/main/java/org/aspectj/testing/util/options/Option.java
+++ b/testing/src/test/java/org/aspectj/testing/util/options/Option.java
diff --git a/testing/src/main/java/org/aspectj/testing/util/options/Options.java b/testing/src/test/java/org/aspectj/testing/util/options/Options.java
index 04a968d88..04a968d88 100644
--- a/testing/src/main/java/org/aspectj/testing/util/options/Options.java
+++ b/testing/src/test/java/org/aspectj/testing/util/options/Options.java
diff --git a/testing/src/test/java/org/aspectj/testing/util/options/OptionsTests.java b/testing/src/test/java/org/aspectj/testing/util/options/OptionsTests.java
deleted file mode 100644
index 0b82c7dc9..000000000
--- a/testing/src/test/java/org/aspectj/testing/util/options/OptionsTests.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/* *******************************************************************
- * Copyright (c) 2003 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 
- *  
- * Contributors: 
- *     Wes Isberg     initial implementation 
- * ******************************************************************/
-
-
-package org.aspectj.testing.util.options;
-
-import junit.framework.*;
-
-public class OptionsTests extends TestCase {
-
-    public static Test suite() { 
-        TestSuite suite = new TestSuite(OptionsTests.class.getName());
-        //$JUnit-BEGIN$
-        suite.addTestSuite(OptionsTest.class); 
-        //$JUnit-END$
-        return suite;
-    }
-
-    public OptionsTests(String name) { super(name); }
-
-}  
diff --git a/testing/src/main/java/org/aspectj/testing/util/options/Values.java b/testing/src/test/java/org/aspectj/testing/util/options/Values.java
index 574969080..574969080 100644
--- a/testing/src/main/java/org/aspectj/testing/util/options/Values.java
+++ b/testing/src/test/java/org/aspectj/testing/util/options/Values.java
diff --git a/testing/src/main/java/org/aspectj/testing/xml/AjcSpecXmlReader.java b/testing/src/test/java/org/aspectj/testing/xml/AjcSpecXmlReader.java
index 370a9ac91..370a9ac91 100644
--- a/testing/src/main/java/org/aspectj/testing/xml/AjcSpecXmlReader.java
+++ b/testing/src/test/java/org/aspectj/testing/xml/AjcSpecXmlReader.java
diff --git a/testing/src/main/java/org/aspectj/testing/xml/IXmlWritable.java b/testing/src/test/java/org/aspectj/testing/xml/IXmlWritable.java
index a11b32be3..a11b32be3 100644
--- a/testing/src/main/java/org/aspectj/testing/xml/IXmlWritable.java
+++ b/testing/src/test/java/org/aspectj/testing/xml/IXmlWritable.java
diff --git a/testing/src/main/java/org/aspectj/testing/xml/MessageListXmlReader.java b/testing/src/test/java/org/aspectj/testing/xml/MessageListXmlReader.java
index cde5e99dd..cde5e99dd 100644
--- a/testing/src/main/java/org/aspectj/testing/xml/MessageListXmlReader.java
+++ b/testing/src/test/java/org/aspectj/testing/xml/MessageListXmlReader.java
diff --git a/testing/src/main/java/org/aspectj/testing/xml/SoftMessage.java b/testing/src/test/java/org/aspectj/testing/xml/SoftMessage.java
index f59bf397e..f59bf397e 100644
--- a/testing/src/main/java/org/aspectj/testing/xml/SoftMessage.java
+++ b/testing/src/test/java/org/aspectj/testing/xml/SoftMessage.java
diff --git a/testing/src/main/java/org/aspectj/testing/xml/SoftSourceLocation.java b/testing/src/test/java/org/aspectj/testing/xml/SoftSourceLocation.java
index 17f5ae673..17f5ae673 100644
--- a/testing/src/main/java/org/aspectj/testing/xml/SoftSourceLocation.java
+++ b/testing/src/test/java/org/aspectj/testing/xml/SoftSourceLocation.java
diff --git a/testing/src/test/java/org/aspectj/testing/xml/TestingXmlTests.java b/testing/src/test/java/org/aspectj/testing/xml/TestingXmlTests.java
deleted file mode 100644
index ff8093c32..000000000
--- a/testing/src/test/java/org/aspectj/testing/xml/TestingXmlTests.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* *******************************************************************
- * Copyright (c) 1999-2001 Xerox Corporation, 
- *               2002 Palo Alto Research Center, Incorporated (PARC).
- * 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 
- *  
- * Contributors: 
- *     Xerox/PARC     initial implementation 
- * ******************************************************************/
-
-
-package org.aspectj.testing.xml;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class TestingXmlTests extends TestCase {
-
-    public static Test suite() { 
-        TestSuite suite = new TestSuite(TestingXmlTests.class.getName());
-        //$JUnit-BEGIN$
-        suite.addTestSuite(AjcSpecXmlReaderTest.class); 
-        suite.addTestSuite(MessageListXmlReaderTest.class); 
-        suite.addTestSuite(XMLWriterTest.class); 
-        //$JUnit-END$
-        return suite;
-    }
-
-    public TestingXmlTests(String name) { super(name); }
-
-}  
diff --git a/testing/src/main/java/org/aspectj/testing/xml/XMLWriter.java b/testing/src/test/java/org/aspectj/testing/xml/XMLWriter.java
index 422576c56..422576c56 100644
--- a/testing/src/main/java/org/aspectj/testing/xml/XMLWriter.java
+++ b/testing/src/test/java/org/aspectj/testing/xml/XMLWriter.java