From 24676e3ad3d20ad7d9e7ce1d3e03347883c1ddfd Mon Sep 17 00:00:00 2001
From: Andy Clement <aclement@pivotal.io>
Date: Wed, 30 Jan 2019 16:29:02 -0800
Subject: [PATCH] mavenizing testing-drivers - wip

---
 testing-drivers/.classpath                    | 16 -----
 testing-drivers/.cvsignore                    |  3 -
 testing-drivers/.project                      | 24 --------
 testing-drivers/build.xml                     |  6 --
 testing-drivers/pom.xml                       | 61 +++++++++++++++++++
 .../org/aspectj/testing/drivers/Harness.java  |  0
 .../org/aspectj/testing/drivers/package.html  |  0
 .../testing/TestingDriversModuleTests.java    |  0
 .../drivers/AjcHarnessTestsUsingJUnit.java    |  0
 .../testing/drivers/AjcTestsUsingJUnit.java   |  0
 .../testing/drivers/AjctestsAdapter.java      |  0
 .../aspectj/testing/drivers/DriversTests.java |  0
 .../testing/drivers/HarnessJUnitUtil.java     |  0
 .../testing/drivers/HarnessSelectionTest.java |  0
 14 files changed, 61 insertions(+), 49 deletions(-)
 delete mode 100644 testing-drivers/.classpath
 delete mode 100644 testing-drivers/.cvsignore
 delete mode 100644 testing-drivers/.project
 delete mode 100644 testing-drivers/build.xml
 create mode 100644 testing-drivers/pom.xml
 rename testing-drivers/src/{ => main/java}/org/aspectj/testing/drivers/Harness.java (100%)
 rename testing-drivers/src/{ => main/java}/org/aspectj/testing/drivers/package.html (100%)
 rename testing-drivers/{testsrc => src/test/java}/org/aspectj/testing/TestingDriversModuleTests.java (100%)
 rename testing-drivers/{testsrc => src/test/java}/org/aspectj/testing/drivers/AjcHarnessTestsUsingJUnit.java (100%)
 rename testing-drivers/{testsrc => src/test/java}/org/aspectj/testing/drivers/AjcTestsUsingJUnit.java (100%)
 rename testing-drivers/{testsrc => src/test/java}/org/aspectj/testing/drivers/AjctestsAdapter.java (100%)
 rename testing-drivers/{testsrc => src/test/java}/org/aspectj/testing/drivers/DriversTests.java (100%)
 rename testing-drivers/{testsrc => src/test/java}/org/aspectj/testing/drivers/HarnessJUnitUtil.java (100%)
 rename testing-drivers/{testsrc => src/test/java}/org/aspectj/testing/drivers/HarnessSelectionTest.java (100%)

