From 2ea72e189303b144ac28fd665c667da984a56a0e Mon Sep 17 00:00:00 2001
From: Andy Clement <aclement@pivotal.io>
Date: Wed, 30 Jan 2019 11:51:42 -0800
Subject: [PATCH] mavenizing ajbrowser - wip

---
 ajbrowser/{.classpath => .classpath.2}        |  0
 ajbrowser/.cvsignore                          |  2 -
 ajbrowser/.isJava5                            |  1 -
 ajbrowser/.project                            | 23 ------
 ajbrowser/build.xml                           |  6 --
 ajbrowser/pom.xml                             | 71 +++++++++++++++++++
 .../tools/ajbrowser/BrowserManager.java       |  0
 .../org/aspectj/tools/ajbrowser/Main.java     |  0
 .../core/BrowserBuildProgressMonitor.java     |  0
 .../core/BrowserCompilerConfiguration.java    |  0
 .../ajbrowser/core/BrowserErrorHandler.java   |  0
 .../core/BrowserOutputLocationManager.java    |  0
 .../core/PreferenceStoreConstants.java        |  0
 .../tools/ajbrowser/ui/BasicEditor.java       |  0
 .../ajbrowser/ui/BrowserMessageHandler.java   |  0
 .../ui/BrowserRuntimeProperties.java          |  0
 .../tools/ajbrowser/ui/BrowserUIAdapter.java  |  0
 .../tools/ajbrowser/ui/EditorManager.java     |  0
 .../ui/swing/BrowserOptionsPanel.java         |  0
 .../ui/swing/MessageHandlerPanel.java         |  0
 .../tools/ajbrowser/ui/swing/TopFrame.java    |  0
 .../tools/ajbrowser/AjbrowserModuleTests.java |  0
 .../tools/ajbrowser/AjbrowserTests.java       |  0
 .../aspectj/tools/ajbrowser/JemmyDriver.java  |  0
 24 files changed, 71 insertions(+), 32 deletions(-)
 rename ajbrowser/{.classpath => .classpath.2} (100%)
 delete mode 100644 ajbrowser/.cvsignore
 delete mode 100644 ajbrowser/.isJava5
 delete mode 100644 ajbrowser/.project
 delete mode 100644 ajbrowser/build.xml
 create mode 100644 ajbrowser/pom.xml
 rename ajbrowser/src/{ => main/java}/org/aspectj/tools/ajbrowser/BrowserManager.java (100%)
 rename ajbrowser/src/{ => main/java}/org/aspectj/tools/ajbrowser/Main.java (100%)
 rename ajbrowser/src/{ => main/java}/org/aspectj/tools/ajbrowser/core/BrowserBuildProgressMonitor.java (100%)
 rename ajbrowser/src/{ => main/java}/org/aspectj/tools/ajbrowser/core/BrowserCompilerConfiguration.java (100%)
 rename ajbrowser/src/{ => main/java}/org/aspectj/tools/ajbrowser/core/BrowserErrorHandler.java (100%)
 rename ajbrowser/src/{ => main/java}/org/aspectj/tools/ajbrowser/core/BrowserOutputLocationManager.java (100%)
 rename ajbrowser/src/{ => main/java}/org/aspectj/tools/ajbrowser/core/PreferenceStoreConstants.java (100%)
 rename ajbrowser/src/{ => main/java}/org/aspectj/tools/ajbrowser/ui/BasicEditor.java (100%)
 rename ajbrowser/src/{ => main/java}/org/aspectj/tools/ajbrowser/ui/BrowserMessageHandler.java (100%)
 rename ajbrowser/src/{ => main/java}/org/aspectj/tools/ajbrowser/ui/BrowserRuntimeProperties.java (100%)
 rename ajbrowser/src/{ => main/java}/org/aspectj/tools/ajbrowser/ui/BrowserUIAdapter.java (100%)
 rename ajbrowser/src/{ => main/java}/org/aspectj/tools/ajbrowser/ui/EditorManager.java (100%)
 rename ajbrowser/src/{ => main/java}/org/aspectj/tools/ajbrowser/ui/swing/BrowserOptionsPanel.java (100%)
 rename ajbrowser/src/{ => main/java}/org/aspectj/tools/ajbrowser/ui/swing/MessageHandlerPanel.java (100%)
 rename ajbrowser/src/{ => main/java}/org/aspectj/tools/ajbrowser/ui/swing/TopFrame.java (100%)
 rename ajbrowser/{testsrc => src/test/java}/org/aspectj/tools/ajbrowser/AjbrowserModuleTests.java (100%)
 rename ajbrowser/{testsrc => src/test/java}/org/aspectj/tools/ajbrowser/AjbrowserTests.java (100%)
 rename ajbrowser/{testsrc => src/test/java}/org/aspectj/tools/ajbrowser/JemmyDriver.java (100%)

