From e01e4369b4c60775d679d8de678f54097fdc3120 Mon Sep 17 00:00:00 2001
From: Andy Clement <aclement@pivotal.io>
Date: Thu, 24 Jan 2019 12:02:42 -0800
Subject: [PATCH] mavenizing runtime module - complete

---
 runtime/.classpath                              |  8 --------
 runtime/.cvsignore                              |  4 ----
 runtime/.project                                | 17 -----------------
 runtime/build.xml                               |  6 ------
 runtime/pom.xml                                 | 17 +++++++++++++++++
 runtime/src/.cvsignore                          |  1 -
 .../java}/org/aspectj/lang/Aspects14.java       |  0
 .../java}/org/aspectj/lang/JoinPoint.java       |  0
 .../aspectj/lang/NoAspectBoundException.java    |  0
 .../org/aspectj/lang/ProceedingJoinPoint.java   |  0
 .../java}/org/aspectj/lang/Signature.java       |  0
 .../java}/org/aspectj/lang/SoftException.java   |  0
 .../java}/org/aspectj/lang/package.html         |  0
 .../aspectj/lang/reflect/AdviceSignature.java   |  0
 .../lang/reflect/CatchClauseSignature.java      |  0
 .../org/aspectj/lang/reflect/CodeSignature.java |  0
 .../lang/reflect/ConstructorSignature.java      |  0
 .../aspectj/lang/reflect/FieldSignature.java    |  0
 .../lang/reflect/InitializerSignature.java      |  0
 .../org/aspectj/lang/reflect/LockSignature.java |  0
 .../aspectj/lang/reflect/MemberSignature.java   |  0
 .../aspectj/lang/reflect/MethodSignature.java   |  0
 .../aspectj/lang/reflect/SourceLocation.java    |  0
 .../aspectj/lang/reflect/UnlockSignature.java   |  0
 .../java}/org/aspectj/lang/reflect/package.html |  0
 .../java}/org/aspectj/runtime/CFlow.java        |  0
 .../aspectj/runtime/internal/AroundClosure.java |  0
 .../aspectj/runtime/internal/CFlowCounter.java  |  0
 .../runtime/internal/CFlowPlusState.java        |  0
 .../aspectj/runtime/internal/CFlowStack.java    |  0
 .../aspectj/runtime/internal/Conversions.java   |  0
 .../aspectj/runtime/internal/PerObjectMap.java  |  0
 .../internal/cflowstack/ThreadCounter.java      |  0
 .../cflowstack/ThreadCounterImpl11.java         |  0
 .../internal/cflowstack/ThreadStack.java        |  0
 .../internal/cflowstack/ThreadStackFactory.java |  0
 .../cflowstack/ThreadStackFactoryImpl.java      |  0
 .../cflowstack/ThreadStackFactoryImpl11.java    |  0
 .../internal/cflowstack/ThreadStackImpl11.java  |  0
 .../runtime/reflect/AdviceSignatureImpl.java    |  0
 .../reflect/CatchClauseSignatureImpl.java       |  0
 .../runtime/reflect/CodeSignatureImpl.java      |  0
 .../reflect/ConstructorSignatureImpl.java       |  0
 .../org/aspectj/runtime/reflect/Factory.java    |  0
 .../runtime/reflect/FieldSignatureImpl.java     |  0
 .../reflect/InitializerSignatureImpl.java       |  0
 .../aspectj/runtime/reflect/JoinPointImpl.java  |  0
 .../runtime/reflect/LockSignatureImpl.java      |  0
 .../runtime/reflect/MemberSignatureImpl.java    |  0
 .../runtime/reflect/MethodSignatureImpl.java    |  0
 .../aspectj/runtime/reflect/SignatureImpl.java  |  0
 .../runtime/reflect/SourceLocationImpl.java     |  0
 .../aspectj/runtime/reflect/StringMaker.java    |  0
 .../runtime/reflect/UnlockSignatureImpl.java    |  0
 .../org/aspectj/runtime/RuntimeModuleTest.java} | 13 ++-----------
 .../runtime/reflect/JoinPointImplTest.java      |  0
 .../runtime/reflect/RuntimePerformanceTest.java |  0
 .../aspectj/runtime/reflect/SignatureTest.java  |  0
 58 files changed, 19 insertions(+), 47 deletions(-)
 delete mode 100644 runtime/.classpath
 delete mode 100644 runtime/.cvsignore
 delete mode 100644 runtime/.project
 delete mode 100644 runtime/build.xml
 create mode 100644 runtime/pom.xml
 delete mode 100644 runtime/src/.cvsignore
 rename runtime/src/{ => main/java}/org/aspectj/lang/Aspects14.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/lang/JoinPoint.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/lang/NoAspectBoundException.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/lang/ProceedingJoinPoint.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/lang/Signature.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/lang/SoftException.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/lang/package.html (100%)
 rename runtime/src/{ => main/java}/org/aspectj/lang/reflect/AdviceSignature.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/lang/reflect/CatchClauseSignature.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/lang/reflect/CodeSignature.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/lang/reflect/ConstructorSignature.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/lang/reflect/FieldSignature.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/lang/reflect/InitializerSignature.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/lang/reflect/LockSignature.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/lang/reflect/MemberSignature.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/lang/reflect/MethodSignature.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/lang/reflect/SourceLocation.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/lang/reflect/UnlockSignature.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/lang/reflect/package.html (100%)
 rename runtime/src/{ => main/java}/org/aspectj/runtime/CFlow.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/runtime/internal/AroundClosure.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/runtime/internal/CFlowCounter.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/runtime/internal/CFlowPlusState.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/runtime/internal/CFlowStack.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/runtime/internal/Conversions.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/runtime/internal/PerObjectMap.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/runtime/internal/cflowstack/ThreadCounter.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/runtime/internal/cflowstack/ThreadCounterImpl11.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/runtime/internal/cflowstack/ThreadStack.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/runtime/internal/cflowstack/ThreadStackFactory.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/runtime/internal/cflowstack/ThreadStackFactoryImpl.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/runtime/internal/cflowstack/ThreadStackFactoryImpl11.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/runtime/internal/cflowstack/ThreadStackImpl11.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/runtime/reflect/AdviceSignatureImpl.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/runtime/reflect/CatchClauseSignatureImpl.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/runtime/reflect/CodeSignatureImpl.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/runtime/reflect/ConstructorSignatureImpl.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/runtime/reflect/Factory.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/runtime/reflect/FieldSignatureImpl.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/runtime/reflect/InitializerSignatureImpl.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/runtime/reflect/JoinPointImpl.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/runtime/reflect/LockSignatureImpl.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/runtime/reflect/MemberSignatureImpl.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/runtime/reflect/MethodSignatureImpl.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/runtime/reflect/SignatureImpl.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/runtime/reflect/SourceLocationImpl.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/runtime/reflect/StringMaker.java (100%)
 rename runtime/src/{ => main/java}/org/aspectj/runtime/reflect/UnlockSignatureImpl.java (100%)
 rename runtime/{testsrc/org/aspectj/runtime/RuntimeModuleTests.java => src/test/java/org/aspectj/runtime/RuntimeModuleTest.java} (84%)
 rename runtime/{testsrc => src/test/java}/org/aspectj/runtime/reflect/JoinPointImplTest.java (100%)
 rename runtime/{testsrc => src/test/java}/org/aspectj/runtime/reflect/RuntimePerformanceTest.java (100%)
 rename runtime/{testsrc => src/test/java}/org/aspectj/runtime/reflect/SignatureTest.java (100%)

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
similarity index 100%
rename from runtime/src/org/aspectj/lang/Aspects14.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/lang/JoinPoint.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/lang/NoAspectBoundException.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/lang/ProceedingJoinPoint.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/lang/Signature.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/lang/SoftException.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/lang/package.html
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/lang/reflect/AdviceSignature.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/lang/reflect/CatchClauseSignature.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/lang/reflect/CodeSignature.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/lang/reflect/ConstructorSignature.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/lang/reflect/FieldSignature.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/lang/reflect/InitializerSignature.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/lang/reflect/LockSignature.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/lang/reflect/MemberSignature.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/lang/reflect/MethodSignature.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/lang/reflect/SourceLocation.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/lang/reflect/UnlockSignature.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/lang/reflect/package.html
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/runtime/CFlow.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/runtime/internal/AroundClosure.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/runtime/internal/CFlowCounter.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/runtime/internal/CFlowPlusState.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/runtime/internal/CFlowStack.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/runtime/internal/Conversions.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/runtime/internal/PerObjectMap.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadCounter.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadCounterImpl11.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadStack.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadStackFactory.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadStackFactoryImpl.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadStackFactoryImpl11.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadStackImpl11.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/runtime/reflect/AdviceSignatureImpl.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/runtime/reflect/CatchClauseSignatureImpl.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/runtime/reflect/CodeSignatureImpl.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/runtime/reflect/ConstructorSignatureImpl.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/runtime/reflect/Factory.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/runtime/reflect/FieldSignatureImpl.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/runtime/reflect/InitializerSignatureImpl.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/runtime/reflect/JoinPointImpl.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/runtime/reflect/LockSignatureImpl.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/runtime/reflect/MemberSignatureImpl.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/runtime/reflect/MethodSignatureImpl.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/runtime/reflect/SignatureImpl.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/runtime/reflect/SourceLocationImpl.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/runtime/reflect/StringMaker.java
rename to 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
similarity index 100%
rename from runtime/src/org/aspectj/runtime/reflect/UnlockSignatureImpl.java
rename to 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
similarity index 84%
rename from runtime/testsrc/org/aspectj/runtime/RuntimeModuleTests.java
rename to 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
similarity index 100%
rename from runtime/testsrc/org/aspectj/runtime/reflect/JoinPointImplTest.java
rename to 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
similarity index 100%
rename from runtime/testsrc/org/aspectj/runtime/reflect/RuntimePerformanceTest.java
rename to 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
similarity index 100%
rename from runtime/testsrc/org/aspectj/runtime/reflect/SignatureTest.java
rename to runtime/src/test/java/org/aspectj/runtime/reflect/SignatureTest.java
-- 
2.39.5