Bug 150487 "Tracing and Logging Framework" (remove tracing from ClassPathManager to prevent recursion in JDK 1.4 LTW)

4 files changed, 44 insertions, 0 deletions

diff --git a/tests/ltw/HelloWorld.java b/tests/ltw/HelloWorld.java
new file mode 100644
index 000000000..8e5a1fdd7
--- /dev/null
+++ b/tests/ltw/HelloWorld.java
@@ -0,0 +1,7 @@
+public class HelloWorld {
+	
+	public static void main (String[] args) throws Exception {
+		System.out.println("Hello World!");
+	}
+	
+}
\ No newline at end of file
diff --git a/tests/ltw/ant.xml b/tests/ltw/ant.xml
new file mode 100644
index 000000000..6f7971d96
--- /dev/null
+++ b/tests/ltw/ant.xml
@@ -0,0 +1,26 @@
+<!-- ajc-ant script, not to be used from Ant commant line - see AntSpec -->
+<project name="ltw">
+
+    <!-- using this we can debug the forked VM -->
+    <property
+        name="jdwp"
+        value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/>
+
+    <target name="JDK14 LTW">
+        <java fork="yes" classname="HelloWorld" failonerror="yes">
+            <classpath refid="aj.path"/>
+            <classpath>
+                <pathelement path="${aj.sandbox}/hello.jar"/>
+            </classpath>
+            <jvmarg value="-Djava.system.class.loader=org.aspectj.weaver.loadtime.WeavingURLClassLoader"/>
+        	<!--        	
+-->            
+            <jvmarg value="-Daj.class.path=${aj.sandbox}/hello.jar"/>
+            <jvmarg value="-Dorg.aspectj.tracing.debug=true"/>
+            <!-- use META-INF/aop.xml style -->
+<!--            <jvmarg value="-javaagent:${aj.root}/lib/test/loadtime5.jar"/>-->
+<!--            <jvmarg line="${jdwp}"/>-->
+        </java>
+    </target>
+
+</project>
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ltw/LTWTests.java b/tests/src/org/aspectj/systemtest/ajc150/ltw/LTWTests.java
index 6516af53d..4a5a7e0ee 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ltw/LTWTests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/ltw/LTWTests.java
@@ -97,6 +97,10 @@ public class LTWTests extends org.aspectj.testing.XMLBasedAjcTestCase {
 		runTest("Odd zip on classpath");  		
   	}
   	
+  	public void testJDK14LTW() {  	
+		runTest("JDK14 LTW");  		
+  	}
+  	
   	// separate bugzilla patch has this one... commented out
 //  	public void testSeparateCompilationDeclareParentsCall() {
 //  		runTest("Separate compilation with ltw: declare parents and call");
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ltw/ltw-tests.xml b/tests/src/org/aspectj/systemtest/ajc150/ltw/ltw-tests.xml
index 82fe498e0..57946c186 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ltw/ltw-tests.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ltw/ltw-tests.xml
@@ -470,4 +470,11 @@ commented out: reported in another bugzilla bug...
         </run>
     </ajc-test>
 -->
+	<ajc-test dir="ltw" title="JDK14 LTW" keywords="ltw">
+        <compile
+        	files="HelloWorld.java"
+        	options="-outjar hello.jar"
+        />
+        <ant file="ant.xml" target="JDK14 LTW" verbose="true"/>
+    </ajc-test>