[jboss-cvs] JBoss Messaging SVN: r4941 - in trunk: tests/config and 1 other directory.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Sep 15 08:15:45 EDT 2008


Author: ataylor
Date: 2008-09-15 08:15:45 -0400 (Mon, 15 Sep 2008)
New Revision: 4941

Added:
   trunk/tests/config/log4j.info.xml
   trunk/tests/config/log4j.trace.xml
   trunk/tests/config/log4j.xml
Modified:
   trunk/build-messaging.xml
Log:
added log4j and fixed logging for tests

Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml	2008-09-13 18:40:24 UTC (rev 4940)
+++ trunk/build-messaging.xml	2008-09-15 12:15:45 UTC (rev 4941)
@@ -684,8 +684,11 @@
              timeout="${junit.timeout}">
          <sysproperty key="user.home" value="${user.home}"/>
          <jvmarg value="-Djava.library.path=native/bin"/>
+         <jvmarg value="-Dmodule.output=${test.output.dir}"/>
+         <jvmarg value="-Dtest.logfile.suffix=unit"/>
+         <jvmarg value="-Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.core.logging.JBMLoggerPlugin"/>
          <jvmarg value="-Xmx1024M"/>
-         <!--<jvmarg line="-Xmx512M -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/>-->
+         <jvmarg line="-Xmx512M -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/>
          <!--<jvmarg value="-ea"/>-->
          <classpath refid="unit.test.execution.classpath"/>
          <formatter type="xml" usefile="${junit.formatter.usefile}"/>
@@ -731,6 +734,8 @@
 
          <jvmarg value="-Xmx1024M"/>
          <jvmarg value="-Djava.library.path=native/bin"/>
+         <jvmarg value="-Dmodule.output=${test.output.dir}"/>
+         <jvmarg value="-Dtest.logfile.suffix=jms"/>
          <!--<jvmarg line="-Xmx512M -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/>-->
          <!--<jvmarg value="-ea"/>-->
          <sysproperty key="jbm.remoting.disable.invm" value="${disable.invm}"/>

Copied: trunk/tests/config/log4j.info.xml (from rev 4828, trunk/tests/jms-tests/config/log4j.info.xml)
===================================================================
--- trunk/tests/config/log4j.info.xml	                        (rev 0)
+++ trunk/tests/config/log4j.info.xml	2008-09-15 12:15:45 UTC (rev 4941)
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- $Id: log4j.xml 1019 2006-07-17 17:15:04Z timfox $ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+   <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <!--
+          Normally "test.logfile.suffix" takes on of the values: "invm", "remote-client",
+          "remote-server", "clustering-client", "clustering-server<index>", "crash-client",
+          "crash-server", etc.
+      -->
+      <param name="File" value="${module.output}/logs/messaging-${test.logfile.suffix}.log"/>
+
+      <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+      <param name="Threshold" value="INFO"/>
+
+      <!-- since majority of the tests are ran in fork mode by ant, the log file is overwritten
+           for each test. We need to append if we want to preserve a full testsuite run log.
+           Make sure the build script clears this log at the beginning of each run.
+      -->
+      <param name="Append" value="true"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <param name="ConversionPattern" value="%d %-5r %-5p [%c] @%t %m%n"/>
+      </layout>
+   </appender>
+
+   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="TRACE"/>
+      <layout class="org.apache.log4j.PatternLayout">
+         <param name="ConversionPattern" value="%t %d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+      </layout>
+   </appender>
+
+   <category name="org.apache">
+      <priority value="INFO"/>
+   </category>
+
+   <category name="org.jgroups">
+      <priority value="TRACE"/>
+   </category>
+
+   <category name="org.jboss">
+      <priority value="INFO"/>
+   </category>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+      <appender-ref ref="FILE"/>
+   </root>
+
+</log4j:configuration>


