From 38a19ea6a0b864447883328fe1103fd991a308f0 Mon Sep 17 00:00:00 2001
From: Andy Clement <aclement@pivotal.io>
Date: Fri, 25 Jan 2019 15:49:50 -0800
Subject: [PATCH] mavenizing loadtime - wip

---
 loadtime/.classpath                           | 18 -----
 loadtime/.cvsignore                           |  1 -
 loadtime/.isJava5                             |  1 -
 loadtime/.project                             | 17 -----
 loadtime/build.xml                            |  6 --
 loadtime/pom.xml                              | 75 +++++++++++++++++++
 .../java}/org/aspectj/weaver/loadtime/Aj.java |  0
 .../loadtime/ClassLoaderWeavingAdaptor.java   |  0
 .../weaver/loadtime/ClassPreProcessor.java    |  0
 .../loadtime/ConcreteAspectCodeGen.java       |  0
 .../loadtime/DefaultMessageHandler.java       |  0
 .../loadtime/DefaultWeavingContext.java       |  0
 .../aspectj/weaver/loadtime/JRockitAgent.java |  0
 .../org/aspectj/weaver/loadtime/Options.java  |  0
 .../loadtime/WeavingURLClassLoader.java       |  0
 .../org/aspectj/bea/jvm/ClassLibraryImpl.java |  0
 .../java}/org/aspectj/bea/jvm/JVMImpl.java    |  0
 .../aspectj/loadtime/LoadtimeModuleTests.java |  0
 .../org/aspectj/weaver/loadtime/AjTest.java   |  0
 .../ClassLoaderWeavingAdaptorTest.java        |  0
 .../weaver/loadtime/JRockitAgentTest.java     |  0
 .../weaver/loadtime/WeavingContextTest.java   |  0
 .../loadtime/WeavingURLClassLoaderTest.java   |  0
 .../loadtime/test/DocumentParserTest.java     |  0
 .../aspectj/weaver/loadtime/test/simple.xml   |  0
 .../weaver/loadtime/test/simpleWithDtd.xml    |  0
 .../test/java}/testdata/Apples.java           |  0
 ...ageService$$EnhancerByCGLIB$$6dd4e683.java |  0
 .../test/java}/testdata/MySqlStatement.java   |  0
 .../test/java}/testdata/Oranges.java          |  0
 .../test/java}/testdata/sub/Apples.java       |  0
 .../test/java}/testdata/sub/Oranges.java      |  0
 32 files changed, 75 insertions(+), 43 deletions(-)
 delete mode 100644 loadtime/.classpath
 delete mode 100644 loadtime/.cvsignore
 delete mode 100644 loadtime/.isJava5
 delete mode 100644 loadtime/.project
 delete mode 100644 loadtime/build.xml
 create mode 100644 loadtime/pom.xml
 rename loadtime/src/{ => main/java}/org/aspectj/weaver/loadtime/Aj.java (100%)
 rename loadtime/src/{ => main/java}/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java (100%)
 rename loadtime/src/{ => main/java}/org/aspectj/weaver/loadtime/ClassPreProcessor.java (100%)
 rename loadtime/src/{ => main/java}/org/aspectj/weaver/loadtime/ConcreteAspectCodeGen.java (100%)
 rename loadtime/src/{ => main/java}/org/aspectj/weaver/loadtime/DefaultMessageHandler.java (100%)
 rename loadtime/src/{ => main/java}/org/aspectj/weaver/loadtime/DefaultWeavingContext.java (100%)
 rename loadtime/src/{ => main/java}/org/aspectj/weaver/loadtime/JRockitAgent.java (100%)
 rename loadtime/src/{ => main/java}/org/aspectj/weaver/loadtime/Options.java (100%)
 rename loadtime/src/{ => main/java}/org/aspectj/weaver/loadtime/WeavingURLClassLoader.java (100%)
 rename loadtime/{testsrc => src/test/java}/org/aspectj/bea/jvm/ClassLibraryImpl.java (100%)
 rename loadtime/{testsrc => src/test/java}/org/aspectj/bea/jvm/JVMImpl.java (100%)
 rename loadtime/{testsrc => src/test/java}/org/aspectj/loadtime/LoadtimeModuleTests.java (100%)
 rename loadtime/{testsrc => src/test/java}/org/aspectj/weaver/loadtime/AjTest.java (100%)
 rename loadtime/{testsrc => src/test/java}/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptorTest.java (100%)
 rename loadtime/{testsrc => src/test/java}/org/aspectj/weaver/loadtime/JRockitAgentTest.java (100%)
 rename loadtime/{testsrc => src/test/java}/org/aspectj/weaver/loadtime/WeavingContextTest.java (100%)
 rename loadtime/{testsrc => src/test/java}/org/aspectj/weaver/loadtime/WeavingURLClassLoaderTest.java (100%)
 rename loadtime/{testsrc => src/test/java}/org/aspectj/weaver/loadtime/test/DocumentParserTest.java (100%)
 rename loadtime/{testsrc => src/test/java}/org/aspectj/weaver/loadtime/test/simple.xml (100%)
 rename loadtime/{testsrc => src/test/java}/org/aspectj/weaver/loadtime/test/simpleWithDtd.xml (100%)
 rename loadtime/{testsrc => src/test/java}/testdata/Apples.java (100%)
 rename loadtime/{testsrc => src/test/java}/testdata/MessageService$$EnhancerByCGLIB$$6dd4e683.java (100%)
 rename loadtime/{testsrc => src/test/java}/testdata/MySqlStatement.java (100%)
 rename loadtime/{testsrc => src/test/java}/testdata/Oranges.java (100%)
 rename loadtime/{testsrc => src/test/java}/testdata/sub/Apples.java (100%)
 rename loadtime/{testsrc => src/test/java}/testdata/sub/Oranges.java (100%)

