mavenizing asm module - wip

25 files changed, 30 insertions, 37 deletions

diff --git a/asm/.classpath b/asm/.classpath
deleted file mode 100644
index eefd66c2d..000000000
--- a/asm/.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="lib" path="/lib/junit/junit.jar" sourcepath="/lib/junit/junit-src.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/util"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/asm/.cvsignore b/asm/.cvsignore
deleted file mode 100644
index 38972d828..000000000
--- a/asm/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-bintest
diff --git a/asm/.isJava5 b/asm/.isJava5
deleted file mode 100644
index 136d06384..000000000
--- a/asm/.isJava5
+++ /dev/null
@@ -1 +0,0 @@
-  
\ No newline at end of file
diff --git a/asm/.project b/asm/.project
deleted file mode 100644
index 93d2ed706..000000000
--- a/asm/.project
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>asm</name>
-	<comment></comment>
-	<projects>
-		<project>bridge</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/asm/build.xml b/asm/build.xml
deleted file mode 100644
index d6a9c197c..000000000
--- a/asm/build.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<!-- see ../build/*.html for explanation -->
-<project name="asm" default="test" basedir=".">
-    <import file="${basedir}/../build/build.xml"/>  
-</project>
-
diff --git a/asm/pom.xml b/asm/pom.xml
new file mode 100644
index 000000000..f1068ad97
--- /dev/null
+++ b/asm/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>asm</artifactId>
+  <packaging>jar</packaging>
+  <name>asm</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/asm/src/org/aspectj/asm/AsmManager.java b/asm/src/main/java/org/aspectj/asm/AsmManager.java
index 2ab34c862..2ab34c862 100644
--- a/asm/src/org/aspectj/asm/AsmManager.java
+++ b/asm/src/main/java/org/aspectj/asm/AsmManager.java
diff --git a/asm/src/org/aspectj/asm/HierarchyWalker.java b/asm/src/main/java/org/aspectj/asm/HierarchyWalker.java
index 7629f7c68..7629f7c68 100644
--- a/asm/src/org/aspectj/asm/HierarchyWalker.java
+++ b/asm/src/main/java/org/aspectj/asm/HierarchyWalker.java
diff --git a/asm/src/org/aspectj/asm/IElementHandleProvider.java b/asm/src/main/java/org/aspectj/asm/IElementHandleProvider.java
index c071f0337..c071f0337 100644
--- a/asm/src/org/aspectj/asm/IElementHandleProvider.java
+++ b/asm/src/main/java/org/aspectj/asm/IElementHandleProvider.java
diff --git a/asm/src/org/aspectj/asm/IHierarchy.java b/asm/src/main/java/org/aspectj/asm/IHierarchy.java
index 6674cdaea..6674cdaea 100644
--- a/asm/src/org/aspectj/asm/IHierarchy.java
+++ b/asm/src/main/java/org/aspectj/asm/IHierarchy.java
diff --git a/asm/src/org/aspectj/asm/IHierarchyListener.java b/asm/src/main/java/org/aspectj/asm/IHierarchyListener.java
index 12bf724da..12bf724da 100644
--- a/asm/src/org/aspectj/asm/IHierarchyListener.java
+++ b/asm/src/main/java/org/aspectj/asm/IHierarchyListener.java
diff --git a/asm/src/org/aspectj/asm/IModelFilter.java b/asm/src/main/java/org/aspectj/asm/IModelFilter.java
index cfae6e7b7..cfae6e7b7 100644
--- a/asm/src/org/aspectj/asm/IModelFilter.java
+++ b/asm/src/main/java/org/aspectj/asm/IModelFilter.java
diff --git a/asm/src/org/aspectj/asm/IProgramElement.java b/asm/src/main/java/org/aspectj/asm/IProgramElement.java
index 19e6d95ac..19e6d95ac 100644
--- a/asm/src/org/aspectj/asm/IProgramElement.java
+++ b/asm/src/main/java/org/aspectj/asm/IProgramElement.java
diff --git a/asm/src/org/aspectj/asm/IRelationship.java b/asm/src/main/java/org/aspectj/asm/IRelationship.java
index 86633cf36..86633cf36 100644
--- a/asm/src/org/aspectj/asm/IRelationship.java
+++ b/asm/src/main/java/org/aspectj/asm/IRelationship.java
diff --git a/asm/src/org/aspectj/asm/IRelationshipMap.java b/asm/src/main/java/org/aspectj/asm/IRelationshipMap.java
index e4159dce8..e4159dce8 100644
--- a/asm/src/org/aspectj/asm/IRelationshipMap.java
+++ b/asm/src/main/java/org/aspectj/asm/IRelationshipMap.java
diff --git a/asm/src/org/aspectj/asm/internal/AspectJElementHierarchy.java b/asm/src/main/java/org/aspectj/asm/internal/AspectJElementHierarchy.java
index 6019964c6..6019964c6 100644
--- a/asm/src/org/aspectj/asm/internal/AspectJElementHierarchy.java
+++ b/asm/src/main/java/org/aspectj/asm/internal/AspectJElementHierarchy.java
diff --git a/asm/src/org/aspectj/asm/internal/CharOperation.java b/asm/src/main/java/org/aspectj/asm/internal/CharOperation.java
index bf5330a11..bf5330a11 100644
--- a/asm/src/org/aspectj/asm/internal/CharOperation.java
+++ b/asm/src/main/java/org/aspectj/asm/internal/CharOperation.java
diff --git a/asm/src/org/aspectj/asm/internal/HandleProviderDelimiter.java b/asm/src/main/java/org/aspectj/asm/internal/HandleProviderDelimiter.java
index 9bbfc307c..9bbfc307c 100644
--- a/asm/src/org/aspectj/asm/internal/HandleProviderDelimiter.java
+++ b/asm/src/main/java/org/aspectj/asm/internal/HandleProviderDelimiter.java
diff --git a/asm/src/org/aspectj/asm/internal/JDTLikeHandleProvider.java b/asm/src/main/java/org/aspectj/asm/internal/JDTLikeHandleProvider.java
index 3751dfc1b..3751dfc1b 100644
--- a/asm/src/org/aspectj/asm/internal/JDTLikeHandleProvider.java
+++ b/asm/src/main/java/org/aspectj/asm/internal/JDTLikeHandleProvider.java
diff --git a/asm/src/org/aspectj/asm/internal/NameConvertor.java b/asm/src/main/java/org/aspectj/asm/internal/NameConvertor.java
index 340d41586..340d41586 100644
--- a/asm/src/org/aspectj/asm/internal/NameConvertor.java
+++ b/asm/src/main/java/org/aspectj/asm/internal/NameConvertor.java
diff --git a/asm/src/org/aspectj/asm/internal/ProgramElement.java b/asm/src/main/java/org/aspectj/asm/internal/ProgramElement.java
index 51aafd936..51aafd936 100644
--- a/asm/src/org/aspectj/asm/internal/ProgramElement.java
+++ b/asm/src/main/java/org/aspectj/asm/internal/ProgramElement.java
diff --git a/asm/src/org/aspectj/asm/internal/Relationship.java b/asm/src/main/java/org/aspectj/asm/internal/Relationship.java
index 8bd4a7e66..8bd4a7e66 100644
--- a/asm/src/org/aspectj/asm/internal/Relationship.java
+++ b/asm/src/main/java/org/aspectj/asm/internal/Relationship.java
diff --git a/asm/src/org/aspectj/asm/internal/RelationshipMap.java b/asm/src/main/java/org/aspectj/asm/internal/RelationshipMap.java
index 1fea7bb85..1fea7bb85 100644
--- a/asm/src/org/aspectj/asm/internal/RelationshipMap.java
+++ b/asm/src/main/java/org/aspectj/asm/internal/RelationshipMap.java
diff --git a/asm/testsrc/org/aspectj/asm/AsmModuleTests.java b/asm/src/test/java/org/aspectj/asm/AsmModuleTests.java
index ebb500911..ebb500911 100644
--- a/asm/testsrc/org/aspectj/asm/AsmModuleTests.java
+++ b/asm/src/test/java/org/aspectj/asm/AsmModuleTests.java
diff --git a/asm/testsrc/org/aspectj/asm/NameConvertorTest.java b/asm/src/test/java/org/aspectj/asm/NameConvertorTest.java
index 22ac3fb79..22ac3fb79 100644
--- a/asm/testsrc/org/aspectj/asm/NameConvertorTest.java
+++ b/asm/src/test/java/org/aspectj/asm/NameConvertorTest.java