Bug 113948 "Repackage AspectJ" (move module root suites out of default package)

25 files changed, 45 insertions, 16 deletions

diff --git a/ajbrowser/testsrc/AjbrowserModuleTests.java b/ajbrowser/testsrc/org/aspectj/tools/ajbrowser/AjbrowserModuleTests.java
index 2522be10b..d0d87f133 100644
--- a/ajbrowser/testsrc/AjbrowserModuleTests.java
+++ b/ajbrowser/testsrc/org/aspectj/tools/ajbrowser/AjbrowserModuleTests.java
@@ -1,3 +1,4 @@
+package org.aspectj.tools.ajbrowser;
 /* *******************************************************************
  * Copyright (c) 1999-2001 Xerox Corporation, 
  *               2002 Palo Alto Research Center, Incorporated (PARC).
diff --git a/ajde/testsrc/AjdeModuleTests.java b/ajde/testsrc/org/aspectj/ajde/AjdeModuleTests.java
index aa06eefa3..6a243c62b 100644
--- a/ajde/testsrc/AjdeModuleTests.java
+++ b/ajde/testsrc/org/aspectj/ajde/AjdeModuleTests.java
@@ -1,3 +1,4 @@
+package org.aspectj.ajde;
 /* *******************************************************************
  * Copyright (c) 1999-2001 Xerox Corporation, 
  *               2002 Palo Alto Research Center, Incorporated (PARC).
diff --git a/ajdoc/testsrc/AjdocModuleTests.java b/ajdoc/testsrc/org/aspectj/tools/ajdoc/AjdocModuleTests.java
index b3585f0e1..19202e9e3 100644
--- a/ajdoc/testsrc/AjdocModuleTests.java
+++ b/ajdoc/testsrc/org/aspectj/tools/ajdoc/AjdocModuleTests.java
@@ -1,3 +1,4 @@
+package org.aspectj.tools.ajdoc;
 /* *******************************************************************
  * Copyright (c) 2003 Contributors.
  * All rights reserved. 
@@ -13,7 +14,6 @@
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.aspectj.tools.ajdoc.AjdocTests;
 
 /**
  * @author Mik Kersten
diff --git a/asm/testsrc/AsmModuleTests.java b/asm/testsrc/org/aspectj/asm/AsmModuleTests.java
index b7a0f1ff6..52f424d99 100644
--- a/asm/testsrc/AsmModuleTests.java
+++ b/asm/testsrc/org/aspectj/asm/AsmModuleTests.java
@@ -1,3 +1,4 @@
+package org.aspectj.asm;
 /* *******************************************************************
  * Copyright (c) 1999-2001 Xerox Corporation, 
  *               2002 Palo Alto Research Center, Incorporated (PARC).
diff --git a/aspectj5rt/testsrc/Aspectj5rtModuleTests.java b/aspectj5rt/testsrc/org/aspectj/runtime/Aspectj5rtModuleTests.java
index 6681a2f11..3eb333fe5 100644
--- a/aspectj5rt/testsrc/Aspectj5rtModuleTests.java
+++ b/aspectj5rt/testsrc/org/aspectj/runtime/Aspectj5rtModuleTests.java
@@ -1,3 +1,4 @@
+package org.aspectj.runtime;
 /* *******************************************************************
  * Copyright (c) 2005 Contributors.
  * All rights reserved. 
diff --git a/bridge/testsrc/BridgeModuleTests.java b/bridge/testsrc/org/aspectj/bridge/BridgeModuleTests.java
index c15de60ce..5811f987d 100644
--- a/bridge/testsrc/BridgeModuleTests.java
+++ b/bridge/testsrc/org/aspectj/bridge/BridgeModuleTests.java
@@ -1,3 +1,4 @@
+package org.aspectj.bridge;
 /* *******************************************************************
  * Copyright (c) 1999-2001 Xerox Corporation, 
  *               2002 Palo Alto Research Center, Incorporated (PARC).
diff --git a/build/junit-patterns.properties b/build/junit-patterns.properties
index fb980f3a6..dc2c4a44c 100644
--- a/build/junit-patterns.properties
+++ b/build/junit-patterns.properties
@@ -3,7 +3,7 @@
 junit.leaves=false
 
 # define the root suite for for each module testsrc/
-junit.rootSuites=*ModuleTests.java
+junit.rootSuites=**/*ModuleTests.java
 
 # define leaf tests for each module testsrc/
 junit.includes=**/*Tests.java,**/*TestCase.java
