From 89739bc1ff28a18fadcb27dba7fd26d27ea7b343 Mon Sep 17 00:00:00 2001
From: Andy Clement <aclement@pivotal.io>
Date: Tue, 29 Jan 2019 17:07:22 -0800
Subject: [PATCH] mavenizing ajdoc - wip

---
 ajdoc/{.classpath => .classpath.2}            |  0
 ajdoc/.cvsignore                              |  3 --
 ajdoc/.isJava5                                |  1 -
 ajdoc/.project                                | 21 ----------
 ajdoc/.settings/org.eclipse.jdt.core.prefs    |  7 ----
 ajdoc/.settings/org.eclipse.jdt.ui.prefs      |  3 --
 ajdoc/build.xml                               |  7 ----
 ajdoc/pom.xml                                 | 39 +++++++++++++++++++
 .../aspectj/tools/ajdoc/CompilerWrapper.java  |  0
 .../java}/org/aspectj/tools/ajdoc/Config.java |  0
 .../org/aspectj/tools/ajdoc/DocException.java |  0
 .../aspectj/tools/ajdoc/HtmlDecorator.java    |  0
 .../aspectj/tools/ajdoc/JavadocRunner.java    |  0
 .../java}/org/aspectj/tools/ajdoc/Main.java   |  0
 .../aspectj/tools/ajdoc/StructureUtil.java    |  0
 .../tools/ajdoc/StubFileGenerator.java        |  0
 .../java}/org/aspectj/tools/ajdoc/Util.java   |  0
 .../aspectj/tools/ajdoc/AjdocModuleTests.java |  0
 .../tools/ajdoc/AjdocOutputChecker.java       |  0
 .../aspectj/tools/ajdoc/AjdocTestCase.java    |  0
 .../org/aspectj/tools/ajdoc/AjdocTests.java   |  0
 .../org/aspectj/tools/ajdoc/BugTests.java     |  0
 .../aspectj/tools/ajdoc/CoverageTestCase.java |  0
 .../aspectj/tools/ajdoc/DeclareFormsTest.java |  0
 .../org/aspectj/tools/ajdoc/EnumTest.java     |  0
 .../tools/ajdoc/ExecutionTestCase.java        |  0
 .../ajdoc/FullyQualifiedArgumentTest.java     |  0
 .../org/aspectj/tools/ajdoc/ITDTest.java      |  0
 .../aspectj/tools/ajdoc/JDKVersionTest.java   |  0
 .../aspectj/tools/ajdoc/PatternsTestCase.java |  0
 .../tools/ajdoc/PointcutVisibilityTest.java   |  0
 .../aspectj/tools/ajdoc/SpacewarTestCase.java |  0
 32 files changed, 39 insertions(+), 42 deletions(-)
 rename ajdoc/{.classpath => .classpath.2} (100%)
 delete mode 100644 ajdoc/.cvsignore
 delete mode 100644 ajdoc/.isJava5
 delete mode 100644 ajdoc/.project
 delete mode 100644 ajdoc/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 ajdoc/.settings/org.eclipse.jdt.ui.prefs
 delete mode 100644 ajdoc/build.xml
 create mode 100644 ajdoc/pom.xml
 rename ajdoc/src/{ => main/java}/org/aspectj/tools/ajdoc/CompilerWrapper.java (100%)
 rename ajdoc/src/{ => main/java}/org/aspectj/tools/ajdoc/Config.java (100%)
 rename ajdoc/src/{ => main/java}/org/aspectj/tools/ajdoc/DocException.java (100%)
 rename ajdoc/src/{ => main/java}/org/aspectj/tools/ajdoc/HtmlDecorator.java (100%)
 rename ajdoc/src/{ => main/java}/org/aspectj/tools/ajdoc/JavadocRunner.java (100%)
 rename ajdoc/src/{ => main/java}/org/aspectj/tools/ajdoc/Main.java (100%)
 rename ajdoc/src/{ => main/java}/org/aspectj/tools/ajdoc/StructureUtil.java (100%)
 rename ajdoc/src/{ => main/java}/org/aspectj/tools/ajdoc/StubFileGenerator.java (100%)
 rename ajdoc/src/{ => main/java}/org/aspectj/tools/ajdoc/Util.java (100%)
 rename ajdoc/{testsrc => src/test/java}/org/aspectj/tools/ajdoc/AjdocModuleTests.java (100%)
 rename ajdoc/{testsrc => src/test/java}/org/aspectj/tools/ajdoc/AjdocOutputChecker.java (100%)
 rename ajdoc/{testsrc => src/test/java}/org/aspectj/tools/ajdoc/AjdocTestCase.java (100%)
 rename ajdoc/{testsrc => src/test/java}/org/aspectj/tools/ajdoc/AjdocTests.java (100%)
 rename ajdoc/{testsrc => src/test/java}/org/aspectj/tools/ajdoc/BugTests.java (100%)
 rename ajdoc/{testsrc => src/test/java}/org/aspectj/tools/ajdoc/CoverageTestCase.java (100%)
 rename ajdoc/{testsrc => src/test/java}/org/aspectj/tools/ajdoc/DeclareFormsTest.java (100%)
 rename ajdoc/{testsrc => src/test/java}/org/aspectj/tools/ajdoc/EnumTest.java (100%)
 rename ajdoc/{testsrc => src/test/java}/org/aspectj/tools/ajdoc/ExecutionTestCase.java (100%)
 rename ajdoc/{testsrc => src/test/java}/org/aspectj/tools/ajdoc/FullyQualifiedArgumentTest.java (100%)
 rename ajdoc/{testsrc => src/test/java}/org/aspectj/tools/ajdoc/ITDTest.java (100%)
 rename ajdoc/{testsrc => src/test/java}/org/aspectj/tools/ajdoc/JDKVersionTest.java (100%)
 rename ajdoc/{testsrc => src/test/java}/org/aspectj/tools/ajdoc/PatternsTestCase.java (100%)
 rename ajdoc/{testsrc => src/test/java}/org/aspectj/tools/ajdoc/PointcutVisibilityTest.java (100%)
 rename ajdoc/{testsrc => src/test/java}/org/aspectj/tools/ajdoc/SpacewarTestCase.java (100%)