Property changes on: trunk/tests/config/log4j.info.xml
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: trunk/tests/config/log4j.trace.xml (from rev 4828, trunk/tests/jms-tests/config/log4j.trace.xml)
===================================================================
--- trunk/tests/config/log4j.trace.xml	                        (rev 0)
+++ trunk/tests/config/log4j.trace.xml	2008-09-15 12:15:45 UTC (rev 4941)
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- $Id: log4j.xml 1184 2006-08-03 18:52:12Z ovidiu.feodorov at jboss.com $ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+   <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <!--
+          Normally "test.logfile.suffix" takes on of the values: "invm", "remote-client",
+          "remote-server", "clustering-client", "clustering-server<index>", "crash-client",
+          "crash-server", etc.
+      -->
+      <param name="File" value="${module.output}/logs/messaging-${test.logfile.suffix}.log"/>
+      <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+      <param name="Threshold" value="TRACE#org.jboss.logging.XLevel"/>
+
+      <!-- since majority of the tests are ran in fork mode by ant, the log file is overwritten
+           for each test. We need to append if we want to preserve a full testsuite run log.
+           Make sure the build script clears this log at the beginning of each run.
+      -->
+      <param name="Append" value="true"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <param name="ConversionPattern" value="%d %-5r %-5p [%c] @%t %m%n"/>
+      </layout>
+   </appender>
+
+   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+      <layout class="org.apache.log4j.PatternLayout">
+         <param name="ConversionPattern" value="%t %d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+      </layout>
+   </appender>
+
+   <category name="com.arjuna">
+      <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+   </category>
+
+   <category name="org.apache">
+      <priority value="INFO"/>
+   </category>
+
+   <category name="org.jgroups">
+      <priority value="WARN"/>
+   </category>
+
+   <category name="org.jboss">
+      <priority value="INFO"/>
+   </category>
+
+   <category name="org.jboss.messaging">
+      <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+   </category>
+
+   <category name="org.jboss.jms">
+      <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+   </category>
+
+   <category name="org.jboss.test">
+      <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+   </category>
+
+   <!-- Ignoring trace from these: -->
+
+   <category name="org.jboss.messaging.jms.server.remoting.JMSServerInvocationHandler">
+      <priority value="DEBUG"/>
+   </category>
+
+   <category name="org.jboss.test.messaging.tools.container.MockJBossSecurityManager">
+      <priority value="DEBUG"/>
+   </category>
+
+   <category name="org.jboss.jms.wireformat.JMSWireFormat">
+      <priority value="DEBUG"/>
+   </category>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+      <appender-ref ref="FILE"/>
+   </root>
+
+</log4j:configuration>


Property changes on: trunk/tests/config/log4j.trace.xml
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: trunk/tests/config/log4j.xml (from rev 4828, trunk/tests/jms-tests/config/log4j.xml)
===================================================================
--- trunk/tests/config/log4j.xml	                        (rev 0)
+++ trunk/tests/config/log4j.xml	2008-09-15 12:15:45 UTC (rev 4941)
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- $Id: log4j.xml 1019 2006-07-17 17:15:04Z timfox $ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+   <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <!--
+          Normally "test.logfile.suffix" takes on of the values: "invm", "remote-client",
+          "remote-server", "clustering-client", "clustering-server<index>", "crash-client",
+          "crash-server", etc.
+      -->
+      <param name="File" value="${module.output}/logs/messaging-${test.logfile.suffix}.log"/>
+
+      <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+      <param name="Threshold" value="INFO"/>
+
+      <!-- since majority of the tests are ran in fork mode by ant, the log file is overwritten
+           for each test. We need to append if we want to preserve a full testsuite run log.
+           Make sure the build script clears this log at the beginning of each run.
+      -->
+      <param name="Append" value="true"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <param name="ConversionPattern" value="%d %-5r %-5p [%c] @%t %m%n"/>
+      </layout>
+   </appender>
+
+   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="TRACE"/>
+      <layout class="org.apache.log4j.PatternLayout">
+         <param name="ConversionPattern" value="%t %d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+      </layout>
+   </appender>
+
+   <category name="org.apache">
+      <priority value="INFO"/>
+   </category>
+
+   <category name="org.jgroups">
+      <priority value="TRACE"/>
+   </category>
+
+   <category name="org.jboss">
+      <priority value="INFO"/>
+   </category>
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+      <appender-ref ref="FILE"/>
+   </root>
+
+</log4j:configuration>


Property changes on: trunk/tests/config/log4j.xml
___________________________________________________________________
Name: svn:mergeinfo
   + 




More information about the jboss-cvs-commits mailing list