@@ -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> |
@@ -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> |
@@ -1,3 +0,0 @@ | |||
bin | |||
bintest |
@@ -1 +0,0 @@ | |||
@@ -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> |
@@ -0,0 +1,4 @@ | |||
eclipse.preferences.version=1 | |||
encoding//src/main/java=UTF-8 | |||
encoding//src/test/java=UTF-8 | |||
encoding/<project>=UTF-8 |
@@ -0,0 +1,2 @@ | |||
eclipse.preferences.version=1 | |||
org.eclipse.jdt.apt.aptEnabled=false |
@@ -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 |
@@ -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> | |||
@@ -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> |
@@ -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 |
@@ -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); } | |||
} |
@@ -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); | |||
} | |||
} |