tidyup

3 files changed, 110 insertions, 72 deletions

diff --git a/loadtime/pom.xml b/loadtime/pom.xml
index da12d06c4..f371698c7 100644
--- a/loadtime/pom.xml
+++ b/loadtime/pom.xml
@@ -1,80 +1,113 @@
 <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>
+	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>
+	<parent>
+		<groupId>org.aspectj</groupId>
+		<artifactId>aspectj-parent</artifactId>
+		<version>1.9.3.BUILD-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
 
-  <artifactId>loadtime</artifactId>
-  <packaging>jar</packaging>
-  <name>loadtime</name>
+	<artifactId>loadtime</artifactId>
+	<packaging>jar</packaging>
+	<name>loadtime</name>
 
-  <dependencies>
+	<dependencies>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>asm</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>runtime</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>weaver</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>org.aspectj.matcher</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>testing-util</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>bcel-builder</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>xml-apis</groupId>
+			<artifactId>xml-apis</artifactId>
+			<version>1.0</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/../lib/ant/lib/xml-apis.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>xercesImpl</groupId>
+			<artifactId>xercesImpl</artifactId>
+			<version>1.0</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/../lib/ant/lib/xercesImpl.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>jrockit</groupId>
+			<artifactId>jrockit</artifactId>
+			<version>1.0</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/../lib/ext/jrockit/jrockit.jar</systemPath>
+		</dependency>
+		
     <dependency>
-      <groupId>org.aspectj</groupId>
-      <artifactId>asm</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>runtime</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>weaver</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.aspectj</groupId>
-      <artifactId>org.aspectj.matcher</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.aspectj</groupId>
-      <artifactId>testing-util</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.aspectj</groupId>
-      <artifactId>bcel-builder</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-      <version>1.0</version>
-      <scope>system</scope>
-      <systemPath>${project.basedir}/../lib/ant/lib/xml-apis.jar</systemPath>
-    </dependency>
-    <dependency>
-      <groupId>xercesImpl</groupId>
-      <artifactId>xercesImpl</artifactId>
-      <version>1.0</version>
-      <scope>system</scope>
-      <systemPath>${project.basedir}/../lib/ant/lib/xercesImpl.jar</systemPath>
-    </dependency>
-    <dependency>
-      <groupId>jrockit</groupId>
-      <artifactId>jrockit</artifactId>
+      <groupId>ant</groupId>
+      <artifactId>ant</artifactId>
       <version>1.0</version>
       <scope>system</scope>
-      <systemPath>${project.basedir}/../lib/ext/jrockit/jrockit.jar</systemPath>
+      <systemPath>${project.basedir}/../lib/ant/lib/ant.jar</systemPath>
     </dependency>
-  </dependencies>
+	</dependencies>
+
+<!-- 
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>3.0.1</version>
+				<configuration>
+				</configuration>
+				<executions>
+					<execution>
+						<id>javadoc</id>
+						<phase>package</phase>
+						<goals>
+							<goal>javadoc</goal>
+						</goals>
+						<configuration>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+-->
 </project>
diff --git a/loadtime/src/main/java/org/aspectj/weaver/loadtime/Agent.java b/loadtime/src/main/java/org/aspectj/weaver/loadtime/Agent.java
index eeca8aeef..6dbbf32db 100644
--- a/loadtime/src/main/java/org/aspectj/weaver/loadtime/Agent.java
+++ b/loadtime/src/main/java/org/aspectj/weaver/loadtime/Agent.java
@@ -37,7 +37,7 @@ public class Agent {
      * JSR-163 preMain Agent entry method
      *
      * @param options
-     * @param instrumentation
+     * @param instrumentation 
      */
     public static void premain(String options, Instrumentation instrumentation) {
     	/* Handle duplicate agents */
diff --git a/loadtime/src/test/java/org/aspectj/weaver/loadtime/JRockitAgentTest.java b/loadtime/src/test/java/org/aspectj/weaver/loadtime/JRockitAgentTest.java
index b13ebe421..9ed540d17 100644
--- a/loadtime/src/test/java/org/aspectj/weaver/loadtime/JRockitAgentTest.java
+++ b/loadtime/src/test/java/org/aspectj/weaver/loadtime/JRockitAgentTest.java
@@ -25,6 +25,7 @@ import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
 
 import org.aspectj.util.FileUtil;
+import org.aspectj.util.LangUtil;
 
 import junit.framework.TestCase;
 
@@ -53,6 +54,10 @@ public class JRockitAgentTest extends TestCase {
 	}
 
 	public void testJrockitRecursionProtection() {
+		if (LangUtil.is11VMOrGreater()) {
+			// Skip test, not castable to URLClassLoader
+			return;
+		}
 		URLClassLoader thisLoader = (URLClassLoader) getClass().getClassLoader();
 		URL jrockit = FileUtil.getFileURL(new File("../lib/ext/jrockit/jrockit.jar"));
 		URL[] urls = new URL[] {jrockit};