From 710844d944208af8b70a64290d1d145123c80fbe Mon Sep 17 00:00:00 2001
From: mwebster <mwebster>
Date: Mon, 30 Oct 2006 17:18:28 +0000
Subject: [PATCH] Bug 159854 "Problem Diagnosis Guide" (tests)

---
 tests/ltw/ant.xml                             | 25 ++++----
 tests/ltw/aop-simple.xml                      |  4 ++
 .../systemtest/ajc150/ltw/LTWTests.java       |  5 ++
 .../systemtest/ajc150/ltw/ltw-tests.xml       | 18 +++++-
 .../systemtest/tracing/TracingTests.java      |  4 ++
 .../aspectj/systemtest/tracing/tracing.xml    | 12 ++++
 tests/tracing/ant.xml                         | 13 ++++
 tests/tracing/logging.properties              | 59 ++++++++++++++++++-
 .../aspectj/weaver/tools/TraceFactory.java    |  2 +-
 9 files changed, 128 insertions(+), 14 deletions(-)
 create mode 100644 tests/ltw/aop-simple.xml

diff --git a/tests/ltw/ant.xml b/tests/ltw/ant.xml
index c7f5cc26c..e1cb0a6bd 100644
--- a/tests/ltw/ant.xml
+++ b/tests/ltw/ant.xml
@@ -10,15 +10,12 @@
     <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"/>
         	<sysproperty key="aj.class.path" 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"/>-->
@@ -29,16 +26,13 @@
     <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="-Djava.system.class.loader=org.aspectj.weaver.loadtime.WeavingURLClassLoader"/>
         	<sysproperty key="aj.class.path" path="${aj.sandbox}/hello.jar:${aj.sandbox}/handler.jar"/>
         	<sysproperty key="aj.aspect.path" 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"/>-->
@@ -100,4 +94,15 @@
         </java>
     </target>
 
+    <target name="simple LTW">
+        <copy file="${aj.root}/tests/ltw/aop-simple.xml"
+              tofile="${aj.sandbox}/META-INF/aop.xml"/>
+        <java fork="yes" classname="HelloWorld" failonerror="yes">
+            <classpath refid="aj.path"/>
+            <!-- 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/ltw/aop-simple.xml b/tests/ltw/aop-simple.xml
new file mode 100644
index 000000000..89833f499
--- /dev/null
+++ b/tests/ltw/aop-simple.xml
@@ -0,0 +1,4 @@
+<aspectj>
+	<weaver options="-verbose">
+	</weaver>
+</aspectj>
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ltw/LTWTests.java b/tests/src/org/aspectj/systemtest/ajc150/ltw/LTWTests.java
index 31783f6d6..267593468 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ltw/LTWTests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/ltw/LTWTests.java
@@ -152,6 +152,11 @@ public class LTWTests extends org.aspectj.testing.XMLBasedAjcTestCase {
   		runTest("override default path using -Dorg.aspectj.weaver.loadtime.configuration");
   		  		
   	}