diff --git a/testing-drivers/.classpath b/testing-drivers/.classpath
deleted file mode 100644
index 3ca4163de..000000000
--- a/testing-drivers/.classpath
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="testsrc"/>
-	<classpathentry kind="src" path="/bridge"/>
-	<classpathentry kind="src" path="/weaver"/>
-	<classpathentry kind="src" path="/testing"/>
-	<classpathentry kind="src" path="/testing-client"/>
-	<classpathentry kind="src" path="/util"/>
-	<classpathentry kind="lib" path="/lib/junit/junit.jar" sourcepath="/lib/junit/junit-src.zip"/>
-	<classpathentry kind="lib" path="/lib/commons/commons.jar" sourcepath="/lib/commons/commons-src.zip"/>
-	<classpathentry kind="src" path="/org.aspectj.ajdt.core"/>
-	<classpathentry kind="src" path="/asm"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/testing-drivers/.cvsignore b/testing-drivers/.cvsignore
deleted file mode 100644
index f74c4c861..000000000
--- a/testing-drivers/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-bin
-ajcore*
-bintest
diff --git a/testing-drivers/.project b/testing-drivers/.project
deleted file mode 100644
index 1ae8caadc..000000000
--- a/testing-drivers/.project
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>testing-drivers</name>
-	<comment></comment>
-	<projects>
-		<project>asm</project>
-		<project>bridge</project>
-		<project>org.aspectj.ajdt.core</project>
-		<project>testing</project>
-		<project>testing-client</project>
-		<project>util</project>
-		<project>weaver</project>
-	</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/testing-drivers/build.xml b/testing-drivers/build.xml
deleted file mode 100644
index f7cff0755..000000000
--- a/testing-drivers/build.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<!-- see ../build/*.html for explanation -->
-<project name="testing-drivers" default="test" basedir=".">
-    <import file="${basedir}/../build/build.xml"/>  
-</project>
-
diff --git a/testing-drivers/pom.xml b/testing-drivers/pom.xml
new file mode 100644
index 000000000..a4c399ae3
--- /dev/null
+++ b/testing-drivers/pom.xml
@@ -0,0 +1,61 @@
+<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>testing-drivers</artifactId>
+  <packaging>jar</packaging>
+  <name>testing-drivers</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>bridge</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>testing</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>testing-client</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>org.aspectj.ajdt.core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>asm</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons</groupId>
+      <artifactId>commons</artifactId>
+      <version>1.0</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/../lib/commons/commons.jar</systemPath>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/testing-drivers/src/org/aspectj/testing/drivers/Harness.java b/testing-drivers/src/main/java/org/aspectj/testing/drivers/Harness.java
similarity index 100%
rename from testing-drivers/src/org/aspectj/testing/drivers/Harness.java
rename to testing-drivers/src/main/java/org/aspectj/testing/drivers/Harness.java
diff --git a/testing-drivers/src/org/aspectj/testing/drivers/package.html b/testing-drivers/src/main/java/org/aspectj/testing/drivers/package.html
similarity index 100%
rename from testing-drivers/src/org/aspectj/testing/drivers/package.html
rename to testing-drivers/src/main/java/org/aspectj/testing/drivers/package.html
diff --git a/testing-drivers/testsrc/org/aspectj/testing/TestingDriversModuleTests.java b/testing-drivers/src/test/java/org/aspectj/testing/TestingDriversModuleTests.java
similarity index 100%
rename from testing-drivers/testsrc/org/aspectj/testing/TestingDriversModuleTests.java
rename to testing-drivers/src/test/java/org/aspectj/testing/TestingDriversModuleTests.java
diff --git a/testing-drivers/testsrc/org/aspectj/testing/drivers/AjcHarnessTestsUsingJUnit.java b/testing-drivers/src/test/java/org/aspectj/testing/drivers/AjcHarnessTestsUsingJUnit.java
similarity index 100%
rename from testing-drivers/testsrc/org/aspectj/testing/drivers/AjcHarnessTestsUsingJUnit.java
rename to testing-drivers/src/test/java/org/aspectj/testing/drivers/AjcHarnessTestsUsingJUnit.java
diff --git a/testing-drivers/testsrc/org/aspectj/testing/drivers/AjcTestsUsingJUnit.java b/testing-drivers/src/test/java/org/aspectj/testing/drivers/AjcTestsUsingJUnit.java
similarity index 100%
rename from testing-drivers/testsrc/org/aspectj/testing/drivers/AjcTestsUsingJUnit.java
rename to testing-drivers/src/test/java/org/aspectj/testing/drivers/AjcTestsUsingJUnit.java
diff --git a/testing-drivers/testsrc/org/aspectj/testing/drivers/AjctestsAdapter.java b/testing-drivers/src/test/java/org/aspectj/testing/drivers/AjctestsAdapter.java
similarity index 100%
rename from testing-drivers/testsrc/org/aspectj/testing/drivers/AjctestsAdapter.java
rename to testing-drivers/src/test/java/org/aspectj/testing/drivers/AjctestsAdapter.java
diff --git a/testing-drivers/testsrc/org/aspectj/testing/drivers/DriversTests.java b/testing-drivers/src/test/java/org/aspectj/testing/drivers/DriversTests.java
similarity index 100%
rename from testing-drivers/testsrc/org/aspectj/testing/drivers/DriversTests.java
rename to testing-drivers/src/test/java/org/aspectj/testing/drivers/DriversTests.java
diff --git a/testing-drivers/testsrc/org/aspectj/testing/drivers/HarnessJUnitUtil.java b/testing-drivers/src/test/java/org/aspectj/testing/drivers/HarnessJUnitUtil.java
similarity index 100%
rename from testing-drivers/testsrc/org/aspectj/testing/drivers/HarnessJUnitUtil.java
rename to testing-drivers/src/test/java/org/aspectj/testing/drivers/HarnessJUnitUtil.java
diff --git a/testing-drivers/testsrc/org/aspectj/testing/drivers/HarnessSelectionTest.java b/testing-drivers/src/test/java/org/aspectj/testing/drivers/HarnessSelectionTest.java
similarity index 100%
rename from testing-drivers/testsrc/org/aspectj/testing/drivers/HarnessSelectionTest.java
rename to testing-drivers/src/test/java/org/aspectj/testing/drivers/HarnessSelectionTest.java
-- 
2.39.5