diff --git a/ajbrowser/.classpath b/ajbrowser/.classpath.2
similarity index 100%
rename from ajbrowser/.classpath
rename to ajbrowser/.classpath.2
diff --git a/ajbrowser/.cvsignore b/ajbrowser/.cvsignore
deleted file mode 100644
index 38972d828..000000000
--- a/ajbrowser/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-bintest
diff --git a/ajbrowser/.isJava5 b/ajbrowser/.isJava5
deleted file mode 100644
index 136d06384..000000000
--- a/ajbrowser/.isJava5
+++ /dev/null
@@ -1 +0,0 @@
-  
\ No newline at end of file
diff --git a/ajbrowser/.project b/ajbrowser/.project
deleted file mode 100644
index aa06c29e7..000000000
--- a/ajbrowser/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>ajbrowser</name>
-	<comment></comment>
-	<projects>
-		<project>ajde</project>
-		<project>ajdoc</project>
-		<project>asm</project>
-		<project>bridge</project>
-		<project>taskdefs</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/ajbrowser/build.xml b/ajbrowser/build.xml
deleted file mode 100644
index d3d83c984..000000000
--- a/ajbrowser/build.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<!-- see ../build/*.html for explanation -->
-<project name="ajbrowser" default="test" basedir=".">
-    <import file="${basedir}/../build/build.xml"/>  
-</project> 
-
diff --git a/ajbrowser/pom.xml b/ajbrowser/pom.xml
new file mode 100644
index 000000000..5d273dba8
--- /dev/null
+++ b/ajbrowser/pom.xml
@@ -0,0 +1,71 @@
+<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>ajbrowser</artifactId>
+  <packaging>jar</packaging>
+  <name>ajbrowser</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>ajde</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>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>taskdefs</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>ajdoc</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>loadtime</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>ajde.core</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.ajdt.core</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/ajbrowser/src/org/aspectj/tools/ajbrowser/BrowserManager.java b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/BrowserManager.java
similarity index 100%
rename from ajbrowser/src/org/aspectj/tools/ajbrowser/BrowserManager.java
rename to ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/BrowserManager.java
diff --git a/ajbrowser/src/org/aspectj/tools/ajbrowser/Main.java b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/Main.java
similarity index 100%
rename from ajbrowser/src/org/aspectj/tools/ajbrowser/Main.java
rename to ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/Main.java
diff --git a/ajbrowser/src/org/aspectj/tools/ajbrowser/core/BrowserBuildProgressMonitor.java b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/BrowserBuildProgressMonitor.java
similarity index 100%
rename from ajbrowser/src/org/aspectj/tools/ajbrowser/core/BrowserBuildProgressMonitor.java
rename to ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/BrowserBuildProgressMonitor.java
diff --git a/ajbrowser/src/org/aspectj/tools/ajbrowser/core/BrowserCompilerConfiguration.java b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/BrowserCompilerConfiguration.java
similarity index 100%
rename from ajbrowser/src/org/aspectj/tools/ajbrowser/core/BrowserCompilerConfiguration.java
rename to ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/BrowserCompilerConfiguration.java
diff --git a/ajbrowser/src/org/aspectj/tools/ajbrowser/core/BrowserErrorHandler.java b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/BrowserErrorHandler.java
similarity index 100%
rename from ajbrowser/src/org/aspectj/tools/ajbrowser/core/BrowserErrorHandler.java
rename to ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/BrowserErrorHandler.java
diff --git a/ajbrowser/src/org/aspectj/tools/ajbrowser/core/BrowserOutputLocationManager.java b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/BrowserOutputLocationManager.java
similarity index 100%
rename from ajbrowser/src/org/aspectj/tools/ajbrowser/core/BrowserOutputLocationManager.java
rename to ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/BrowserOutputLocationManager.java
diff --git a/ajbrowser/src/org/aspectj/tools/ajbrowser/core/PreferenceStoreConstants.java b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/PreferenceStoreConstants.java
similarity index 100%
rename from ajbrowser/src/org/aspectj/tools/ajbrowser/core/PreferenceStoreConstants.java
rename to ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/PreferenceStoreConstants.java
diff --git a/ajbrowser/src/org/aspectj/tools/ajbrowser/ui/BasicEditor.java b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/BasicEditor.java
similarity index 100%
rename from ajbrowser/src/org/aspectj/tools/ajbrowser/ui/BasicEditor.java
rename to ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/BasicEditor.java
diff --git a/ajbrowser/src/org/aspectj/tools/ajbrowser/ui/BrowserMessageHandler.java b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/BrowserMessageHandler.java
similarity index 100%
rename from ajbrowser/src/org/aspectj/tools/ajbrowser/ui/BrowserMessageHandler.java
rename to ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/BrowserMessageHandler.java
diff --git a/ajbrowser/src/org/aspectj/tools/ajbrowser/ui/BrowserRuntimeProperties.java b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/BrowserRuntimeProperties.java
similarity index 100%
rename from ajbrowser/src/org/aspectj/tools/ajbrowser/ui/BrowserRuntimeProperties.java
rename to ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/BrowserRuntimeProperties.java
diff --git a/ajbrowser/src/org/aspectj/tools/ajbrowser/ui/BrowserUIAdapter.java b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/BrowserUIAdapter.java
similarity index 100%
rename from ajbrowser/src/org/aspectj/tools/ajbrowser/ui/BrowserUIAdapter.java
rename to ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/BrowserUIAdapter.java
diff --git a/ajbrowser/src/org/aspectj/tools/ajbrowser/ui/EditorManager.java b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/EditorManager.java
similarity index 100%
rename from ajbrowser/src/org/aspectj/tools/ajbrowser/ui/EditorManager.java
rename to ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/EditorManager.java
diff --git a/ajbrowser/src/org/aspectj/tools/ajbrowser/ui/swing/BrowserOptionsPanel.java b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/swing/BrowserOptionsPanel.java
similarity index 100%
rename from ajbrowser/src/org/aspectj/tools/ajbrowser/ui/swing/BrowserOptionsPanel.java
rename to ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/swing/BrowserOptionsPanel.java
diff --git a/ajbrowser/src/org/aspectj/tools/ajbrowser/ui/swing/MessageHandlerPanel.java b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/swing/MessageHandlerPanel.java
similarity index 100%
rename from ajbrowser/src/org/aspectj/tools/ajbrowser/ui/swing/MessageHandlerPanel.java
rename to ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/swing/MessageHandlerPanel.java
diff --git a/ajbrowser/src/org/aspectj/tools/ajbrowser/ui/swing/TopFrame.java b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/swing/TopFrame.java
similarity index 100%
rename from ajbrowser/src/org/aspectj/tools/ajbrowser/ui/swing/TopFrame.java
rename to ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/swing/TopFrame.java
diff --git a/ajbrowser/testsrc/org/aspectj/tools/ajbrowser/AjbrowserModuleTests.java b/ajbrowser/src/test/java/org/aspectj/tools/ajbrowser/AjbrowserModuleTests.java
similarity index 100%
rename from ajbrowser/testsrc/org/aspectj/tools/ajbrowser/AjbrowserModuleTests.java
rename to ajbrowser/src/test/java/org/aspectj/tools/ajbrowser/AjbrowserModuleTests.java
diff --git a/ajbrowser/testsrc/org/aspectj/tools/ajbrowser/AjbrowserTests.java b/ajbrowser/src/test/java/org/aspectj/tools/ajbrowser/AjbrowserTests.java
similarity index 100%
rename from ajbrowser/testsrc/org/aspectj/tools/ajbrowser/AjbrowserTests.java
rename to ajbrowser/src/test/java/org/aspectj/tools/ajbrowser/AjbrowserTests.java
diff --git a/ajbrowser/testsrc/org/aspectj/tools/ajbrowser/JemmyDriver.java b/ajbrowser/src/test/java/org/aspectj/tools/ajbrowser/JemmyDriver.java
similarity index 100%
rename from ajbrowser/testsrc/org/aspectj/tools/ajbrowser/JemmyDriver.java
rename to ajbrowser/src/test/java/org/aspectj/tools/ajbrowser/JemmyDriver.java
-- 
2.39.5