aboutsummaryrefslogtreecommitdiffstats
path: root/runtime
diff options
context:
space:
mode:
authorAndy Clement <aclement@pivotal.io>2019-01-24 12:02:42 -0800
committerAndy Clement <aclement@pivotal.io>2019-01-24 12:02:42 -0800
commite01e4369b4c60775d679d8de678f54097fdc3120 (patch)
tree9fec1dc58d902e4850f45def0f6beb44254df3da /runtime
parent38a5e6c8f6ac969a71b91de3a572fdcd4fb22b1b (diff)
downloadaspectj-e01e4369b4c60775d679d8de678f54097fdc3120.tar.gz
aspectj-e01e4369b4c60775d679d8de678f54097fdc3120.zip
mavenizing runtime module - complete
Diffstat (limited to 'runtime')
-rw-r--r--runtime/.classpath8
-rw-r--r--runtime/.cvsignore4
-rw-r--r--runtime/.project17
-rw-r--r--runtime/build.xml6
-rw-r--r--runtime/pom.xml17
-rw-r--r--runtime/src/.cvsignore1
-rw-r--r--runtime/src/main/java/org/aspectj/lang/Aspects14.java (renamed from runtime/src/org/aspectj/lang/Aspects14.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/lang/JoinPoint.java (renamed from runtime/src/org/aspectj/lang/JoinPoint.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/lang/NoAspectBoundException.java (renamed from runtime/src/org/aspectj/lang/NoAspectBoundException.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/lang/ProceedingJoinPoint.java (renamed from runtime/src/org/aspectj/lang/ProceedingJoinPoint.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/lang/Signature.java (renamed from runtime/src/org/aspectj/lang/Signature.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/lang/SoftException.java (renamed from runtime/src/org/aspectj/lang/SoftException.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/lang/package.html (renamed from runtime/src/org/aspectj/lang/package.html)0
-rw-r--r--runtime/src/main/java/org/aspectj/lang/reflect/AdviceSignature.java (renamed from runtime/src/org/aspectj/lang/reflect/AdviceSignature.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/lang/reflect/CatchClauseSignature.java (renamed from runtime/src/org/aspectj/lang/reflect/CatchClauseSignature.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/lang/reflect/CodeSignature.java (renamed from runtime/src/org/aspectj/lang/reflect/CodeSignature.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/lang/reflect/ConstructorSignature.java (renamed from runtime/src/org/aspectj/lang/reflect/ConstructorSignature.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/lang/reflect/FieldSignature.java (renamed from runtime/src/org/aspectj/lang/reflect/FieldSignature.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/lang/reflect/InitializerSignature.java (renamed from runtime/src/org/aspectj/lang/reflect/InitializerSignature.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/lang/reflect/LockSignature.java (renamed from runtime/src/org/aspectj/lang/reflect/LockSignature.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/lang/reflect/MemberSignature.java (renamed from runtime/src/org/aspectj/lang/reflect/MemberSignature.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/lang/reflect/MethodSignature.java (renamed from runtime/src/org/aspectj/lang/reflect/MethodSignature.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/lang/reflect/SourceLocation.java (renamed from runtime/src/org/aspectj/lang/reflect/SourceLocation.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/lang/reflect/UnlockSignature.java (renamed from runtime/src/org/aspectj/lang/reflect/UnlockSignature.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/lang/reflect/package.html (renamed from runtime/src/org/aspectj/lang/reflect/package.html)0
-rw-r--r--runtime/src/main/java/org/aspectj/runtime/CFlow.java (renamed from runtime/src/org/aspectj/runtime/CFlow.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/runtime/internal/AroundClosure.java (renamed from runtime/src/org/aspectj/runtime/internal/AroundClosure.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/runtime/internal/CFlowCounter.java (renamed from runtime/src/org/aspectj/runtime/internal/CFlowCounter.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/runtime/internal/CFlowPlusState.java (renamed from runtime/src/org/aspectj/runtime/internal/CFlowPlusState.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/runtime/internal/CFlowStack.java (renamed from runtime/src/org/aspectj/runtime/internal/CFlowStack.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/runtime/internal/Conversions.java (renamed from runtime/src/org/aspectj/runtime/internal/Conversions.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/runtime/internal/PerObjectMap.java (renamed from runtime/src/org/aspectj/runtime/internal/PerObjectMap.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadCounter.java (renamed from runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadCounter.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadCounterImpl11.java (renamed from runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadCounterImpl11.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStack.java (renamed from runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadStack.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStackFactory.java (renamed from runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadStackFactory.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStackFactoryImpl.java (renamed from runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadStackFactoryImpl.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStackFactoryImpl11.java (renamed from runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadStackFactoryImpl11.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStackImpl11.java (renamed from runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadStackImpl11.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/runtime/reflect/AdviceSignatureImpl.java (renamed from runtime/src/org/aspectj/runtime/reflect/AdviceSignatureImpl.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/runtime/reflect/CatchClauseSignatureImpl.java (renamed from runtime/src/org/aspectj/runtime/reflect/CatchClauseSignatureImpl.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/runtime/reflect/CodeSignatureImpl.java (renamed from runtime/src/org/aspectj/runtime/reflect/CodeSignatureImpl.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/runtime/reflect/ConstructorSignatureImpl.java (renamed from runtime/src/org/aspectj/runtime/reflect/ConstructorSignatureImpl.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/runtime/reflect/Factory.java (renamed from runtime/src/org/aspectj/runtime/reflect/Factory.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/runtime/reflect/FieldSignatureImpl.java (renamed from runtime/src/org/aspectj/runtime/reflect/FieldSignatureImpl.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/runtime/reflect/InitializerSignatureImpl.java (renamed from runtime/src/org/aspectj/runtime/reflect/InitializerSignatureImpl.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/runtime/reflect/JoinPointImpl.java (renamed from runtime/src/org/aspectj/runtime/reflect/JoinPointImpl.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/runtime/reflect/LockSignatureImpl.java (renamed from runtime/src/org/aspectj/runtime/reflect/LockSignatureImpl.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/runtime/reflect/MemberSignatureImpl.java (renamed from runtime/src/org/aspectj/runtime/reflect/MemberSignatureImpl.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/runtime/reflect/MethodSignatureImpl.java (renamed from runtime/src/org/aspectj/runtime/reflect/MethodSignatureImpl.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/runtime/reflect/SignatureImpl.java (renamed from runtime/src/org/aspectj/runtime/reflect/SignatureImpl.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/runtime/reflect/SourceLocationImpl.java (renamed from runtime/src/org/aspectj/runtime/reflect/SourceLocationImpl.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/runtime/reflect/StringMaker.java (renamed from runtime/src/org/aspectj/runtime/reflect/StringMaker.java)0
-rw-r--r--runtime/src/main/java/org/aspectj/runtime/reflect/UnlockSignatureImpl.java (renamed from runtime/src/org/aspectj/runtime/reflect/UnlockSignatureImpl.java)0
-rw-r--r--runtime/src/test/java/org/aspectj/runtime/RuntimeModuleTest.java (renamed from runtime/testsrc/org/aspectj/runtime/RuntimeModuleTests.java)13
-rw-r--r--runtime/src/test/java/org/aspectj/runtime/reflect/JoinPointImplTest.java (renamed from runtime/testsrc/org/aspectj/runtime/reflect/JoinPointImplTest.java)0
-rw-r--r--runtime/src/test/java/org/aspectj/runtime/reflect/RuntimePerformanceTest.java (renamed from runtime/testsrc/org/aspectj/runtime/reflect/RuntimePerformanceTest.java)0
-rw-r--r--runtime/src/test/java/org/aspectj/runtime/reflect/SignatureTest.java (renamed from runtime/testsrc/org/aspectj/runtime/reflect/SignatureTest.java)0
58 files changed, 19 insertions, 47 deletions
diff --git a/runtime/.classpath b/runtime/.classpath
deleted file mode 100644
index f33c50284..000000000
--- a/runtime/.classpath
+++ /dev/null
@@ -1,8 +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/junit/junit.jar" sourcepath="/lib/junit/junit-src.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/runtime/.cvsignore b/runtime/.cvsignore
deleted file mode 100644
index 50f446ead..000000000
--- a/runtime/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-ant.properties
-runtime.mf.txt
-bintest
diff --git a/runtime/.project b/runtime/.project
deleted file mode 100644
index 91c0089c8..000000000
--- a/runtime/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>runtime</name>
- <comment></comment>
- <projects>
- </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/runtime/build.xml b/runtime/build.xml
deleted file mode 100644
index 2102111ef..000000000
--- a/runtime/build.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<!-- see ../build/*.html for explanation -->
-<project name="runtime" default="test" basedir=".">
- <import file="${basedir}/../build/build.xml"/>
-</project>
-
diff --git a/runtime/pom.xml b/runtime/pom.xml
new file mode 100644
index 000000000..683d24aba
--- /dev/null
+++ b/runtime/pom.xml
@@ -0,0 +1,17 @@
+<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>runtime</artifactId>
+ <packaging>jar</packaging>
+ <name>runtime</name>
+
+</project>
diff --git a/runtime/src/.cvsignore b/runtime/src/.cvsignore
deleted file mode 100644
index a3f0b1b77..000000000
--- a/runtime/src/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.lst
diff --git a/runtime/src/org/aspectj/lang/Aspects14.java b/runtime/src/main/java/org/aspectj/lang/Aspects14.java
index b7f3a3a4b..b7f3a3a4b 100644
--- a/runtime/src/org/aspectj/lang/Aspects14.java
+++ b/runtime/src/main/java/org/aspectj/lang/Aspects14.java
diff --git a/runtime/src/org/aspectj/lang/JoinPoint.java b/runtime/src/main/java/org/aspectj/lang/JoinPoint.java
index 5d66c7930..5d66c7930 100644
--- a/runtime/src/org/aspectj/lang/JoinPoint.java
+++ b/runtime/src/main/java/org/aspectj/lang/JoinPoint.java
diff --git a/runtime/src/org/aspectj/lang/NoAspectBoundException.java b/runtime/src/main/java/org/aspectj/lang/NoAspectBoundException.java
index 286e4c1f1..286e4c1f1 100644
--- a/runtime/src/org/aspectj/lang/NoAspectBoundException.java
+++ b/runtime/src/main/java/org/aspectj/lang/NoAspectBoundException.java
diff --git a/runtime/src/org/aspectj/lang/ProceedingJoinPoint.java b/runtime/src/main/java/org/aspectj/lang/ProceedingJoinPoint.java
index 5bbc2df85..5bbc2df85 100644
--- a/runtime/src/org/aspectj/lang/ProceedingJoinPoint.java
+++ b/runtime/src/main/java/org/aspectj/lang/ProceedingJoinPoint.java
diff --git a/runtime/src/org/aspectj/lang/Signature.java b/runtime/src/main/java/org/aspectj/lang/Signature.java
index 5bc008433..5bc008433 100644
--- a/runtime/src/org/aspectj/lang/Signature.java
+++ b/runtime/src/main/java/org/aspectj/lang/Signature.java
diff --git a/runtime/src/org/aspectj/lang/SoftException.java b/runtime/src/main/java/org/aspectj/lang/SoftException.java
index ea75ebac4..ea75ebac4 100644
--- a/runtime/src/org/aspectj/lang/SoftException.java
+++ b/runtime/src/main/java/org/aspectj/lang/SoftException.java
diff --git a/runtime/src/org/aspectj/lang/package.html b/runtime/src/main/java/org/aspectj/lang/package.html
index a5fe7ae5d..a5fe7ae5d 100644
--- a/runtime/src/org/aspectj/lang/package.html
+++ b/runtime/src/main/java/org/aspectj/lang/package.html
diff --git a/runtime/src/org/aspectj/lang/reflect/AdviceSignature.java b/runtime/src/main/java/org/aspectj/lang/reflect/AdviceSignature.java
index c01f75019..c01f75019 100644
--- a/runtime/src/org/aspectj/lang/reflect/AdviceSignature.java
+++ b/runtime/src/main/java/org/aspectj/lang/reflect/AdviceSignature.java
diff --git a/runtime/src/org/aspectj/lang/reflect/CatchClauseSignature.java b/runtime/src/main/java/org/aspectj/lang/reflect/CatchClauseSignature.java
index 9a008994d..9a008994d 100644
--- a/runtime/src/org/aspectj/lang/reflect/CatchClauseSignature.java
+++ b/runtime/src/main/java/org/aspectj/lang/reflect/CatchClauseSignature.java
diff --git a/runtime/src/org/aspectj/lang/reflect/CodeSignature.java b/runtime/src/main/java/org/aspectj/lang/reflect/CodeSignature.java
index 1c6ba45e3..1c6ba45e3 100644
--- a/runtime/src/org/aspectj/lang/reflect/CodeSignature.java
+++ b/runtime/src/main/java/org/aspectj/lang/reflect/CodeSignature.java
diff --git a/runtime/src/org/aspectj/lang/reflect/ConstructorSignature.java b/runtime/src/main/java/org/aspectj/lang/reflect/ConstructorSignature.java
index 268a759a2..268a759a2 100644
--- a/runtime/src/org/aspectj/lang/reflect/ConstructorSignature.java
+++ b/runtime/src/main/java/org/aspectj/lang/reflect/ConstructorSignature.java
diff --git a/runtime/src/org/aspectj/lang/reflect/FieldSignature.java b/runtime/src/main/java/org/aspectj/lang/reflect/FieldSignature.java
index df1c57656..df1c57656 100644
--- a/runtime/src/org/aspectj/lang/reflect/FieldSignature.java
+++ b/runtime/src/main/java/org/aspectj/lang/reflect/FieldSignature.java
diff --git a/runtime/src/org/aspectj/lang/reflect/InitializerSignature.java b/runtime/src/main/java/org/aspectj/lang/reflect/InitializerSignature.java
index bbef8b6fa..bbef8b6fa 100644
--- a/runtime/src/org/aspectj/lang/reflect/InitializerSignature.java
+++ b/runtime/src/main/java/org/aspectj/lang/reflect/InitializerSignature.java
diff --git a/runtime/src/org/aspectj/lang/reflect/LockSignature.java b/runtime/src/main/java/org/aspectj/lang/reflect/LockSignature.java
index 5a52b3041..5a52b3041 100644
--- a/runtime/src/org/aspectj/lang/reflect/LockSignature.java
+++ b/runtime/src/main/java/org/aspectj/lang/reflect/LockSignature.java
diff --git a/runtime/src/org/aspectj/lang/reflect/MemberSignature.java b/runtime/src/main/java/org/aspectj/lang/reflect/MemberSignature.java
index cbc448e1b..cbc448e1b 100644
--- a/runtime/src/org/aspectj/lang/reflect/MemberSignature.java
+++ b/runtime/src/main/java/org/aspectj/lang/reflect/MemberSignature.java
diff --git a/runtime/src/org/aspectj/lang/reflect/MethodSignature.java b/runtime/src/main/java/org/aspectj/lang/reflect/MethodSignature.java
index d660e1eb1..d660e1eb1 100644
--- a/runtime/src/org/aspectj/lang/reflect/MethodSignature.java
+++ b/runtime/src/main/java/org/aspectj/lang/reflect/MethodSignature.java
diff --git a/runtime/src/org/aspectj/lang/reflect/SourceLocation.java b/runtime/src/main/java/org/aspectj/lang/reflect/SourceLocation.java
index 52f1dd7a6..52f1dd7a6 100644
--- a/runtime/src/org/aspectj/lang/reflect/SourceLocation.java
+++ b/runtime/src/main/java/org/aspectj/lang/reflect/SourceLocation.java
diff --git a/runtime/src/org/aspectj/lang/reflect/UnlockSignature.java b/runtime/src/main/java/org/aspectj/lang/reflect/UnlockSignature.java
index 3e117ce18..3e117ce18 100644
--- a/runtime/src/org/aspectj/lang/reflect/UnlockSignature.java
+++ b/runtime/src/main/java/org/aspectj/lang/reflect/UnlockSignature.java
diff --git a/runtime/src/org/aspectj/lang/reflect/package.html b/runtime/src/main/java/org/aspectj/lang/reflect/package.html
index fc51a5b60..fc51a5b60 100644
--- a/runtime/src/org/aspectj/lang/reflect/package.html
+++ b/runtime/src/main/java/org/aspectj/lang/reflect/package.html
diff --git a/runtime/src/org/aspectj/runtime/CFlow.java b/runtime/src/main/java/org/aspectj/runtime/CFlow.java
index d607b4822..d607b4822 100644
--- a/runtime/src/org/aspectj/runtime/CFlow.java
+++ b/runtime/src/main/java/org/aspectj/runtime/CFlow.java
diff --git a/runtime/src/org/aspectj/runtime/internal/AroundClosure.java b/runtime/src/main/java/org/aspectj/runtime/internal/AroundClosure.java
index 91f7f923c..91f7f923c 100644
--- a/runtime/src/org/aspectj/runtime/internal/AroundClosure.java
+++ b/runtime/src/main/java/org/aspectj/runtime/internal/AroundClosure.java
diff --git a/runtime/src/org/aspectj/runtime/internal/CFlowCounter.java b/runtime/src/main/java/org/aspectj/runtime/internal/CFlowCounter.java
index 633458195..633458195 100644
--- a/runtime/src/org/aspectj/runtime/internal/CFlowCounter.java
+++ b/runtime/src/main/java/org/aspectj/runtime/internal/CFlowCounter.java
diff --git a/runtime/src/org/aspectj/runtime/internal/CFlowPlusState.java b/runtime/src/main/java/org/aspectj/runtime/internal/CFlowPlusState.java
index b78864a33..b78864a33 100644
--- a/runtime/src/org/aspectj/runtime/internal/CFlowPlusState.java
+++ b/runtime/src/main/java/org/aspectj/runtime/internal/CFlowPlusState.java
diff --git a/runtime/src/org/aspectj/runtime/internal/CFlowStack.java b/runtime/src/main/java/org/aspectj/runtime/internal/CFlowStack.java
index 48308f145..48308f145 100644
--- a/runtime/src/org/aspectj/runtime/internal/CFlowStack.java
+++ b/runtime/src/main/java/org/aspectj/runtime/internal/CFlowStack.java
diff --git a/runtime/src/org/aspectj/runtime/internal/Conversions.java b/runtime/src/main/java/org/aspectj/runtime/internal/Conversions.java
index f74e8d919..f74e8d919 100644
--- a/runtime/src/org/aspectj/runtime/internal/Conversions.java
+++ b/runtime/src/main/java/org/aspectj/runtime/internal/Conversions.java
diff --git a/runtime/src/org/aspectj/runtime/internal/PerObjectMap.java b/runtime/src/main/java/org/aspectj/runtime/internal/PerObjectMap.java
index 319740572..319740572 100644
--- a/runtime/src/org/aspectj/runtime/internal/PerObjectMap.java
+++ b/runtime/src/main/java/org/aspectj/runtime/internal/PerObjectMap.java
diff --git a/runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadCounter.java b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadCounter.java
index 1fa064cee..1fa064cee 100644
--- a/runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadCounter.java
+++ b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadCounter.java
diff --git a/runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadCounterImpl11.java b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadCounterImpl11.java
index 71aaacd62..71aaacd62 100644
--- a/runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadCounterImpl11.java
+++ b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadCounterImpl11.java
diff --git a/runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadStack.java b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStack.java
index 7290163d2..7290163d2 100644
--- a/runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadStack.java
+++ b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStack.java
diff --git a/runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadStackFactory.java b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStackFactory.java
index 38ba0ccbd..38ba0ccbd 100644
--- a/runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadStackFactory.java
+++ b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStackFactory.java
diff --git a/runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadStackFactoryImpl.java b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStackFactoryImpl.java
index 2437f06b0..2437f06b0 100644
--- a/runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadStackFactoryImpl.java
+++ b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStackFactoryImpl.java
diff --git a/runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadStackFactoryImpl11.java b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStackFactoryImpl11.java
index 21c246193..21c246193 100644
--- a/runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadStackFactoryImpl11.java
+++ b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStackFactoryImpl11.java
diff --git a/runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadStackImpl11.java b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStackImpl11.java
index 51f09cadd..51f09cadd 100644
--- a/runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadStackImpl11.java
+++ b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStackImpl11.java
diff --git a/runtime/src/org/aspectj/runtime/reflect/AdviceSignatureImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/AdviceSignatureImpl.java
index 0022c03ba..0022c03ba 100644
--- a/runtime/src/org/aspectj/runtime/reflect/AdviceSignatureImpl.java
+++ b/runtime/src/main/java/org/aspectj/runtime/reflect/AdviceSignatureImpl.java
diff --git a/runtime/src/org/aspectj/runtime/reflect/CatchClauseSignatureImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/CatchClauseSignatureImpl.java
index 6f049a66b..6f049a66b 100644
--- a/runtime/src/org/aspectj/runtime/reflect/CatchClauseSignatureImpl.java
+++ b/runtime/src/main/java/org/aspectj/runtime/reflect/CatchClauseSignatureImpl.java
diff --git a/runtime/src/org/aspectj/runtime/reflect/CodeSignatureImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/CodeSignatureImpl.java
index 74fc462d6..74fc462d6 100644
--- a/runtime/src/org/aspectj/runtime/reflect/CodeSignatureImpl.java
+++ b/runtime/src/main/java/org/aspectj/runtime/reflect/CodeSignatureImpl.java
diff --git a/runtime/src/org/aspectj/runtime/reflect/ConstructorSignatureImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/ConstructorSignatureImpl.java
index a7f688d58..a7f688d58 100644
--- a/runtime/src/org/aspectj/runtime/reflect/ConstructorSignatureImpl.java
+++ b/runtime/src/main/java/org/aspectj/runtime/reflect/ConstructorSignatureImpl.java
diff --git a/runtime/src/org/aspectj/runtime/reflect/Factory.java b/runtime/src/main/java/org/aspectj/runtime/reflect/Factory.java
index 759a1367b..759a1367b 100644
--- a/runtime/src/org/aspectj/runtime/reflect/Factory.java
+++ b/runtime/src/main/java/org/aspectj/runtime/reflect/Factory.java
diff --git a/runtime/src/org/aspectj/runtime/reflect/FieldSignatureImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/FieldSignatureImpl.java
index 8c3de24c4..8c3de24c4 100644
--- a/runtime/src/org/aspectj/runtime/reflect/FieldSignatureImpl.java
+++ b/runtime/src/main/java/org/aspectj/runtime/reflect/FieldSignatureImpl.java
diff --git a/runtime/src/org/aspectj/runtime/reflect/InitializerSignatureImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/InitializerSignatureImpl.java
index adb8f840e..adb8f840e 100644
--- a/runtime/src/org/aspectj/runtime/reflect/InitializerSignatureImpl.java
+++ b/runtime/src/main/java/org/aspectj/runtime/reflect/InitializerSignatureImpl.java
diff --git a/runtime/src/org/aspectj/runtime/reflect/JoinPointImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/JoinPointImpl.java
index 69bff1e3c..69bff1e3c 100644
--- a/runtime/src/org/aspectj/runtime/reflect/JoinPointImpl.java
+++ b/runtime/src/main/java/org/aspectj/runtime/reflect/JoinPointImpl.java
diff --git a/runtime/src/org/aspectj/runtime/reflect/LockSignatureImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/LockSignatureImpl.java
index 2448868d0..2448868d0 100644
--- a/runtime/src/org/aspectj/runtime/reflect/LockSignatureImpl.java
+++ b/runtime/src/main/java/org/aspectj/runtime/reflect/LockSignatureImpl.java
diff --git a/runtime/src/org/aspectj/runtime/reflect/MemberSignatureImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/MemberSignatureImpl.java
index a7cd77a5f..a7cd77a5f 100644
--- a/runtime/src/org/aspectj/runtime/reflect/MemberSignatureImpl.java
+++ b/runtime/src/main/java/org/aspectj/runtime/reflect/MemberSignatureImpl.java
diff --git a/runtime/src/org/aspectj/runtime/reflect/MethodSignatureImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/MethodSignatureImpl.java
index 17416bada..17416bada 100644
--- a/runtime/src/org/aspectj/runtime/reflect/MethodSignatureImpl.java
+++ b/runtime/src/main/java/org/aspectj/runtime/reflect/MethodSignatureImpl.java
diff --git a/runtime/src/org/aspectj/runtime/reflect/SignatureImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/SignatureImpl.java
index 68079b444..68079b444 100644
--- a/runtime/src/org/aspectj/runtime/reflect/SignatureImpl.java
+++ b/runtime/src/main/java/org/aspectj/runtime/reflect/SignatureImpl.java
diff --git a/runtime/src/org/aspectj/runtime/reflect/SourceLocationImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/SourceLocationImpl.java
index 91fc1c321..91fc1c321 100644
--- a/runtime/src/org/aspectj/runtime/reflect/SourceLocationImpl.java
+++ b/runtime/src/main/java/org/aspectj/runtime/reflect/SourceLocationImpl.java
diff --git a/runtime/src/org/aspectj/runtime/reflect/StringMaker.java b/runtime/src/main/java/org/aspectj/runtime/reflect/StringMaker.java
index 53e3988a9..53e3988a9 100644
--- a/runtime/src/org/aspectj/runtime/reflect/StringMaker.java
+++ b/runtime/src/main/java/org/aspectj/runtime/reflect/StringMaker.java
diff --git a/runtime/src/org/aspectj/runtime/reflect/UnlockSignatureImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/UnlockSignatureImpl.java
index d8b377a6f..d8b377a6f 100644
--- a/runtime/src/org/aspectj/runtime/reflect/UnlockSignatureImpl.java
+++ b/runtime/src/main/java/org/aspectj/runtime/reflect/UnlockSignatureImpl.java
diff --git a/runtime/testsrc/org/aspectj/runtime/RuntimeModuleTests.java b/runtime/src/test/java/org/aspectj/runtime/RuntimeModuleTest.java
index c9bfe88b9..97e1750d8 100644
--- a/runtime/testsrc/org/aspectj/runtime/RuntimeModuleTests.java
+++ b/runtime/src/test/java/org/aspectj/runtime/RuntimeModuleTest.java
@@ -21,18 +21,9 @@ import org.aspectj.runtime.reflect.SignatureTest;
import junit.framework.*;
-public class RuntimeModuleTests extends TestCase {
+public class RuntimeModuleTest extends TestCase {
- public static TestSuite suite() {
- TestSuite suite = new TestSuite(RuntimeModuleTests.class.getName());
- suite.addTestSuite(RuntimeModuleTests.class); // minimum 1 test (testNothing)
- suite.addTestSuite(SignatureTest.class);
- suite.addTestSuite(JoinPointImplTest.class);
- suite.addTestSuite(RuntimePerformanceTest.class);
- return suite;
- }
-
- public RuntimeModuleTests(String name) { super(name); }
+ public RuntimeModuleTest(String name) { super(name); }
public void testNoAspectBoundException() {
RuntimeException fun = new RuntimeException("fun");
diff --git a/runtime/testsrc/org/aspectj/runtime/reflect/JoinPointImplTest.java b/runtime/src/test/java/org/aspectj/runtime/reflect/JoinPointImplTest.java
index 2a17ad998..2a17ad998 100644
--- a/runtime/testsrc/org/aspectj/runtime/reflect/JoinPointImplTest.java
+++ b/runtime/src/test/java/org/aspectj/runtime/reflect/JoinPointImplTest.java
diff --git a/runtime/testsrc/org/aspectj/runtime/reflect/RuntimePerformanceTest.java b/runtime/src/test/java/org/aspectj/runtime/reflect/RuntimePerformanceTest.java
index 25959aebc..25959aebc 100644
--- a/runtime/testsrc/org/aspectj/runtime/reflect/RuntimePerformanceTest.java
+++ b/runtime/src/test/java/org/aspectj/runtime/reflect/RuntimePerformanceTest.java
diff --git a/runtime/testsrc/org/aspectj/runtime/reflect/SignatureTest.java b/runtime/src/test/java/org/aspectj/runtime/reflect/SignatureTest.java
index 7a66a5b39..7a66a5b39 100644
--- a/runtime/testsrc/org/aspectj/runtime/reflect/SignatureTest.java
+++ b/runtime/src/test/java/org/aspectj/runtime/reflect/SignatureTest.java