diff --git a/ajdoc/.classpath b/ajdoc/.classpath.2
similarity index 100%
rename from ajdoc/.classpath
rename to ajdoc/.classpath.2
diff --git a/ajdoc/.cvsignore b/ajdoc/.cvsignore
deleted file mode 100644
index ec5db3da3..000000000
--- a/ajdoc/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-ajdocworkingdir 
-bin
-bintest
diff --git a/ajdoc/.isJava5 b/ajdoc/.isJava5
deleted file mode 100644
index 136d06384..000000000
--- a/ajdoc/.isJava5
+++ /dev/null
@@ -1 +0,0 @@
-  
\ No newline at end of file
diff --git a/ajdoc/.project b/ajdoc/.project
deleted file mode 100644
index 96913d3eb..000000000
--- a/ajdoc/.project
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>ajdoc</name>
-	<comment></comment>
-	<projects>
-		<project>asm</project>
-		<project>bridge</project>
-		<project>org.aspectj.ajdt.core</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/ajdoc/.settings/org.eclipse.jdt.core.prefs b/ajdoc/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de363a..000000000
--- a/ajdoc/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/ajdoc/.settings/org.eclipse.jdt.ui.prefs b/ajdoc/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index abe3c5796..000000000
--- a/ajdoc/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Oct 06 08:06:04 PDT 2005
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/ajdoc/build.xml b/ajdoc/build.xml
deleted file mode 100644
index 41b67ecc0..000000000
--- a/ajdoc/build.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<!-- see ../build/*.html for explanation -->
-<project name="ajdoc" default="test" basedir=".">
-    <import file="${basedir}/../build/build.xml"/>  
-</project>
-
-  
\ No newline at end of file
diff --git a/ajdoc/pom.xml b/ajdoc/pom.xml
new file mode 100644
index 000000000..558d1d1c2
--- /dev/null
+++ b/ajdoc/pom.xml
@@ -0,0 +1,39 @@
+<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>ajdoc</artifactId>
+  <packaging>jar</packaging>
+  <name>ajdoc</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>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>asm</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>org.aspectj.ajdt.core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/ajdoc/src/org/aspectj/tools/ajdoc/CompilerWrapper.java b/ajdoc/src/main/java/org/aspectj/tools/ajdoc/CompilerWrapper.java
similarity index 100%
rename from ajdoc/src/org/aspectj/tools/ajdoc/CompilerWrapper.java
rename to ajdoc/src/main/java/org/aspectj/tools/ajdoc/CompilerWrapper.java
diff --git a/ajdoc/src/org/aspectj/tools/ajdoc/Config.java b/ajdoc/src/main/java/org/aspectj/tools/ajdoc/Config.java
similarity index 100%
rename from ajdoc/src/org/aspectj/tools/ajdoc/Config.java
rename to ajdoc/src/main/java/org/aspectj/tools/ajdoc/Config.java
diff --git a/ajdoc/src/org/aspectj/tools/ajdoc/DocException.java b/ajdoc/src/main/java/org/aspectj/tools/ajdoc/DocException.java
similarity index 100%
rename from ajdoc/src/org/aspectj/tools/ajdoc/DocException.java
rename to ajdoc/src/main/java/org/aspectj/tools/ajdoc/DocException.java
diff --git a/ajdoc/src/org/aspectj/tools/ajdoc/HtmlDecorator.java b/ajdoc/src/main/java/org/aspectj/tools/ajdoc/HtmlDecorator.java
similarity index 100%
rename from ajdoc/src/org/aspectj/tools/ajdoc/HtmlDecorator.java
rename to ajdoc/src/main/java/org/aspectj/tools/ajdoc/HtmlDecorator.java
diff --git a/ajdoc/src/org/aspectj/tools/ajdoc/JavadocRunner.java b/ajdoc/src/main/java/org/aspectj/tools/ajdoc/JavadocRunner.java
similarity index 100%
rename from ajdoc/src/org/aspectj/tools/ajdoc/JavadocRunner.java
rename to ajdoc/src/main/java/org/aspectj/tools/ajdoc/JavadocRunner.java
diff --git a/ajdoc/src/org/aspectj/tools/ajdoc/Main.java b/ajdoc/src/main/java/org/aspectj/tools/ajdoc/Main.java
similarity index 100%
rename from ajdoc/src/org/aspectj/tools/ajdoc/Main.java
rename to ajdoc/src/main/java/org/aspectj/tools/ajdoc/Main.java
diff --git a/ajdoc/src/org/aspectj/tools/ajdoc/StructureUtil.java b/ajdoc/src/main/java/org/aspectj/tools/ajdoc/StructureUtil.java
similarity index 100%
rename from ajdoc/src/org/aspectj/tools/ajdoc/StructureUtil.java
rename to ajdoc/src/main/java/org/aspectj/tools/ajdoc/StructureUtil.java
diff --git a/ajdoc/src/org/aspectj/tools/ajdoc/StubFileGenerator.java b/ajdoc/src/main/java/org/aspectj/tools/ajdoc/StubFileGenerator.java
similarity index 100%
rename from ajdoc/src/org/aspectj/tools/ajdoc/StubFileGenerator.java
rename to ajdoc/src/main/java/org/aspectj/tools/ajdoc/StubFileGenerator.java
diff --git a/ajdoc/src/org/aspectj/tools/ajdoc/Util.java b/ajdoc/src/main/java/org/aspectj/tools/ajdoc/Util.java
similarity index 100%
rename from ajdoc/src/org/aspectj/tools/ajdoc/Util.java
rename to ajdoc/src/main/java/org/aspectj/tools/ajdoc/Util.java
diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/AjdocModuleTests.java b/ajdoc/src/test/java/org/aspectj/tools/ajdoc/AjdocModuleTests.java
similarity index 100%
rename from ajdoc/testsrc/org/aspectj/tools/ajdoc/AjdocModuleTests.java
rename to ajdoc/src/test/java/org/aspectj/tools/ajdoc/AjdocModuleTests.java
diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/AjdocOutputChecker.java b/ajdoc/src/test/java/org/aspectj/tools/ajdoc/AjdocOutputChecker.java
similarity index 100%
rename from ajdoc/testsrc/org/aspectj/tools/ajdoc/AjdocOutputChecker.java
rename to ajdoc/src/test/java/org/aspectj/tools/ajdoc/AjdocOutputChecker.java
diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/AjdocTestCase.java b/ajdoc/src/test/java/org/aspectj/tools/ajdoc/AjdocTestCase.java
similarity index 100%
rename from ajdoc/testsrc/org/aspectj/tools/ajdoc/AjdocTestCase.java
rename to ajdoc/src/test/java/org/aspectj/tools/ajdoc/AjdocTestCase.java
diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/AjdocTests.java b/ajdoc/src/test/java/org/aspectj/tools/ajdoc/AjdocTests.java
similarity index 100%
rename from ajdoc/testsrc/org/aspectj/tools/ajdoc/AjdocTests.java
rename to ajdoc/src/test/java/org/aspectj/tools/ajdoc/AjdocTests.java
diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/BugTests.java b/ajdoc/src/test/java/org/aspectj/tools/ajdoc/BugTests.java
similarity index 100%
rename from ajdoc/testsrc/org/aspectj/tools/ajdoc/BugTests.java
rename to ajdoc/src/test/java/org/aspectj/tools/ajdoc/BugTests.java
diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java b/ajdoc/src/test/java/org/aspectj/tools/ajdoc/CoverageTestCase.java
similarity index 100%
rename from ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java
rename to ajdoc/src/test/java/org/aspectj/tools/ajdoc/CoverageTestCase.java
diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/DeclareFormsTest.java b/ajdoc/src/test/java/org/aspectj/tools/ajdoc/DeclareFormsTest.java
similarity index 100%
rename from ajdoc/testsrc/org/aspectj/tools/ajdoc/DeclareFormsTest.java
rename to ajdoc/src/test/java/org/aspectj/tools/ajdoc/DeclareFormsTest.java
diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/EnumTest.java b/ajdoc/src/test/java/org/aspectj/tools/ajdoc/EnumTest.java
similarity index 100%
rename from ajdoc/testsrc/org/aspectj/tools/ajdoc/EnumTest.java
rename to ajdoc/src/test/java/org/aspectj/tools/ajdoc/EnumTest.java
diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/ExecutionTestCase.java b/ajdoc/src/test/java/org/aspectj/tools/ajdoc/ExecutionTestCase.java
similarity index 100%
rename from ajdoc/testsrc/org/aspectj/tools/ajdoc/ExecutionTestCase.java
rename to ajdoc/src/test/java/org/aspectj/tools/ajdoc/ExecutionTestCase.java
diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/FullyQualifiedArgumentTest.java b/ajdoc/src/test/java/org/aspectj/tools/ajdoc/FullyQualifiedArgumentTest.java
similarity index 100%
rename from ajdoc/testsrc/org/aspectj/tools/ajdoc/FullyQualifiedArgumentTest.java
rename to ajdoc/src/test/java/org/aspectj/tools/ajdoc/FullyQualifiedArgumentTest.java
diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/ITDTest.java b/ajdoc/src/test/java/org/aspectj/tools/ajdoc/ITDTest.java
similarity index 100%
rename from ajdoc/testsrc/org/aspectj/tools/ajdoc/ITDTest.java
rename to ajdoc/src/test/java/org/aspectj/tools/ajdoc/ITDTest.java
diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/JDKVersionTest.java b/ajdoc/src/test/java/org/aspectj/tools/ajdoc/JDKVersionTest.java
similarity index 100%
rename from ajdoc/testsrc/org/aspectj/tools/ajdoc/JDKVersionTest.java
rename to ajdoc/src/test/java/org/aspectj/tools/ajdoc/JDKVersionTest.java
diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/PatternsTestCase.java b/ajdoc/src/test/java/org/aspectj/tools/ajdoc/PatternsTestCase.java
similarity index 100%
rename from ajdoc/testsrc/org/aspectj/tools/ajdoc/PatternsTestCase.java
rename to ajdoc/src/test/java/org/aspectj/tools/ajdoc/PatternsTestCase.java
diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/PointcutVisibilityTest.java b/ajdoc/src/test/java/org/aspectj/tools/ajdoc/PointcutVisibilityTest.java
similarity index 100%
rename from ajdoc/testsrc/org/aspectj/tools/ajdoc/PointcutVisibilityTest.java
rename to ajdoc/src/test/java/org/aspectj/tools/ajdoc/PointcutVisibilityTest.java
diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/SpacewarTestCase.java b/ajdoc/src/test/java/org/aspectj/tools/ajdoc/SpacewarTestCase.java
similarity index 100%
rename from ajdoc/testsrc/org/aspectj/tools/ajdoc/SpacewarTestCase.java
rename to ajdoc/src/test/java/org/aspectj/tools/ajdoc/SpacewarTestCase.java
-- 
2.39.5