From 2b0b1a98959bd0d569f1d04bd3b25dac8ef0bb7a Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Sat, 10 Apr 2021 11:44:47 +0700 Subject: 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 --- lib/ext/jrockit/LICENSE.TXT | 8 -------- lib/ext/jrockit/jrockit-src.zip | Bin 2570 -> 0 bytes lib/ext/jrockit/jrockit.jar | Bin 1969 -> 0 bytes lib/ext/jrockit/managementapi-jrockit81.jar | Bin 7796 -> 0 bytes lib/jrockit/LICENSE.TXT | 8 ++++++++ lib/jrockit/jrockit-src.zip | Bin 0 -> 2570 bytes lib/jrockit/jrockit.jar | Bin 0 -> 1969 bytes lib/jrockit/managementapi-jrockit81.jar | Bin 0 -> 7796 bytes loadtime/pom.xml | 2 +- .../org/aspectj/weaver/loadtime/JRockitAgentTest.java | 2 +- run-all-junit-tests/pom.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 lib/ext/jrockit/LICENSE.TXT delete mode 100644 lib/ext/jrockit/jrockit-src.zip delete mode 100644 lib/ext/jrockit/jrockit.jar delete mode 100644 lib/ext/jrockit/managementapi-jrockit81.jar create mode 100644 lib/jrockit/LICENSE.TXT create mode 100644 lib/jrockit/jrockit-src.zip create mode 100644 lib/jrockit/jrockit.jar create mode 100644 lib/jrockit/managementapi-jrockit81.jar 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 @@ jrockit 1.0 system - ${project.basedir}/../lib/ext/jrockit/jrockit.jar + ${project.basedir}/../lib/jrockit/jrockit.jar 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 @@ jrockit 1.0 system - ${project.basedir}/../lib/ext/jrockit/jrockit.jar + ${project.basedir}/../lib/jrockit/jrockit.jar -- cgit v1.2.3