[jboss-cvs] JBossAS SVN: r103581 - in trunk: tomcat/src/resources/test and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Apr 6 11:27:26 EDT 2010
Author: david.lloyd at jboss.com
Date: 2010-04-06 11:27:26 -0400 (Tue, 06 Apr 2010)
New Revision: 103581
Removed:
trunk/system/src/resources/dtd/jdklogger.dtd
Modified:
trunk/tomcat/src/resources/test/log4j.xml
Log:
Yet more removal and change of defunct logging stuff
Deleted: trunk/system/src/resources/dtd/jdklogger.dtd
===================================================================
--- trunk/system/src/resources/dtd/jdklogger.dtd 2010-04-06 15:19:46 UTC (rev 103580)
+++ trunk/system/src/resources/dtd/jdklogger.dtd 2010-04-06 15:27:26 UTC (rev 103581)
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!--
-A dtd for the org.jboss.logging.jdk.xml.DOMConfigurator that is similar
-to the log4j.xml format.
-$Id$
--->
-
-<!-- A configuration element consists of optional renderer
-elements,appender elements, categories and an optional root
-element. -->
-
-<!ELEMENT jdk:configuration (renderer*, appender*,(category|logger)*,root?,
- categoryFactory?)>
-
-<!-- The "threshold" attribute takes a level value such that all -->
-<!-- logging statements with a level equal or below this value are -->
-<!-- disabled. -->
-
-<!-- Setting the "debug" enable the printing of internal jdk logging -->
-<!-- statements. -->
-
-<!-- By default, debug attribute is "null", meaning that we not do touch -->
-<!-- internal jdk logging settings. The "null" value for the threshold -->
-<!-- attribute can be misleading. The threshold field of a repository -->
-<!-- cannot be set to null. The "null" value for the threshold attribute -->
-<!-- simply means don't touch the threshold field, the threshold field -->
-<!-- keeps its old value. -->
-
-<!ATTLIST jdk:configuration
- threshold (all|debug|info|warn|error|fatal|off|null) "null"
- debug (true|false|null) "null"
->
-
-<!-- renderer elements allow the user to customize the conversion of -->
-<!-- message objects to String. -->
-
-<!ELEMENT renderer EMPTY>
-<!ATTLIST renderer
- renderedClass CDATA #REQUIRED
- renderingClass CDATA #REQUIRED
->
-
-<!-- Appenders must have a name and a class. -->
-<!-- Appenders may contain an error handler, a layout, optional parameters -->
-<!-- and filters. They may also reference (or include) other appenders. -->
-<!ELEMENT appender (errorHandler?, param*, layout?, filter*, appender-ref*)>
-<!ATTLIST appender
- name ID #REQUIRED
- class CDATA #REQUIRED
->
-
-<!ELEMENT layout (param*)>
-<!ATTLIST layout
- class CDATA #REQUIRED
->
-
-<!ELEMENT filter (param*)>
-<!ATTLIST filter
- class CDATA #REQUIRED
->
-
-<!-- ErrorHandlers can be of any class. They can admit any number of -->
-<!-- parameters. -->
-
-<!ELEMENT errorHandler (param*, root-ref?, logger-ref*, appender-ref?)>
-<!ATTLIST errorHandler
- class CDATA #REQUIRED
->
-
-<!ELEMENT root-ref EMPTY>
-
-<!ELEMENT logger-ref EMPTY>
-<!ATTLIST logger-ref
- ref IDREF #REQUIRED
->
-
-<!ELEMENT param EMPTY>
-<!ATTLIST param
- name CDATA #REQUIRED
- value CDATA #REQUIRED
->
-
-
-<!-- The priority class is org.apache.jdk.Level by default -->
-<!ELEMENT priority (param*)>
-<!ATTLIST priority
- class CDATA #IMPLIED
- value CDATA #REQUIRED
->
-
-<!-- The level class is org.apache.jdk.Level by default -->
-<!ELEMENT level (param*)>
-<!ATTLIST level
- class CDATA #IMPLIED
- value CDATA #REQUIRED
->
-
-
-<!-- If no level element is specified, then the configurator MUST not -->
-<!-- touch the level of the named category. -->
-<!ELEMENT category (param*,(priority|level)?,appender-ref*)>
-<!ATTLIST category
- class CDATA #IMPLIED
- name CDATA #REQUIRED
- additivity (true|false) "true"
->
-
-<!-- If no level element is specified, then the configurator MUST not -->
-<!-- touch the level of the named logger. -->
-<!ELEMENT logger (level?,appender-ref*)>
-<!ATTLIST logger
- name ID #REQUIRED
- additivity (true|false) "true"
->
-
-
-<!ELEMENT categoryFactory (param*)>
-<!ATTLIST categoryFactory
- class CDATA #REQUIRED>
-
-<!ELEMENT appender-ref EMPTY>
-<!ATTLIST appender-ref
- ref IDREF #REQUIRED
->
-
-<!-- If no priority element is specified, then the configurator MUST not -->
-<!-- touch the priority of root. -->
-<!-- The root category always exists and cannot be subclassed. -->
-<!ELEMENT root (param*, (priority|level)?, appender-ref*)>
-
-
-<!-- ==================================================================== -->
-<!-- A logging event -->
-<!-- ==================================================================== -->
-<!ELEMENT jdk:eventSet (jdk:event*)>
-<!ATTLIST jdk:eventSet
- xmlns:jdk CDATA #FIXED "http://jakarta.apache.org/jdk/"
- version (1.1|1.2) "1.2"
- includesLocationInfo (true|false) "true"
->
-
-
-
-<!ELEMENT jdk:event (jdk:message, jdk:NDC?, jdk:throwable?,
- jdk:locationInfo?) >
-
-<!-- The timestamp format is application dependent. -->
-<!ATTLIST jdk:event
- logger CDATA #REQUIRED
- level CDATA #REQUIRED
- thread CDATA #REQUIRED
- timestamp CDATA #REQUIRED
->
-
-<!ELEMENT jdk:message (#PCDATA)>
-<!ELEMENT jdk:NDC (#PCDATA)>
-
-<!ELEMENT jdk:throwable (#PCDATA)>
-
-<!ELEMENT jdk:locationInfo EMPTY>
-<!ATTLIST jdk:locationInfo
- class CDATA #REQUIRED
- method CDATA #REQUIRED
- file CDATA #REQUIRED
- line CDATA #REQUIRED
->
Modified: trunk/tomcat/src/resources/test/log4j.xml
===================================================================
--- trunk/tomcat/src/resources/test/log4j.xml 2010-04-06 15:19:46 UTC (rev 103580)
+++ trunk/tomcat/src/resources/test/log4j.xml 2010-04-06 15:27:26 UTC (rev 103581)
@@ -20,18 +20,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"/>
@@ -42,19 +34,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 -->
<!-- ============================== -->
More information about the jboss-cvs-commits
mailing list