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 (file)
index 6bbc97c..0000000
--- 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 (file)
index dce223d..0000000
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 (file)
index 0395fce..0000000
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 (file)
index f951295..0000000
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 (file)
index 0000000..6bbc97c
--- /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 (file)
index 0000000..dce223d
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 (file)
index 0000000..0395fce
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 (file)
index 0000000..f951295
Binary files /dev/null and b/lib/jrockit/managementapi-jrockit81.jar differ

diff --git a/loadtime/pom.xml b/loadtime/pom.xml
index 5b19cb73c5ed92c77d02df286f46fc960b8bbac5..d7333cd7257cfd60d841053904a8a5587a44e8a2 100644 (file)
--- 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 487ef083225899fcd46d8df1869b63eec9b607c6..7f9d235d0549aab6b9319e8edc1b27962a258f53 100644 (file)
--- 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 a2d8aa6046ad5252a03e6fac1776469cb7665d68..e98cd7f04caae9e658407cee16786f111fc9d7c3 100644 (file)
--- 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 -->