Bug 150487 "Tracing and Logging Framework" (lazy initialize SimpleDateFormat to prevent recursion in JDK 1.4 LTW)

5 files changed, 51 insertions, 10 deletions

diff --git a/tests/ltw/ExceptionHandler.aj b/tests/ltw/ExceptionHandler.aj
new file mode 100644
index 000000000..447b59577
--- /dev/null
+++ b/tests/ltw/ExceptionHandler.aj
@@ -0,0 +1,9 @@
+public aspect ExceptionHandler {
+	void around() : execution(public void main(String[])) {
+		try {
+			proceed();
+		}
+		catch (Exception ex) {
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/ltw/HelloWorld.java b/tests/ltw/HelloWorld.java
index 8e5a1fdd7..9c810cf25 100644
--- a/tests/ltw/HelloWorld.java
+++ b/tests/ltw/HelloWorld.java
@@ -2,6 +2,7 @@ public class HelloWorld {
 	
 	public static void main (String[] args) throws Exception {
 		System.out.println("Hello World!");
+		throw new Exception();
 	}
 	
 }
\ No newline at end of file
diff --git a/tests/ltw/ant.xml b/tests/ltw/ant.xml
index 6f7971d96..38f51fd49 100644
--- a/tests/ltw/ant.xml
+++ b/tests/ltw/ant.xml
@@ -6,16 +6,38 @@
         name="jdwp"
         value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/>
 
-    <target name="JDK14 LTW">
+    <target name="JDK14 LTW with XML">
         <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;${aj.sandbox}/handler.jar"/>
+            <jvmarg value="-Daj.weaving.verbose=true"/>
+            <jvmarg value="-Dorg.aspectj.weaver.showWeaveInfo=true"/>
+            <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>
+
+    <target name="JDK14 LTW with ASPECTPATH">
+        <java fork="yes" classname="HelloWorld" failonerror="yes">
+            <classpath refid="aj.path"/>
         	<!--        	
+            <classpath>
+                <pathelement path="${aj.sandbox}/hello.jar"/>
+            </classpath>
 -->            
-            <jvmarg value="-Daj.class.path=${aj.sandbox}/hello.jar"/>
+            <jvmarg value="-Djava.system.class.loader=org.aspectj.weaver.loadtime.WeavingURLClassLoader"/>
+            <jvmarg value="-Daj.class.path=${aj.sandbox}/hello.jar;${aj.sandbox}/handler.jar"/>
+            <jvmarg value="-Daj.aspect.path=${aj.sandbox}/handler.jar"/>
+            <jvmarg value="-Daj.weaving.verbose=true"/>
+            <jvmarg value="-Dorg.aspectj.weaver.showWeaveInfo=true"/>
             <jvmarg value="-Dorg.aspectj.tracing.debug=true"/>
             <!-- use META-INF/aop.xml style -->
 <!--            <jvmarg value="-javaagent:${aj.root}/lib/test/loadtime5.jar"/>-->
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ltw/LTWTests.java b/tests/src/org/aspectj/systemtest/ajc150/ltw/LTWTests.java
index 4a5a7e0ee..73b6eebd1 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ltw/LTWTests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/ltw/LTWTests.java
@@ -97,8 +97,12 @@ public class LTWTests extends org.aspectj.testing.XMLBasedAjcTestCase {
 		runTest("Odd zip on classpath");  		
   	}
   	
-  	public void testJDK14LTW() {  	
-		runTest("JDK14 LTW");  		
+  	public void testJ14LTWWithXML() {  	
+		runTest("JDK14 LTW with XML");  		
+  	}
+  	
+  	public void testJ14LTWWithASPECTPATH() {  	
+		runTest("JDK14 LTW with ASPECTPATH");  		
   	}
   	
   	// separate bugzilla patch has this one... commented out
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 57946c186..bc7120870 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ltw/ltw-tests.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ltw/ltw-tests.xml
@@ -470,11 +470,16 @@ 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 dir="ltw" title="JDK14 LTW with XML" keywords="ltw">
+        <compile files="HelloWorld.java" options="-outjar hello.jar"/>
+        <compile files="ExceptionHandler.aj" options="-outxml -outjar handler.jar"/>
+        <ant file="ant.xml" target="JDK14 LTW with XML" verbose="true"/>
+    </ajc-test>
+    
+	<ajc-test dir="ltw" title="JDK14 LTW with ASPECTPATH" keywords="ltw">
+        <compile files="HelloWorld.java" options="-outjar hello.jar"/>
+        <compile files="ExceptionHandler.aj" options="-outjar handler.jar"/>
+        <ant file="ant.xml" target="JDK14 LTW with ASPECTPATH" verbose="true"/>
     </ajc-test>
     
+    
\ No newline at end of file