From a303931ebcf72494bdb75395b350ff640a0ff1f3 Mon Sep 17 00:00:00 2001
From: Andy Clement <aclement@pivotal.io>
Date: Wed, 23 Jan 2019 19:45:07 -0800
Subject: [PATCH] mavenizing testing-client module - wip

---
 testing-client/.classpath                     | 10 -------
 testing-client/.cvsignore                     |  2 --
 testing-client/.isJava5                       |  1 -
 testing-client/.project                       | 19 ------------
 testing-client/build.xml                      |  6 ----
 testing-client/pom.xml                        | 30 +++++++++++++++++++
 .../java}/org/aspectj/testing/Tester.java     |  0
 .../aspectj/testing/server/TestServer.java    |  0
 .../java}/org/aspectj/testing/TesterTest.java |  0
 .../testing/TestingClientModuleTests.java     |  0
 .../org/aspectj/testing/TestingTests.java     |  0
 .../testing/server/TestServerTest.java        |  0
 12 files changed, 30 insertions(+), 38 deletions(-)
 delete mode 100644 testing-client/.classpath
 delete mode 100644 testing-client/.cvsignore
 delete mode 100644 testing-client/.isJava5
 delete mode 100644 testing-client/.project
 delete mode 100644 testing-client/build.xml
 create mode 100644 testing-client/pom.xml
 rename testing-client/src/{ => main/java}/org/aspectj/testing/Tester.java (100%)
 rename testing-client/src/{ => main/java}/org/aspectj/testing/server/TestServer.java (100%)
 rename testing-client/{testsrc => src/test/java}/org/aspectj/testing/TesterTest.java (100%)
 rename testing-client/{testsrc => src/test/java}/org/aspectj/testing/TestingClientModuleTests.java (100%)
 rename testing-client/{testsrc => src/test/java}/org/aspectj/testing/TestingTests.java (100%)
 rename testing-client/{testsrc => src/test/java}/org/aspectj/testing/server/TestServerTest.java (100%)

diff --git a/testing-client/.classpath b/testing-client/.classpath
deleted file mode 100644
index a8a227cf2..000000000
--- a/testing-client/.classpath
+++ /dev/null
@@ -1,10 +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="/util"/>
-	<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/testing-client/.cvsignore b/testing-client/.cvsignore
deleted file mode 100644
index 38972d828..000000000
--- a/testing-client/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-bintest
diff --git a/testing-client/.isJava5 b/testing-client/.isJava5
deleted file mode 100644
index 136d06384..000000000
--- a/testing-client/.isJava5
+++ /dev/null
@@ -1 +0,0 @@
-  
\ No newline at end of file
diff --git a/testing-client/.project b/testing-client/.project
deleted file mode 100644
index 2f32f3368..000000000
--- a/testing-client/.project
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>testing-client</name>
-	<comment></comment>
-	<projects>
-		<project>bridge</project>
-		<project>util</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-client/build.xml b/testing-client/build.xml
deleted file mode 100644
index 171c92589..000000000
--- a/testing-client/build.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<!-- see ../build/*.html for explanation -->
-<project name="testing-client" default="test" basedir=".">
-    <import file="${basedir}/../build/build.xml"/>  
-</project>
-
diff --git a/testing-client/pom.xml b/testing-client/pom.xml
new file mode 100644
index 000000000..80b7201e3
--- /dev/null
+++ b/testing-client/pom.xml
@@ -0,0 +1,30 @@
+<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-client</artifactId>
+  <packaging>jar</packaging>
+  <name>testing-client</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>util</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>bridge</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/testing-client/src/org/aspectj/testing/Tester.java b/testing-client/src/main/java/org/aspectj/testing/Tester.java
similarity index 100%
rename from testing-client/src/org/aspectj/testing/Tester.java
rename to testing-client/src/main/java/org/aspectj/testing/Tester.java
diff --git a/testing-client/src/org/aspectj/testing/server/TestServer.java b/testing-client/src/main/java/org/aspectj/testing/server/TestServer.java
similarity index 100%
rename from testing-client/src/org/aspectj/testing/server/TestServer.java
rename to testing-client/src/main/java/org/aspectj/testing/server/TestServer.java
diff --git a/testing-client/testsrc/org/aspectj/testing/TesterTest.java b/testing-client/src/test/java/org/aspectj/testing/TesterTest.java
similarity index 100%
rename from testing-client/testsrc/org/aspectj/testing/TesterTest.java
rename to testing-client/src/test/java/org/aspectj/testing/TesterTest.java
diff --git a/testing-client/testsrc/org/aspectj/testing/TestingClientModuleTests.java b/testing-client/src/test/java/org/aspectj/testing/TestingClientModuleTests.java
similarity index 100%
rename from testing-client/testsrc/org/aspectj/testing/TestingClientModuleTests.java
rename to testing-client/src/test/java/org/aspectj/testing/TestingClientModuleTests.java
diff --git a/testing-client/testsrc/org/aspectj/testing/TestingTests.java b/testing-client/src/test/java/org/aspectj/testing/TestingTests.java
similarity index 100%
rename from testing-client/testsrc/org/aspectj/testing/TestingTests.java
rename to testing-client/src/test/java/org/aspectj/testing/TestingTests.java
diff --git a/testing-client/testsrc/org/aspectj/testing/server/TestServerTest.java b/testing-client/src/test/java/org/aspectj/testing/server/TestServerTest.java
similarity index 100%
rename from testing-client/testsrc/org/aspectj/testing/server/TestServerTest.java
rename to testing-client/src/test/java/org/aspectj/testing/server/TestServerTest.java
-- 
2.39.5