diff --git a/loadtime/.classpath b/loadtime/.classpath
deleted file mode 100644
index 2d821b9df..000000000
--- a/loadtime/.classpath
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="testsrc"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/asm"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/bridge"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/util"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/weaver"/>
-	<classpathentry kind="lib" path="/lib/junit/junit.jar" sourcepath="/lib/junit/junit-src.jar"/>
-	<classpathentry kind="lib" path="/lib/ant/lib/xml-apis.jar"/>
-	<classpathentry kind="lib" path="/lib/ant/lib/xercesImpl.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/testing-util"/>
-	<classpathentry kind="lib" path="/lib/bcel/bcel.jar" sourcepath="/lib/bcel/bcel-src.zip"/>
-	<classpathentry kind="lib" path="/lib/ext/jrockit/jrockit.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.aspectj.matcher"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/loadtime/.cvsignore b/loadtime/.cvsignore
deleted file mode 100644
index ba077a403..000000000
--- a/loadtime/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/loadtime/.isJava5 b/loadtime/.isJava5
deleted file mode 100644
index 136d06384..000000000
--- a/loadtime/.isJava5
+++ /dev/null
@@ -1 +0,0 @@
-  
\ No newline at end of file
diff --git a/loadtime/.project b/loadtime/.project
deleted file mode 100644
index 4d85d1286..000000000
--- a/loadtime/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>loadtime</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/loadtime/build.xml b/loadtime/build.xml
deleted file mode 100644
index 5d64fdfce..000000000
--- a/loadtime/build.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<!-- see ../build/*.html for explanation -->
-<project name="loadtime" default="test" basedir=".">
-    <import file="${basedir}/../build/build.xml"/>  
-</project>
-
diff --git a/loadtime/pom.xml b/loadtime/pom.xml
new file mode 100644
index 000000000..2d2a608e7
--- /dev/null
+++ b/loadtime/pom.xml
@@ -0,0 +1,75 @@
+<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>loadtime</artifactId>
+  <packaging>jar</packaging>
+  <name>loadtime</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>asm</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>bridge</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>util</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>weaver</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>org.aspectj.matcher</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>testing-util</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>bcel-builder</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
+      <version>1.0</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/../lib/ant/lib/xml-apis.jar</systemPath>
+    </dependency>
+    <dependency>
+      <groupId>xercesImpl</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>1.0</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/../lib/ant/lib/xercesImpl.jar</systemPath>
+    </dependency>
+    <dependency>
+      <groupId>jrockit</groupId>
+      <artifactId>jrockit</artifactId>
+      <version>1.0</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/../lib/ext/jrockit/jrockit.jar</systemPath>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/loadtime/src/org/aspectj/weaver/loadtime/Aj.java b/loadtime/src/main/java/org/aspectj/weaver/loadtime/Aj.java
similarity index 100%
rename from loadtime/src/org/aspectj/weaver/loadtime/Aj.java
rename to loadtime/src/main/java/org/aspectj/weaver/loadtime/Aj.java
diff --git a/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java b/loadtime/src/main/java/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java
similarity index 100%
rename from loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java
rename to loadtime/src/main/java/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java
diff --git a/loadtime/src/org/aspectj/weaver/loadtime/ClassPreProcessor.java b/loadtime/src/main/java/org/aspectj/weaver/loadtime/ClassPreProcessor.java
similarity index 100%
rename from loadtime/src/org/aspectj/weaver/loadtime/ClassPreProcessor.java
rename to loadtime/src/main/java/org/aspectj/weaver/loadtime/ClassPreProcessor.java
diff --git a/loadtime/src/org/aspectj/weaver/loadtime/ConcreteAspectCodeGen.java b/loadtime/src/main/java/org/aspectj/weaver/loadtime/ConcreteAspectCodeGen.java
similarity index 100%
rename from loadtime/src/org/aspectj/weaver/loadtime/ConcreteAspectCodeGen.java
rename to loadtime/src/main/java/org/aspectj/weaver/loadtime/ConcreteAspectCodeGen.java
diff --git a/loadtime/src/org/aspectj/weaver/loadtime/DefaultMessageHandler.java b/loadtime/src/main/java/org/aspectj/weaver/loadtime/DefaultMessageHandler.java
similarity index 100%
rename from loadtime/src/org/aspectj/weaver/loadtime/DefaultMessageHandler.java
rename to loadtime/src/main/java/org/aspectj/weaver/loadtime/DefaultMessageHandler.java
diff --git a/loadtime/src/org/aspectj/weaver/loadtime/DefaultWeavingContext.java b/loadtime/src/main/java/org/aspectj/weaver/loadtime/DefaultWeavingContext.java
similarity index 100%
rename from loadtime/src/org/aspectj/weaver/loadtime/DefaultWeavingContext.java
rename to loadtime/src/main/java/org/aspectj/weaver/loadtime/DefaultWeavingContext.java
diff --git a/loadtime/src/org/aspectj/weaver/loadtime/JRockitAgent.java b/loadtime/src/main/java/org/aspectj/weaver/loadtime/JRockitAgent.java
similarity index 100%
rename from loadtime/src/org/aspectj/weaver/loadtime/JRockitAgent.java
rename to loadtime/src/main/java/org/aspectj/weaver/loadtime/JRockitAgent.java
diff --git a/loadtime/src/org/aspectj/weaver/loadtime/Options.java b/loadtime/src/main/java/org/aspectj/weaver/loadtime/Options.java
similarity index 100%
rename from loadtime/src/org/aspectj/weaver/loadtime/Options.java
rename to loadtime/src/main/java/org/aspectj/weaver/loadtime/Options.java
diff --git a/loadtime/src/org/aspectj/weaver/loadtime/WeavingURLClassLoader.java b/loadtime/src/main/java/org/aspectj/weaver/loadtime/WeavingURLClassLoader.java
similarity index 100%
rename from loadtime/src/org/aspectj/weaver/loadtime/WeavingURLClassLoader.java
rename to loadtime/src/main/java/org/aspectj/weaver/loadtime/WeavingURLClassLoader.java
diff --git a/loadtime/testsrc/org/aspectj/bea/jvm/ClassLibraryImpl.java b/loadtime/src/test/java/org/aspectj/bea/jvm/ClassLibraryImpl.java
similarity index 100%
rename from loadtime/testsrc/org/aspectj/bea/jvm/ClassLibraryImpl.java
rename to loadtime/src/test/java/org/aspectj/bea/jvm/ClassLibraryImpl.java
diff --git a/loadtime/testsrc/org/aspectj/bea/jvm/JVMImpl.java b/loadtime/src/test/java/org/aspectj/bea/jvm/JVMImpl.java
similarity index 100%
rename from loadtime/testsrc/org/aspectj/bea/jvm/JVMImpl.java
rename to loadtime/src/test/java/org/aspectj/bea/jvm/JVMImpl.java
diff --git a/loadtime/testsrc/org/aspectj/loadtime/LoadtimeModuleTests.java b/loadtime/src/test/java/org/aspectj/loadtime/LoadtimeModuleTests.java
similarity index 100%
rename from loadtime/testsrc/org/aspectj/loadtime/LoadtimeModuleTests.java
rename to loadtime/src/test/java/org/aspectj/loadtime/LoadtimeModuleTests.java
diff --git a/loadtime/testsrc/org/aspectj/weaver/loadtime/AjTest.java b/loadtime/src/test/java/org/aspectj/weaver/loadtime/AjTest.java
similarity index 100%
rename from loadtime/testsrc/org/aspectj/weaver/loadtime/AjTest.java
rename to loadtime/src/test/java/org/aspectj/weaver/loadtime/AjTest.java
diff --git a/loadtime/testsrc/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptorTest.java b/loadtime/src/test/java/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptorTest.java
similarity index 100%
rename from loadtime/testsrc/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptorTest.java
rename to loadtime/src/test/java/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptorTest.java
diff --git a/loadtime/testsrc/org/aspectj/weaver/loadtime/JRockitAgentTest.java b/loadtime/src/test/java/org/aspectj/weaver/loadtime/JRockitAgentTest.java
similarity index 100%
rename from loadtime/testsrc/org/aspectj/weaver/loadtime/JRockitAgentTest.java
rename to loadtime/src/test/java/org/aspectj/weaver/loadtime/JRockitAgentTest.java
diff --git a/loadtime/testsrc/org/aspectj/weaver/loadtime/WeavingContextTest.java b/loadtime/src/test/java/org/aspectj/weaver/loadtime/WeavingContextTest.java
similarity index 100%
rename from loadtime/testsrc/org/aspectj/weaver/loadtime/WeavingContextTest.java
rename to loadtime/src/test/java/org/aspectj/weaver/loadtime/WeavingContextTest.java
diff --git a/loadtime/testsrc/org/aspectj/weaver/loadtime/WeavingURLClassLoaderTest.java b/loadtime/src/test/java/org/aspectj/weaver/loadtime/WeavingURLClassLoaderTest.java
similarity index 100%
rename from loadtime/testsrc/org/aspectj/weaver/loadtime/WeavingURLClassLoaderTest.java
rename to loadtime/src/test/java/org/aspectj/weaver/loadtime/WeavingURLClassLoaderTest.java
diff --git a/loadtime/testsrc/org/aspectj/weaver/loadtime/test/DocumentParserTest.java b/loadtime/src/test/java/org/aspectj/weaver/loadtime/test/DocumentParserTest.java
similarity index 100%
rename from loadtime/testsrc/org/aspectj/weaver/loadtime/test/DocumentParserTest.java
rename to loadtime/src/test/java/org/aspectj/weaver/loadtime/test/DocumentParserTest.java
diff --git a/loadtime/testsrc/org/aspectj/weaver/loadtime/test/simple.xml b/loadtime/src/test/java/org/aspectj/weaver/loadtime/test/simple.xml
similarity index 100%
rename from loadtime/testsrc/org/aspectj/weaver/loadtime/test/simple.xml
rename to loadtime/src/test/java/org/aspectj/weaver/loadtime/test/simple.xml
diff --git a/loadtime/testsrc/org/aspectj/weaver/loadtime/test/simpleWithDtd.xml b/loadtime/src/test/java/org/aspectj/weaver/loadtime/test/simpleWithDtd.xml
similarity index 100%
rename from loadtime/testsrc/org/aspectj/weaver/loadtime/test/simpleWithDtd.xml
rename to loadtime/src/test/java/org/aspectj/weaver/loadtime/test/simpleWithDtd.xml
diff --git a/loadtime/testsrc/testdata/Apples.java b/loadtime/src/test/java/testdata/Apples.java
similarity index 100%
rename from loadtime/testsrc/testdata/Apples.java
rename to loadtime/src/test/java/testdata/Apples.java
diff --git a/loadtime/testsrc/testdata/MessageService$$EnhancerByCGLIB$$6dd4e683.java b/loadtime/src/test/java/testdata/MessageService$$EnhancerByCGLIB$$6dd4e683.java
similarity index 100%
rename from loadtime/testsrc/testdata/MessageService$$EnhancerByCGLIB$$6dd4e683.java
rename to loadtime/src/test/java/testdata/MessageService$$EnhancerByCGLIB$$6dd4e683.java
diff --git a/loadtime/testsrc/testdata/MySqlStatement.java b/loadtime/src/test/java/testdata/MySqlStatement.java
similarity index 100%
rename from loadtime/testsrc/testdata/MySqlStatement.java
rename to loadtime/src/test/java/testdata/MySqlStatement.java
diff --git a/loadtime/testsrc/testdata/Oranges.java b/loadtime/src/test/java/testdata/Oranges.java
similarity index 100%
rename from loadtime/testsrc/testdata/Oranges.java
rename to loadtime/src/test/java/testdata/Oranges.java
diff --git a/loadtime/testsrc/testdata/sub/Apples.java b/loadtime/src/test/java/testdata/sub/Apples.java
similarity index 100%
rename from loadtime/testsrc/testdata/sub/Apples.java
rename to loadtime/src/test/java/testdata/sub/Apples.java
diff --git a/loadtime/testsrc/testdata/sub/Oranges.java b/loadtime/src/test/java/testdata/sub/Oranges.java
similarity index 100%
rename from loadtime/testsrc/testdata/sub/Oranges.java
rename to loadtime/src/test/java/testdata/sub/Oranges.java
-- 
2.39.5