mavenized util module

27 files changed, 125 insertions, 133 deletions

diff --git a/pom.xml b/pom.xml
new file mode 100644
index 000000000..35ca85e24
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.aspectj</groupId>
+    <artifactId>aspectj-parent</artifactId>
+    <packaging>pom</packaging>
+    <version>${revision}</version>
+    <name>AspectJ Parent Project</name>
+    
+    <properties>
+        <revision>1.9.3.BUILD-SNAPSHOT</revision>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <modules>
+	<module>util</module>
+        <module>bcel</module>
+    </modules>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <configuration>
+                        <source>1.8</source>
+                        <target>1.8</target>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <configuration>
+                        <testFailureIgnore>true</testFailureIgnore>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/util/.classpath b/util/.classpath
index f33c50284..f0257c5a5 100644
--- a/util/.classpath
+++ b/util/.classpath
@@ -1,8 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="testsrc"/>
-	<classpathentry kind="lib" path="/lib/junit/junit.jar" sourcepath="/lib/junit/junit-src.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="target/generated-sources/annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/util/.cvsignore b/util/.cvsignore
deleted file mode 100644
index dbb81434b..000000000
--- a/util/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-bin
-
-bintest
diff --git a/util/.isJava5 b/util/.isJava5
deleted file mode 100644
index 136d06384..000000000
--- a/util/.isJava5
+++ /dev/null
@@ -1 +0,0 @@
-  
\ No newline at end of file
diff --git a/util/.project b/util/.project
deleted file mode 100644
index ee97704dd..000000000
--- a/util/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>util</name>
-	<comment></comment>
-	<projects>
-	</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/util/.settings/org.eclipse.core.resources.prefs b/util/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 000000000..f9fe34593
--- /dev/null
+++ b/util/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/test/java=UTF-8
+encoding/<project>=UTF-8
diff --git a/util/.settings/org.eclipse.jdt.apt.core.prefs b/util/.settings/org.eclipse.jdt.apt.core.prefs
new file mode 100644
index 000000000..d4313d4b2
--- /dev/null
+++ b/util/.settings/org.eclipse.jdt.apt.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.apt.aptEnabled=false
diff --git a/util/.settings/org.eclipse.jdt.core.prefs b/util/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..5592a0a1c
--- /dev/null
+++ b/util/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.processAnnotations=disabled
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/util/build.xml b/util/build.xml
deleted file mode 100644
index 05bdade88..000000000
--- a/util/build.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<!-- see ../build/*.html for explanation -->
-<project name="util" default="test" basedir=".">
-    <import file="${basedir}/../build/build.xml"/>  
-</project>
-
diff --git a/util/pom.xml b/util/pom.xml
new file mode 100644
index 000000000..d53319f8f
--- /dev/null
+++ b/util/pom.xml
@@ -0,0 +1,17 @@
+<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>
+
+  <artifactId>util</artifactId>
+  <packaging>jar</packaging>
+  <name>util</name>
+
+  <parent>
+    <groupId>org.aspectj</groupId>
+    <artifactId>aspectj-parent</artifactId>
+    <version>${revision}</version>
+    <relativePath>..</relativePath>
+  </parent>
+
+</project>
diff --git a/util/pr107313-SourceLocation.patch b/util/pr107313-SourceLocation.patch
deleted file mode 100644
index 63fd61f61..000000000
--- a/util/pr107313-SourceLocation.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: src/org/aspectj/util/ConfigParser.java
-===================================================================
-RCS file: /home/technology/org.aspectj/modules/util/src/org/aspectj/util/ConfigParser.java,v
-retrieving revision 1.6
-diff -u -r1.6 ConfigParser.java
---- src/org/aspectj/util/ConfigParser.java	5 Aug 2004 17:31:56 -0000	1.6
-+++ src/org/aspectj/util/ConfigParser.java	2 Sep 2005 07:40:04 -0000
-@@ -21,11 +21,14 @@
- public class ConfigParser {
-     Location location;
-     protected File relativeDirectory = null;
--    protected List files = new LinkedList();
-+    protected List files = new ArrayList();
-+    protected Map userFileMap = new HashMap(); // from File -> File, keys are canonical files, values are the 'user' path
-     private boolean fileParsed = false;
-     protected static String CONFIG_MSG = "build config error: ";  
-     
-     public List getFiles() { return files; }
-+    
-+    public Map getUserFileNameMap() { return userFileMap; }
- 
-     public void parseCommandLine(String[] argsArray) throws ParseException {
-         location = new CommandLineLocation();
-@@ -221,7 +224,9 @@
-           ret = new File(dir, name);
-         }
-         try {
--        	ret = ret.getCanonicalFile();
-+        	File canonicalFile = ret.getCanonicalFile();
-+        	userFileMap.put(canonicalFile,new File(name));
-+        	ret = canonicalFile;
-         } catch (IOException ioEx) {
-         	// proceed without canonicalization
-         	// so nothing to do here
diff --git a/util/src/org/aspectj/util/FileUtil.java b/util/src/main/java/org/aspectj/util/FileUtil.java
index f3db2bda7..f3db2bda7 100644
--- a/util/src/org/aspectj/util/FileUtil.java
+++ b/util/src/main/java/org/aspectj/util/FileUtil.java
diff --git a/util/src/org/aspectj/util/FuzzyBoolean.java b/util/src/main/java/org/aspectj/util/FuzzyBoolean.java
index 807d98087..807d98087 100644
--- a/util/src/org/aspectj/util/FuzzyBoolean.java
+++ b/util/src/main/java/org/aspectj/util/FuzzyBoolean.java
diff --git a/util/src/org/aspectj/util/GenericSignature.java b/util/src/main/java/org/aspectj/util/GenericSignature.java
index bfefc007e..bfefc007e 100644
--- a/util/src/org/aspectj/util/GenericSignature.java
+++ b/util/src/main/java/org/aspectj/util/GenericSignature.java
diff --git a/util/src/org/aspectj/util/GenericSignatureParser.java b/util/src/main/java/org/aspectj/util/GenericSignatureParser.java
index 28c8db83d..28c8db83d 100644
--- a/util/src/org/aspectj/util/GenericSignatureParser.java
+++ b/util/src/main/java/org/aspectj/util/GenericSignatureParser.java
diff --git a/util/src/org/aspectj/util/IStructureModel.java b/util/src/main/java/org/aspectj/util/IStructureModel.java
index 9008f0872..9008f0872 100644
--- a/util/src/org/aspectj/util/IStructureModel.java
+++ b/util/src/main/java/org/aspectj/util/IStructureModel.java
diff --git a/util/src/org/aspectj/util/LangUtil.java b/util/src/main/java/org/aspectj/util/LangUtil.java
index 82bd9426b..82bd9426b 100644
--- a/util/src/org/aspectj/util/LangUtil.java
+++ b/util/src/main/java/org/aspectj/util/LangUtil.java
diff --git a/util/src/org/aspectj/util/PartialOrder.java b/util/src/main/java/org/aspectj/util/PartialOrder.java
index 8bb9f3b77..8bb9f3b77 100644
--- a/util/src/org/aspectj/util/PartialOrder.java
+++ b/util/src/main/java/org/aspectj/util/PartialOrder.java
diff --git a/util/src/org/aspectj/util/Reflection.java b/util/src/main/java/org/aspectj/util/Reflection.java
index 83ceaac23..83ceaac23 100644
--- a/util/src/org/aspectj/util/Reflection.java
+++ b/util/src/main/java/org/aspectj/util/Reflection.java
diff --git a/util/src/org/aspectj/util/SoftHashMap.java b/util/src/main/java/org/aspectj/util/SoftHashMap.java
index 94ae83441..94ae83441 100644
--- a/util/src/org/aspectj/util/SoftHashMap.java
+++ b/util/src/main/java/org/aspectj/util/SoftHashMap.java
diff --git a/util/src/org/aspectj/util/TypeSafeEnum.java b/util/src/main/java/org/aspectj/util/TypeSafeEnum.java
index 99d223143..99d223143 100644
--- a/util/src/org/aspectj/util/TypeSafeEnum.java
+++ b/util/src/main/java/org/aspectj/util/TypeSafeEnum.java
diff --git a/util/src/org/aspectj/util/UtilClassLoader.java b/util/src/main/java/org/aspectj/util/UtilClassLoader.java
index 091e022a3..091e022a3 100644
--- a/util/src/org/aspectj/util/UtilClassLoader.java
+++ b/util/src/main/java/org/aspectj/util/UtilClassLoader.java
diff --git a/util/testsrc/org/aspectj/util/FileUtilTest.java b/util/src/test/java/org/aspectj/util/FileUtilTest.java
index 8ce18c700..8ce18c700 100644
--- a/util/testsrc/org/aspectj/util/FileUtilTest.java
+++ b/util/src/test/java/org/aspectj/util/FileUtilTest.java
diff --git a/util/testsrc/org/aspectj/util/GenericSignatureParserTest.java b/util/src/test/java/org/aspectj/util/GenericSignatureParserTest.java
index 5a9e083e4..5a9e083e4 100644
--- a/util/testsrc/org/aspectj/util/GenericSignatureParserTest.java
+++ b/util/src/test/java/org/aspectj/util/GenericSignatureParserTest.java
diff --git a/util/testsrc/org/aspectj/util/LangUtilTest.java b/util/src/test/java/org/aspectj/util/LangUtilTest.java
index 4cb44795d..4cb44795d 100644
--- a/util/testsrc/org/aspectj/util/LangUtilTest.java
+++ b/util/src/test/java/org/aspectj/util/LangUtilTest.java
diff --git a/util/testsrc/org/aspectj/util/UtilModuleTests.java b/util/testsrc/org/aspectj/util/UtilModuleTests.java
deleted file mode 100644
index 463fdce2a..000000000
--- a/util/testsrc/org/aspectj/util/UtilModuleTests.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.aspectj.util;
-/* *******************************************************************
- * Copyright (c) 1999-2001 Xerox Corporation, 
- *               2002 Palo Alto Research Center, Incorporated (PARC).
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *     Xerox/PARC     initial implementation 
- * ******************************************************************/
-
-
-// default package
-
-import junit.framework.*;
-import junit.framework.Test;
-
-public class UtilModuleTests extends TestCase {
-
-    public static Test suite() { 
-        TestSuite suite = new TestSuite(UtilModuleTests.class.getName());
-        suite.addTest(org.aspectj.util.UtilTests.suite()); 
-        return suite;
-    }
-
-    public UtilModuleTests(String name) { super(name); }
-
-}  
diff --git a/util/testsrc/org/aspectj/util/UtilTests.java b/util/testsrc/org/aspectj/util/UtilTests.java
deleted file mode 100644
index 9d459aad7..000000000
--- a/util/testsrc/org/aspectj/util/UtilTests.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/* *******************************************************************
- * Copyright (c) 1999-2001 Xerox Corporation, 
- *               2002 Palo Alto Research Center, Incorporated (PARC).
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *     Xerox/PARC     initial implementation 
- * ******************************************************************/
-
-package org.aspectj.util;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class UtilTests extends TestCase {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite(UtilTests.class.getName());
-		// $JUnit-BEGIN$
-		suite.addTestSuite(FileUtilTest.class);
-		suite.addTestSuite(LangUtilTest.class);
-		suite.addTestSuite(GenericSignatureParserTest.class);
-		// $JUnit-END$
-		return suite;
-	}
-
-	public UtilTests(String name) {
-		super(name);
-	}
-
-}