From 2b0b1a98959bd0d569f1d04bd3b25dac8ef0bb7a Mon Sep 17 00:00:00 2001
From: Alexander Kriegisch <Alexander@Kriegisch.name>
Date: Sat, 10 Apr 2021 11:44:47 +0700
Subject: [PATCH] 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>
---
 lib/{ext => }/jrockit/LICENSE.TXT                   |   0
 lib/{ext => }/jrockit/jrockit-src.zip               | Bin
 lib/{ext => }/jrockit/jrockit.jar                   | Bin
 lib/{ext => }/jrockit/managementapi-jrockit81.jar   | Bin
 loadtime/pom.xml                                    |   2 +-
 .../aspectj/weaver/loadtime/JRockitAgentTest.java   |   2 +-
 run-all-junit-tests/pom.xml                         |   2 +-
 7 files changed, 3 insertions(+), 3 deletions(-)
 rename lib/{ext => }/jrockit/LICENSE.TXT (100%)
 rename lib/{ext => }/jrockit/jrockit-src.zip (100%)
 rename lib/{ext => }/jrockit/jrockit.jar (100%)
 rename lib/{ext => }/jrockit/managementapi-jrockit81.jar (100%)

diff --git a/lib/ext/jrockit/LICENSE.TXT b/lib/jrockit/LICENSE.TXT
similarity index 100%
rename from lib/ext/jrockit/LICENSE.TXT
rename to lib/jrockit/LICENSE.TXT
diff --git a/lib/ext/jrockit/jrockit-src.zip b/lib/jrockit/jrockit-src.zip
similarity index 100%
rename from lib/ext/jrockit/jrockit-src.zip
rename to lib/jrockit/jrockit-src.zip
diff --git a/lib/ext/jrockit/jrockit.jar b/lib/jrockit/jrockit.jar
similarity index 100%
rename from lib/ext/jrockit/jrockit.jar
rename to lib/jrockit/jrockit.jar
diff --git a/lib/ext/jrockit/managementapi-jrockit81.jar b/lib/jrockit/managementapi-jrockit81.jar
similarity index 100%
rename from lib/ext/jrockit/managementapi-jrockit81.jar
rename to lib/jrockit/managementapi-jrockit81.jar
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 -->
-- 
2.39.5