From: Alexander Kriegisch <Alexander@Kriegisch.name>
Date: Sat, 10 Apr 2021 04:44:47 +0000 (+0700)
Subject: Move lib/ext/jrockit to just lib/jrockit
X-Git-Tag: V1_9_7_M2~21^2~24
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2b0b1a98959bd0d569f1d04bd3b25dac8ef0bb7a;p=aspectj.git

Move lib/ext/jrockit to just lib/jrockit

It was the only subdirectory under lib/ext anyway and somehow always
irritating and difficult to find when just using a directory browser in
the IDE.

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
---

diff --git a/lib/ext/jrockit/LICENSE.TXT b/lib/ext/jrockit/LICENSE.TXT
deleted file mode 100644
index 6bbc97c40..000000000
--- a/lib/ext/jrockit/LICENSE.TXT
+++ /dev/null
@@ -1,8 +0,0 @@
-The managementapi-jrockit81.jar jar file in this folder is an excerpt of the BEA JRockit Management API
-as per JRockit 8.1 (Java 1.4) (supports also for JRockit 7 ie Java 1.3).
-
-It contains only the class file needed at build time for AspectJ
-and must not be used by the end-user.
-
-http://www.jrockit.com
-http://www.bea.com
\ No newline at end of file
diff --git a/lib/ext/jrockit/jrockit-src.zip b/lib/ext/jrockit/jrockit-src.zip
deleted file mode 100644
index dce223db8..000000000
Binary files a/lib/ext/jrockit/jrockit-src.zip and /dev/null differ
diff --git a/lib/ext/jrockit/jrockit.jar b/lib/ext/jrockit/jrockit.jar
deleted file mode 100644
index 0395fceb0..000000000
Binary files a/lib/ext/jrockit/jrockit.jar and /dev/null differ
diff --git a/lib/ext/jrockit/managementapi-jrockit81.jar b/lib/ext/jrockit/managementapi-jrockit81.jar
deleted file mode 100644
index f95129592..000000000
Binary files a/lib/ext/jrockit/managementapi-jrockit81.jar and /dev/null differ
diff --git a/lib/jrockit/LICENSE.TXT b/lib/jrockit/LICENSE.TXT
new file mode 100644
index 000000000..6bbc97c40
--- /dev/null
+++ b/lib/jrockit/LICENSE.TXT
@@ -0,0 +1,8 @@
+The managementapi-jrockit81.jar jar file in this folder is an excerpt of the BEA JRockit Management API
+as per JRockit 8.1 (Java 1.4) (supports also for JRockit 7 ie Java 1.3).
+
+It contains only the class file needed at build time for AspectJ
+and must not be used by the end-user.
+
+http://www.jrockit.com
+http://www.bea.com
\ No newline at end of file
diff --git a/lib/jrockit/jrockit-src.zip b/lib/jrockit/jrockit-src.zip
new file mode 100644
index 000000000..dce223db8
Binary files /dev/null and b/lib/jrockit/jrockit-src.zip differ
diff --git a/lib/jrockit/jrockit.jar b/lib/jrockit/jrockit.jar
new file mode 100644
index 000000000..0395fceb0
Binary files /dev/null and b/lib/jrockit/jrockit.jar differ
diff --git a/lib/jrockit/managementapi-jrockit81.jar b/lib/jrockit/managementapi-jrockit81.jar
new file mode 100644
index 000000000..f95129592
Binary files /dev/null and b/lib/jrockit/managementapi-jrockit81.jar differ
diff --git a/loadtime/pom.xml b/loadtime/pom.xml
index 5b19cb73c..d7333cd72 100644
--- a/loadtime/pom.xml
+++ b/loadtime/pom.xml
@@ -71,7 +71,7 @@
 			<artifactId>jrockit</artifactId>
 			<version>1.0</version>
 			<scope>system</scope>
-			<systemPath>${project.basedir}/../lib/ext/jrockit/jrockit.jar</systemPath>
+			<systemPath>${project.basedir}/../lib/jrockit/jrockit.jar</systemPath>
 		</dependency>
 
     <dependency>
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 487ef0832..7f9d235d0 100644
--- a/loadtime/src/test/java/org/aspectj/weaver/loadtime/JRockitAgentTest.java
+++ b/loadtime/src/test/java/org/aspectj/weaver/loadtime/JRockitAgentTest.java
@@ -54,7 +54,7 @@ public class JRockitAgentTest extends TestCase {
 	}
 
 	public void testJrockitRecursionProtection() {
-		URL jrockit = FileUtil.getFileURL(new File("../lib/ext/jrockit/jrockit.jar"));
+		URL jrockit = FileUtil.getFileURL(new File("../lib/jrockit/jrockit.jar"));
 		URL[] urls = new URL[] {jrockit};
 		URLClassLoader thisLoader = new URLClassLoader(urls, getClass().getClassLoader());
 		try {
diff --git a/run-all-junit-tests/pom.xml b/run-all-junit-tests/pom.xml
index a2d8aa604..e98cd7f04 100644
--- a/run-all-junit-tests/pom.xml
+++ b/run-all-junit-tests/pom.xml
@@ -244,7 +244,7 @@
 			<artifactId>jrockit</artifactId>
 			<version>1.0</version>
 			<scope>system</scope>
-			<systemPath>${project.basedir}/../lib/ext/jrockit/jrockit.jar</systemPath>
+			<systemPath>${project.basedir}/../lib/jrockit/jrockit.jar</systemPath>
 		</dependency>
 		<dependency>
 			<!-- Identical to lib/ant/lib/ant-launcher.jar, a former system-scoped dependency -->