diff --git a/build/testsrc/BuildModuleTests.java b/build/testsrc/org/aspectj/build/BuildModuleTests.java
index d5a88c91e..30b41899d 100644
--- a/build/testsrc/BuildModuleTests.java
+++ b/build/testsrc/org/aspectj/build/BuildModuleTests.java
@@ -1,3 +1,4 @@
+package org.aspectj.build;
 /* *******************************************************************
  * Copyright (c) 1999-2001 Xerox Corporation, 
  *               2002 Palo Alto Research Center, Incorporated (PARC).
diff --git a/loadtime/testsrc/LoadtimeModuleTests.java b/loadtime/testsrc/org/aspectj/loadtime/LoadtimeModuleTests.java
index 342b16f24..da7509b6f 100644
--- a/loadtime/testsrc/LoadtimeModuleTests.java
+++ b/loadtime/testsrc/org/aspectj/loadtime/LoadtimeModuleTests.java
@@ -1,3 +1,4 @@
+package org.aspectj.loadtime;
 /*******************************************************************************
  * Copyright (c) 2005 Contributors.
  * All rights reserved.
diff --git a/loadtime5/testsrc/Loadtime5ModuleTests.java b/loadtime5/testsrc/org/aspectj/loadtime/Loadtime5ModuleTests.java
index 526750347..665aecdc6 100644
--- a/loadtime5/testsrc/Loadtime5ModuleTests.java
+++ b/loadtime5/testsrc/org/aspectj/loadtime/Loadtime5ModuleTests.java
@@ -1,3 +1,4 @@
+package org.aspectj.loadtime;
 /*******************************************************************************
  * Copyright (c) 2005 Contributors.
  * All rights reserved.
diff --git a/org.aspectj.ajdt.core/testsrc/EajcModuleTests.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/EajcModuleTests.java
index 6dc0dd785..58816162d 100644
--- a/org.aspectj.ajdt.core/testsrc/EajcModuleTests.java
+++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/EajcModuleTests.java
@@ -1,3 +1,4 @@
+package org.aspectj.ajdt;
 /* *******************************************************************
  * Copyright (c) 1999-2001 Xerox Corporation, 
  *               2002 Palo Alto Research Center, Incorporated (PARC).
diff --git a/org.aspectj.lib/testsrc/LibModuleTests.java b/org.aspectj.lib/testsrc/org/aspectj/lib/LibModuleTests.java
index 6a521ca97..6a666b2c1 100644
--- a/org.aspectj.lib/testsrc/LibModuleTests.java
+++ b/org.aspectj.lib/testsrc/org/aspectj/lib/LibModuleTests.java
@@ -1,3 +1,4 @@
+package org.aspectj.lib;
 /* *******************************************************************
  * Copyright (c) 2005 Contributors.
  * All rights reserved. 
diff --git a/run-all-junit-tests/testsrc/AllTests.java b/run-all-junit-tests/testsrc/AllTests.java
index e354498d3..bac614eb2 100644
--- a/run-all-junit-tests/testsrc/AllTests.java
+++ b/run-all-junit-tests/testsrc/AllTests.java
@@ -12,7 +12,24 @@
 
 // default package
 import org.aspectj.util.LangUtil;
+import org.aspectj.util.UtilModuleTests;
+import org.aspectj.weaver.BcweaverModuleTests;
+import org.aspectj.weaver.BcweaverModuleTests15;
+import org.aspectj.ajde.AjdeModuleTests;
+import org.aspectj.ajdt.EajcModuleTests;
+import org.aspectj.asm.AsmModuleTests;
+import org.aspectj.bridge.BridgeModuleTests;
+import org.aspectj.build.BuildModuleTests;
+import org.aspectj.loadtime.LoadtimeModuleTests;
+import org.aspectj.runtime.RuntimeModuleTests;
+import org.aspectj.testing.TestingClientModuleTests;
+import org.aspectj.testing.TestingDriversModuleTests;
+import org.aspectj.testing.TestingModuleTests;
 import org.aspectj.testing.util.TestUtil;
+import org.aspectj.testingutil.TestingUtilModuleTests;
+import org.aspectj.tools.ajbrowser.AjbrowserModuleTests;
+import org.aspectj.tools.ajdoc.AjdocModuleTests;
+import org.aspectj.tools.ant.TaskdefsModuleTests;
 
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
@@ -45,11 +62,11 @@ public class AllTests extends TestCase {
             // these only require 1.3, but in Eclipse they are built 
             // with 1.5, i.e., wrong class version to load under 1.3
             // so the class name can only be used reflectively
-            TestUtil.loadTestsReflectively(suite, "Aspectj5rtModuleTests", false);
-            TestUtil.loadTestsReflectively(suite, "Loadtime5ModuleTests", false);
+            TestUtil.loadTestsReflectively(suite, "org.aspectj.runtime.Aspectj5rtModuleTests", false);
+            TestUtil.loadTestsReflectively(suite, "org.aspectj.loadtime.Loadtime5ModuleTests", false);
             // this next one is built normally, but needs 1.5 rt.jar to pass
             suite.addTest(BcweaverModuleTests15.suite());
-            TestUtil.loadTestsReflectively(suite, "Weaver5ModuleTests",false);
+            TestUtil.loadTestsReflectively(suite, "org.aspectj.weaver.Weaver5ModuleTests",false);
         } else {
             suite.addTest(TestUtil.skipTest("for 1.5"));
         } 
diff --git a/run-all-junit-tests/testsrc/RunTheseBeforeYouCommitTests.java b/run-all-junit-tests/testsrc/RunTheseBeforeYouCommitTests.java
index c835ef057..767bcb3ea 100644
--- a/run-all-junit-tests/testsrc/RunTheseBeforeYouCommitTests.java
+++ b/run-all-junit-tests/testsrc/RunTheseBeforeYouCommitTests.java
@@ -10,6 +10,8 @@
  * 
  * ******************************************************************/
 