+  	
+  	public void testSimpleLTW_pr159854 () {
+  		runTest("simple LTW");
+  		  		
+  	}
   	  	
   	/*
   	 * Allow system properties to be set and restored
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 919e3bff6..59bb176bd 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ltw/ltw-tests.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ltw/ltw-tests.xml
@@ -540,9 +540,11 @@
         <compile files="ExceptionHandler.aj" options="-outxml -outjar handler.jar"/>
 		<ant file="ant.xml" target="JDK14 LTW with XML" verbose="true">
         	<stdout>
-            	<line text="TraceFactory.instance="/>
             	<line text="Hello World!"/>
         	</stdout>
+        	<stderr>
+            	<line text="TraceFactory.instance="/>
+        	</stderr>
         </ant>
     </ajc-test>
     
@@ -551,9 +553,11 @@
         <compile files="ExceptionHandler.aj" options="-outjar handler.jar"/>
         <ant file="ant.xml" target="JDK14 LTW with ASPECTPATH" verbose="true">
         	<stdout>
-            	<line text="TraceFactory.instance="/>
             	<line text="Hello World!"/>
         	</stdout>
+        	<stderr>
+            	<line text="TraceFactory.instance="/>
+        	</stderr>
         </ant>
     </ajc-test>
     
@@ -639,5 +643,15 @@
             </stderr>
         </run>
     </ajc-test>       
+
+	<ajc-test dir="ltw" title="simple LTW" keywords="ltw">
+        <compile files="HelloWorld.java"/>
+        <compile files="ExceptionHandler.aj" options="-outxml"/>
+		<ant file="ant.xml" target="simple LTW" verbose="true">
+        	<stdout>
+            	<line text="Hello World!"/>
+        	</stdout>
+        </ant>
+    </ajc-test>
     
     
\ No newline at end of file
diff --git a/tests/src/org/aspectj/systemtest/tracing/TracingTests.java b/tests/src/org/aspectj/systemtest/tracing/TracingTests.java
index eced86a4f..a0164d305 100644
--- a/tests/src/org/aspectj/systemtest/tracing/TracingTests.java
+++ b/tests/src/org/aspectj/systemtest/tracing/TracingTests.java
@@ -41,5 +41,9 @@ public class TracingTests extends org.aspectj.testing.XMLBasedAjcTestCase {
 	public void testTraceEverything () {
   		runTest("Trace everything");
 	}
+	
+	public void testJDK14Tracing_pr159854 () {
+  		runTest("JDK 1.4 tracing");
+	}
 
 }
diff --git a/tests/src/org/aspectj/systemtest/tracing/tracing.xml b/tests/src/org/aspectj/systemtest/tracing/tracing.xml
index eb5998149..c1a2b9c8a 100644
--- a/tests/src/org/aspectj/systemtest/tracing/tracing.xml
+++ b/tests/src/org/aspectj/systemtest/tracing/tracing.xml
@@ -72,4 +72,16 @@
             </stdout>
         </ant>
     </ajc-test>
+
+	<ajc-test dir="tracing" title="JDK 1.4 tracing" keywords="tracing">
+        <compile
+        	files="HelloWorld.java"
+        />
+        <compile files="Aspect.aj" options="-outxml"/>
+		<ant file="ant.xml" target="JDK 1.4 tracing" verbose="true">
+        	<stdout>
+                <line text="Hello World!"/>
+            </stdout>
+        </ant>
+    </ajc-test>
 </suite>
diff --git a/tests/tracing/ant.xml b/tests/tracing/ant.xml
index 064eecda0..8e7ddad18 100644
--- a/tests/tracing/ant.xml
+++ b/tests/tracing/ant.xml
@@ -50,4 +50,17 @@
         </java>
     </target>
 
+    <target name="JDK 1.4 tracing">
+        <copy file="${aj.root}/tests/tracing//logging.properties"
+              tofile="${aj.sandbox}/META-INF/logging.properties"/>
+        <java fork="yes" classname="HelloWorld" failonerror="yes">
+            <classpath refid="aj.path"/>
+            <jvmarg value="-Dorg.aspectj.tracing.debug=true"/>
+            <jvmarg value="-Djava.util.logging.config.file=logging.properties"/>
+            <!-- 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/tracing/logging.properties b/tests/tracing/logging.properties
index 0519ecba6..54421d045 100644
--- a/tests/tracing/logging.properties
+++ b/tests/tracing/logging.properties
@@ -1 +1,58 @@
- 
\ No newline at end of file
+############################################################
+#  	Default Logging Configuration File
+#
+# You can use a different file by specifying a filename
+# with the java.util.logging.config.file system property.  
+# For example java -Djava.util.logging.config.file=myfile
+############################################################
+
+############################################################
+#  	Global properties
+############################################################
+
+# "handlers" specifies a comma separated list of log Handler 
+# classes.  These handlers will be installed during VM startup.
+# Note that these classes must be on the system classpath.
+# By default we only configure a ConsoleHandler, which will only
+# show messages at the INFO and above levels.
+#handlers= java.util.logging.ConsoleHandler
+
+# To also add the FileHandler, use the following line instead.
+#handlers= java.util.logging.FileHandler, java.util.logging.ConsoleHandler
+handlers= java.util.logging.FileHandler
+
+# Default global logging level.
+# This specifies which kinds of events are logged across
+# all loggers.  For any given facility this global level
+# can be overriden by a facility specific level
+# Note that the ConsoleHandler also has a separate level
+# setting to limit messages printed to the console.
+.level= INFO
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
+
+# default file output is in user's home directory.
+java.util.logging.FileHandler.pattern = %h/java%u.log
+#java.util.logging.FileHandler.limit = 50000
+java.util.logging.FileHandler.count = 1
+#java.util.logging.FileHandler.formatter = java.util.logging.XMLFormatter
+java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter
+java.util.logging.FileHandler.level = FINER
+
+# Limit the message that are printed on the console to INFO and above.
+java.util.logging.ConsoleHandler.level = FINER
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
+
+
+############################################################
+# Facility specific properties.
+# Provides extra control for each logger.
+############################################################
+
+# For example, set the com.xyz.foo logger to only log SEVERE
+# messages:
+#com.xyz.foo.level = SEVERE
+org.aspectj.weaver.loadtime.level = FINER
diff --git a/weaver/src/org/aspectj/weaver/tools/TraceFactory.java b/weaver/src/org/aspectj/weaver/tools/TraceFactory.java
index dedceeadb..41c6b9f57 100644
--- a/weaver/src/org/aspectj/weaver/tools/TraceFactory.java
+++ b/weaver/src/org/aspectj/weaver/tools/TraceFactory.java
@@ -77,7 +77,7 @@ public abstract class TraceFactory {
     	    instance = new DefaultTraceFactory();
     	}
     	
-    	if (debug) System.out.println("TraceFactory.instance=" + instance);
+    	if (debug) System.err.println("TraceFactory.instance=" + instance);
     }
 
 }
-- 
2.39.5