From d9cd0d44e8c42f06e13b033ae1cc269d3e7f7c29 Mon Sep 17 00:00:00 2001
From: Andy Clement <aclement@pivotal.io>
Date: Wed, 23 Jan 2019 19:36:37 -0800
Subject: [PATCH] mavenizing asm module - wip

---
 asm/.classpath                                | 10 -------
 asm/.cvsignore                                |  2 --
 asm/.isJava5                                  |  1 -
 asm/.project                                  | 18 -----------
 asm/build.xml                                 |  6 ----
 asm/pom.xml                                   | 30 +++++++++++++++++++
 .../java}/org/aspectj/asm/AsmManager.java     |  0
 .../org/aspectj/asm/HierarchyWalker.java      |  0
 .../aspectj/asm/IElementHandleProvider.java   |  0
 .../java}/org/aspectj/asm/IHierarchy.java     |  0
 .../org/aspectj/asm/IHierarchyListener.java   |  0
 .../java}/org/aspectj/asm/IModelFilter.java   |  0
 .../org/aspectj/asm/IProgramElement.java      |  0
 .../java}/org/aspectj/asm/IRelationship.java  |  0
 .../org/aspectj/asm/IRelationshipMap.java     |  0
 .../asm/internal/AspectJElementHierarchy.java |  0
 .../aspectj/asm/internal/CharOperation.java   |  0
 .../asm/internal/HandleProviderDelimiter.java |  0
 .../asm/internal/JDTLikeHandleProvider.java   |  0
 .../aspectj/asm/internal/NameConvertor.java   |  0
 .../aspectj/asm/internal/ProgramElement.java  |  0
 .../aspectj/asm/internal/Relationship.java    |  0
 .../aspectj/asm/internal/RelationshipMap.java |  0
 .../java}/org/aspectj/asm/AsmModuleTests.java |  0
 .../org/aspectj/asm/NameConvertorTest.java    |  0
 25 files changed, 30 insertions(+), 37 deletions(-)
 delete mode 100644 asm/.classpath
 delete mode 100644 asm/.cvsignore
 delete mode 100644 asm/.isJava5
 delete mode 100644 asm/.project
 delete mode 100644 asm/build.xml
 create mode 100644 asm/pom.xml
 rename asm/src/{ => main/java}/org/aspectj/asm/AsmManager.java (100%)
 rename asm/src/{ => main/java}/org/aspectj/asm/HierarchyWalker.java (100%)
 rename asm/src/{ => main/java}/org/aspectj/asm/IElementHandleProvider.java (100%)
 rename asm/src/{ => main/java}/org/aspectj/asm/IHierarchy.java (100%)
 rename asm/src/{ => main/java}/org/aspectj/asm/IHierarchyListener.java (100%)
 rename asm/src/{ => main/java}/org/aspectj/asm/IModelFilter.java (100%)
 rename asm/src/{ => main/java}/org/aspectj/asm/IProgramElement.java (100%)
 rename asm/src/{ => main/java}/org/aspectj/asm/IRelationship.java (100%)
 rename asm/src/{ => main/java}/org/aspectj/asm/IRelationshipMap.java (100%)
 rename asm/src/{ => main/java}/org/aspectj/asm/internal/AspectJElementHierarchy.java (100%)
 rename asm/src/{ => main/java}/org/aspectj/asm/internal/CharOperation.java (100%)
 rename asm/src/{ => main/java}/org/aspectj/asm/internal/HandleProviderDelimiter.java (100%)
 rename asm/src/{ => main/java}/org/aspectj/asm/internal/JDTLikeHandleProvider.java (100%)
 rename asm/src/{ => main/java}/org/aspectj/asm/internal/NameConvertor.java (100%)
 rename asm/src/{ => main/java}/org/aspectj/asm/internal/ProgramElement.java (100%)
 rename asm/src/{ => main/java}/org/aspectj/asm/internal/Relationship.java (100%)
 rename asm/src/{ => main/java}/org/aspectj/asm/internal/RelationshipMap.java (100%)
 rename asm/{testsrc => src/test/java}/org/aspectj/asm/AsmModuleTests.java (100%)
 rename asm/{testsrc => src/test/java}/org/aspectj/asm/NameConvertorTest.java (100%)

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
similarity index 100%
rename from asm/src/org/aspectj/asm/AsmManager.java
rename to 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
similarity index 100%
rename from asm/src/org/aspectj/asm/HierarchyWalker.java
rename to 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
similarity index 100%
rename from asm/src/org/aspectj/asm/IElementHandleProvider.java
rename to 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
similarity index 100%
rename from asm/src/org/aspectj/asm/IHierarchy.java
rename to 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
similarity index 100%
rename from asm/src/org/aspectj/asm/IHierarchyListener.java
rename to 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
similarity index 100%
rename from asm/src/org/aspectj/asm/IModelFilter.java
rename to 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
similarity index 100%
rename from asm/src/org/aspectj/asm/IProgramElement.java
rename to 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
similarity index 100%
rename from asm/src/org/aspectj/asm/IRelationship.java
rename to 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
similarity index 100%
rename from asm/src/org/aspectj/asm/IRelationshipMap.java
rename to 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
similarity index 100%
rename from asm/src/org/aspectj/asm/internal/AspectJElementHierarchy.java
rename to 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
similarity index 100%
rename from asm/src/org/aspectj/asm/internal/CharOperation.java
rename to 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
similarity index 100%
rename from asm/src/org/aspectj/asm/internal/HandleProviderDelimiter.java
rename to 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
similarity index 100%
rename from asm/src/org/aspectj/asm/internal/JDTLikeHandleProvider.java
rename to 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
similarity index 100%
rename from asm/src/org/aspectj/asm/internal/NameConvertor.java
rename to 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
similarity index 100%
rename from asm/src/org/aspectj/asm/internal/ProgramElement.java
rename to 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
similarity index 100%
rename from asm/src/org/aspectj/asm/internal/Relationship.java
rename to 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
similarity index 100%
rename from asm/src/org/aspectj/asm/internal/RelationshipMap.java
rename to 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
similarity index 100%
rename from asm/testsrc/org/aspectj/asm/AsmModuleTests.java
rename to 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
similarity index 100%
rename from asm/testsrc/org/aspectj/asm/NameConvertorTest.java
rename to asm/src/test/java/org/aspectj/asm/NameConvertorTest.java
-- 
2.39.5