+import org.aspectj.tests.TestsModuleTests;
+
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
diff --git a/runtime/testsrc/RuntimeModuleTests.java b/runtime/testsrc/org/aspectj/runtime/RuntimeModuleTests.java
index 53ccf091d..c9bfe88b9 100644
--- a/runtime/testsrc/RuntimeModuleTests.java
+++ b/runtime/testsrc/org/aspectj/runtime/RuntimeModuleTests.java
@@ -1,3 +1,4 @@
+package org.aspectj.runtime;
 /* *******************************************************************
  * Copyright (c) 1999-2001 Xerox Corporation, 
  *               2002 Palo Alto Research Center, Incorporated (PARC).
@@ -11,8 +12,6 @@
  *     Xerox/PARC     initial implementation 
  * ******************************************************************/
 
-// default package
-
 import java.io.*;
 
 import org.aspectj.lang.*;
diff --git a/taskdefs/testsrc/TaskdefsModuleTests.java b/taskdefs/testsrc/org/aspectj/tools/ant/TaskdefsModuleTests.java
index cdd5f2203..b47577eeb 100644
--- a/taskdefs/testsrc/TaskdefsModuleTests.java
+++ b/taskdefs/testsrc/org/aspectj/tools/ant/TaskdefsModuleTests.java
@@ -1,3 +1,4 @@
+package org.aspectj.tools.ant;
 /* *******************************************************************
  * Copyright (c) 1999-2001 Xerox Corporation, 
  *               2002 Palo Alto Research Center, Incorporated (PARC).
diff --git a/testing-client/testsrc/TestingClientModuleTests.java b/testing-client/testsrc/org/aspectj/testing/TestingClientModuleTests.java
index bce2ceae3..b5dfd039c 100644
--- a/testing-client/testsrc/TestingClientModuleTests.java
+++ b/testing-client/testsrc/org/aspectj/testing/TestingClientModuleTests.java
@@ -1,3 +1,4 @@
+package org.aspectj.testing;
 /* *******************************************************************
  * Copyright (c) 1999-2001 Xerox Corporation, 
  *               2002 Palo Alto Research Center, Incorporated (PARC).
@@ -15,8 +16,6 @@
 // default package
 
 import junit.framework.*;
-import junit.framework.Test;
-import org.aspectj.testing.TestingTests;
 
 public class TestingClientModuleTests extends TestCase {
 
diff --git a/testing-drivers/testsrc/TestingDriversModuleTests.java b/testing-drivers/testsrc/org/aspectj/testing/TestingDriversModuleTests.java
index 17456fed1..8cb8ddf30 100644
--- a/testing-drivers/testsrc/TestingDriversModuleTests.java
+++ b/testing-drivers/testsrc/org/aspectj/testing/TestingDriversModuleTests.java
@@ -1,3 +1,4 @@
+package org.aspectj.testing;
 /* *******************************************************************
  * Copyright (c) 1999-2001 Xerox Corporation, 
  *               2002 Palo Alto Research Center, Incorporated (PARC).
diff --git a/testing-util/testsrc/TestingUtilModuleTests.java b/testing-util/testsrc/org/aspectj/testingutil/TestingUtilModuleTests.java
index 8d27711e0..4c5f62ec0 100644
--- a/testing-util/testsrc/TestingUtilModuleTests.java
+++ b/testing-util/testsrc/org/aspectj/testingutil/TestingUtilModuleTests.java
@@ -1,3 +1,4 @@
+package org.aspectj.testingutil;
 /* *******************************************************************
  * Copyright (c) 1999-2001 Xerox Corporation, 
  *               2002 Palo Alto Research Center, Incorporated (PARC).
@@ -17,7 +18,6 @@
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
-import org.aspectj.testingutil.UtilTests;
 
 public class TestingUtilModuleTests extends TestCase {
 
diff --git a/testing/testsrc/TestingModuleTests.java b/testing/testsrc/org/aspectj/testing/TestingModuleTests.java
index bf34ecfd3..b6c20b215 100644
--- a/testing/testsrc/TestingModuleTests.java
+++ b/testing/testsrc/org/aspectj/testing/TestingModuleTests.java
@@ -1,3 +1,4 @@
+package org.aspectj.testing;
 /* *******************************************************************
  * Copyright (c) 1999-2001 Xerox Corporation, 
  *               2002 Palo Alto Research Center, Incorporated (PARC).
diff --git a/tests/testsrc/TestsModuleTests.java b/tests/testsrc/org/aspectj/tests/TestsModuleTests.java
index 8df16f222..ddb62dd3e 100644
--- a/tests/testsrc/TestsModuleTests.java
+++ b/tests/testsrc/org/aspectj/tests/TestsModuleTests.java
@@ -1,3 +1,4 @@
+package org.aspectj.tests;
 /* *******************************************************************
  * Copyright (c) 2005 Contributors.
  * All rights reserved. 
diff --git a/util/testsrc/UtilModuleTests.java b/util/testsrc/org/aspectj/util/UtilModuleTests.java
index 66e3d0fc2..463fdce2a 100644
--- a/util/testsrc/UtilModuleTests.java
+++ b/util/testsrc/org/aspectj/util/UtilModuleTests.java
@@ -1,3 +1,4 @@
+package org.aspectj.util;
 /* *******************************************************************
  * Copyright (c) 1999-2001 Xerox Corporation, 
  *               2002 Palo Alto Research Center, Incorporated (PARC).
diff --git a/weaver/testsrc/BcweaverModuleTests.java b/weaver/testsrc/org/aspectj/weaver/BcweaverModuleTests.java
index 15d90170e..84853ac33 100644
--- a/weaver/testsrc/BcweaverModuleTests.java
+++ b/weaver/testsrc/org/aspectj/weaver/BcweaverModuleTests.java
@@ -1,3 +1,4 @@
+package org.aspectj.weaver;
 /* *******************************************************************
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
@@ -16,7 +17,6 @@ import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.aspectj.weaver.LocaleTest;
 import org.aspectj.weaver.tools.ToolsTests;
 
 public class BcweaverModuleTests extends TestCase {
diff --git a/weaver/testsrc/BcweaverModuleTests15.java b/weaver/testsrc/org/aspectj/weaver/BcweaverModuleTests15.java
index 55f118d3c..7220ea50a 100644
--- a/weaver/testsrc/BcweaverModuleTests15.java
+++ b/weaver/testsrc/org/aspectj/weaver/BcweaverModuleTests15.java
@@ -1,3 +1,4 @@
+package org.aspectj.weaver;
 /* *******************************************************************
  * Copyright (c) 2005 Contributors.
  * All rights reserved. 
@@ -15,11 +16,6 @@ import junit.framework.TestSuite;
 
 import org.aspectj.testing.util.TestUtil;
 import org.aspectj.util.LangUtil;
-import org.aspectj.weaver.BoundedReferenceTypeTestCase;
-import org.aspectj.weaver.MemberTestCase15;
-import org.aspectj.weaver.ReferenceTypeTestCase;
-import org.aspectj.weaver.TypeVariableReferenceTypeTestCase;
-import org.aspectj.weaver.TypeVariableTestCase;
 import org.aspectj.weaver.bcel.BcelGenericSignatureToTypeXTestCase;
 import org.aspectj.weaver.patterns.WildTypePatternResolutionTestCase;
 
diff --git a/weaver5/testsrc/Weaver5ModuleTests.java b/weaver5/testsrc/org/aspectj/weaver/Weaver5ModuleTests.java
index 8aa725b93..a72e34356 100644
--- a/weaver5/testsrc/Weaver5ModuleTests.java
+++ b/weaver5/testsrc/org/aspectj/weaver/Weaver5ModuleTests.java
@@ -1,3 +1,4 @@
+package org.aspectj.weaver;
 /*******************************************************************************
  * Copyright (c) 2005 Contributors.
  * All rights reserved.