[jboss-cvs] JBossAS SVN: r103580 - in trunk: ejb3/src/resources/test and 4 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Apr 6 11:19:47 EDT 2010


Author: david.lloyd at jboss.com
Date: 2010-04-06 11:19:46 -0400 (Tue, 06 Apr 2010)
New Revision: 103580

Removed:
   trunk/server/src/main/java/org/jboss/logging/
Modified:
   trunk/aspects/src/resources/test/log4j.xml
   trunk/ejb3/src/resources/test/log4j.xml
   trunk/iiop/src/etc/conf/default/log4j.properties
   trunk/security/src/test/java/org/jboss/test/ldap/LoginModulesTestCase.java
   trunk/system/src/resources/tests/conf/test-log4j.xml
Log:
More removal and change of defunct logging stuff

Modified: trunk/aspects/src/resources/test/log4j.xml
===================================================================
--- trunk/aspects/src/resources/test/log4j.xml	2010-04-06 14:53:15 UTC (rev 103579)
+++ trunk/aspects/src/resources/test/log4j.xml	2010-04-06 15:19:46 UTC (rev 103580)
@@ -21,17 +21,10 @@
    <!-- ================================= -->
 
    <!-- A time/date based rolling appender -->
-   <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+   <appender name="FILE" class="org.apache.log4j.FileAppender">
       <param name="File" value="${build.testlog}/test.log"/>
       <param name="Append" value="true"/>
 
-      <!-- Rollover at midnight each day -->
-      <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
-      <!-- Rollover at the top of each hour
-      <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
-      -->
-
       <layout class="org.apache.log4j.PatternLayout">
          <!-- The default pattern: Date Priority [Category] Message\n -->
          <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
@@ -42,19 +35,6 @@
       </layout>
    </appender>
 
-   <!-- A size based file rolling appender
-   <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
-     <param name="File" value="${jboss.server.log.dir}/server.log"/>
-     <param name="Append" value="false"/>
-     <param name="MaxFileSize" value="500KB"/>
-     <param name="MaxBackupIndex" value="1"/>
-
-     <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
-     </layout>
-   </appender>
-   -->
-
    <!-- ============================== -->
    <!-- Append messages to the console -->
    <!-- ============================== -->

Modified: trunk/ejb3/src/resources/test/log4j.xml
===================================================================
--- trunk/ejb3/src/resources/test/log4j.xml	2010-04-06 14:53:15 UTC (rev 103579)
+++ trunk/ejb3/src/resources/test/log4j.xml	2010-04-06 15:19:46 UTC (rev 103580)
@@ -21,17 +21,10 @@
   <!-- ================================= -->
 
   <!-- A time/date based rolling appender -->
-  <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+  <appender name="FILE" class="org.apache.log4j.FileAppender">
     <param name="File" value="${build.testlog}/test.log"/>
     <param name="Append" value="true"/>
 
-    <!-- Rollover at midnight each day -->
-    <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
-    <!-- Rollover at the top of each hour
-    <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
-    -->
-
     <layout class="org.apache.log4j.PatternLayout">
       <!-- The default pattern: Date Priority [Category] Message\n -->
       <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
@@ -42,19 +35,6 @@
     </layout>	    
   </appender>
 
-  <!-- A size based file rolling appender
-  <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
-    <param name="File" value="${jboss.server.log.dir}/server.log"/>
-    <param name="Append" value="false"/>
-    <param name="MaxFileSize" value="500KB"/>
-    <param name="MaxBackupIndex" value="1"/>
-
-    <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
-    </layout>	    
-  </appender>
-  -->
-
   <!-- ============================== -->
   <!-- Append messages to the console -->
   <!-- ============================== -->

Modified: trunk/iiop/src/etc/conf/default/log4j.properties
===================================================================
--- trunk/iiop/src/etc/conf/default/log4j.properties	2010-04-06 14:53:15 UTC (rev 103579)
+++ trunk/iiop/src/etc/conf/default/log4j.properties	2010-04-06 15:19:46 UTC (rev 103580)
@@ -33,7 +33,7 @@
 
 ### The console appender
 
-log4j.appender.Console=org.jboss.logging.log4j.ConsoleAppender
+log4j.appender.Console=org.apache.log4j.ConsoleAppender
 log4j.appender.Console.Threshold=INFO
 log4j.appender.Console.layout=org.apache.log4j.PatternLayout
 
@@ -57,9 +57,9 @@
 # by the JBoss internals to diagnose low level details. This example
 # turns on TRACE level msgs for the org.jboss.ejb.plugins package and its
 # subpackages. This will produce A LOT of logging output.
-#log4j.category.org.jboss.ejb.plugins=TRACE#org.jboss.logging.TracePriority
-#log4j.category.org.jboss.system=TRACE#org.jboss.logging.TracePriority
+#log4j.category.org.jboss.ejb.plugins=TRACE
+#log4j.category.org.jboss.system=TRACE
 
-log4j.category.org.jboss.iiop=TRACE#org.jboss.logging.TracePriority
-log4j.category.org.jboss.ejb.plugins.iiop=TRACE#org.jboss.logging.TracePriority
-log4j.category.org.jboss.proxy.compiler=TRACE#org.jboss.logging.TracePriority
+log4j.category.org.jboss.iiop=TRACE
+log4j.category.org.jboss.ejb.plugins.iiop=TRACE
+log4j.category.org.jboss.proxy.compiler=TRACE

Modified: trunk/security/src/test/java/org/jboss/test/ldap/LoginModulesTestCase.java
===================================================================
--- trunk/security/src/test/java/org/jboss/test/ldap/LoginModulesTestCase.java	2010-04-06 14:53:15 UTC (rev 103579)
+++ trunk/security/src/test/java/org/jboss/test/ldap/LoginModulesTestCase.java	2010-04-06 15:19:46 UTC (rev 103580)
@@ -56,7 +56,6 @@
       {
          Configuration.setConfiguration(new TestConfig());
          System.out.println("Installed TestConfig as JAAS Configuration");
-         Logger.setPluginClassName("org.jboss.logging.JDK14LoggerPlugin");
          java.util.logging.Logger security = java.util.logging.Logger.getLogger("org.jboss.security");
          security.setLevel(Level.FINEST);
          ConsoleHandler console = new ConsoleHandler();

Modified: trunk/system/src/resources/tests/conf/test-log4j.xml
===================================================================
--- trunk/system/src/resources/tests/conf/test-log4j.xml	2010-04-06 14:53:15 UTC (rev 103579)
+++ trunk/system/src/resources/tests/conf/test-log4j.xml	2010-04-06 15:19:46 UTC (rev 103580)
@@ -9,18 +9,10 @@
   <!-- Preserve messages in a local file -->
   <!-- ================================= -->
 
-  <!-- A time/date based rolling appender -->
-  <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+  <appender name="FILE" class="org.apache.log4j.FileAppender">
     <param name="File" value="${build.testlog}/test.log"/>
     <param name="Append" value="true"/>
 
-    <!-- Rollover at midnight each day -->
-    <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
-    <!-- Rollover at the top of each hour
-    <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
-    -->
-
     <layout class="org.apache.log4j.PatternLayout">
       <!-- The default pattern: Date Priority [Category] Message\n -->
       <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>




More information about the jboss-cvs-commits mailing list