mavenizing ajbrowser - wip

24 files changed, 71 insertions, 32 deletions

diff --git a/ajbrowser/.classpath b/ajbrowser/.classpath.2
index 00b22dcd6..00b22dcd6 100644
--- a/ajbrowser/.classpath
+++ b/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
index 84bb63683..84bb63683 100644
--- a/ajbrowser/src/org/aspectj/tools/ajbrowser/BrowserManager.java
+++ b/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
index 76c1b50e2..76c1b50e2 100644
--- a/ajbrowser/src/org/aspectj/tools/ajbrowser/Main.java
+++ b/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
index aab3e3b3a..aab3e3b3a 100644
--- a/ajbrowser/src/org/aspectj/tools/ajbrowser/core/BrowserBuildProgressMonitor.java
+++ b/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
index 35f676e1b..35f676e1b 100644
--- a/ajbrowser/src/org/aspectj/tools/ajbrowser/core/BrowserCompilerConfiguration.java
+++ b/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
index 9d8e3857c..9d8e3857c 100644
--- a/ajbrowser/src/org/aspectj/tools/ajbrowser/core/BrowserErrorHandler.java
+++ b/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
index 1b754d2f1..1b754d2f1 100644
--- a/ajbrowser/src/org/aspectj/tools/ajbrowser/core/BrowserOutputLocationManager.java
+++ b/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
index 6ad9b448c..6ad9b448c 100644
--- a/ajbrowser/src/org/aspectj/tools/ajbrowser/core/PreferenceStoreConstants.java
+++ b/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
index 7830f8b19..7830f8b19 100644
--- a/ajbrowser/src/org/aspectj/tools/ajbrowser/ui/BasicEditor.java
+++ b/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
index b8dcf1c41..b8dcf1c41 100644
--- a/ajbrowser/src/org/aspectj/tools/ajbrowser/ui/BrowserMessageHandler.java
+++ b/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
index a00c51d0d..a00c51d0d 100644
--- a/ajbrowser/src/org/aspectj/tools/ajbrowser/ui/BrowserRuntimeProperties.java
+++ b/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
index 2388c3390..2388c3390 100644
--- a/ajbrowser/src/org/aspectj/tools/ajbrowser/ui/BrowserUIAdapter.java
+++ b/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
index 12a7f8938..12a7f8938 100644
--- a/ajbrowser/src/org/aspectj/tools/ajbrowser/ui/EditorManager.java
+++ b/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
index e01c01f12..e01c01f12 100644
--- a/ajbrowser/src/org/aspectj/tools/ajbrowser/ui/swing/BrowserOptionsPanel.java
+++ b/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
index 32224832c..32224832c 100644
--- a/ajbrowser/src/org/aspectj/tools/ajbrowser/ui/swing/MessageHandlerPanel.java
+++ b/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
index 5949e2e07..5949e2e07 100644
--- a/ajbrowser/src/org/aspectj/tools/ajbrowser/ui/swing/TopFrame.java
+++ b/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
index d0d87f133..d0d87f133 100644
--- a/ajbrowser/testsrc/org/aspectj/tools/ajbrowser/AjbrowserModuleTests.java
+++ b/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
index dab5e791a..dab5e791a 100644
--- a/ajbrowser/testsrc/org/aspectj/tools/ajbrowser/AjbrowserTests.java
+++ b/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
index b993713ca..b993713ca 100644
--- a/ajbrowser/testsrc/org/aspectj/tools/ajbrowser/JemmyDriver.java
+++ b/ajbrowser/src/test/java/org/aspectj/tools/ajbrowser/JemmyDriver.java