Author: ate
Date: Tue Sep 22 14:04:53 2009
New Revision: 817667
URL: http://svn.apache.org/viewvc?rev=817667&view=rev
Log:
JS2-1066: Replace Jetspeed provided log4j.properties with log4j.xml to ensure
its not overruled by other log4j.xml configurations embedded as resource in
jars on the classpath
Added:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/resources/log4j.dtd
(with props)
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/resources/log4j.xml
(with props)
Removed:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/resources/log4j.properties
Added:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/resources/log4j.dtd
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/resources/log4j.dtd?rev=817667&view=auto
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/resources/log4j.dtd
(added)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/resources/log4j.dtd
Tue Sep 22 14:04:53 2009
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!-- Authors: Chris Taylor, Ceki Gulcu. -->
+
+<!-- Version: 1.2 -->
+
+<!-- A configuration element consists of optional renderer
+elements,appender elements, categories and an optional root
+element. -->
+
+<!ELEMENT log4j: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 log4j logging -->
+<!-- statements. -->
+
+<!-- By default, debug attribute is "null", meaning that we not do touch -->
+<!-- internal log4j 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 log4j:configuration
+ xmlns:log4j CDATA #FIXED "http://jakarta.apache.org/log4j/";
+ 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.log4j.Level by default -->
+<!ELEMENT priority (param*)>
+<!ATTLIST priority
+ class CDATA #IMPLIED
+ value CDATA #REQUIRED
+>
+
+<!-- The level class is org.apache.log4j.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 log4j:eventSet (log4j:event*)>
+<!ATTLIST log4j:eventSet
+ xmlns:log4j CDATA #FIXED "http://jakarta.apache.org/log4j/";
+ version (1.1|1.2) "1.2"
+ includesLocationInfo (true|false) "true"
+>
+
+
+
+<!ELEMENT log4j:event (log4j:message, log4j:NDC?, log4j:throwable?,
+ log4j:locationInfo?) >
+
+<!-- The timestamp format is application dependent. -->
+<!ATTLIST log4j:event
+ logger CDATA #REQUIRED
+ level CDATA #REQUIRED
+ thread CDATA #REQUIRED
+ timestamp CDATA #REQUIRED
+>
+
+<!ELEMENT log4j:message (#PCDATA)>
+<!ELEMENT log4j:NDC (#PCDATA)>
+
+<!ELEMENT log4j:throwable (#PCDATA)>
+
+<!ELEMENT log4j:locationInfo EMPTY>
+<!ATTLIST log4j:locationInfo
+ class CDATA #REQUIRED
+ method CDATA #REQUIRED
+ file CDATA #REQUIRED
+ line CDATA #REQUIRED
+>
Propchange:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/resources/log4j.dtd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/resources/log4j.dtd
------------------------------------------------------------------------------
svn:keywords = Id
Propchange:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/resources/log4j.dtd
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/resources/log4j.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/resources/log4j.xml?rev=817667&view=auto
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/resources/log4j.xml
(added)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/resources/log4j.xml
Tue Sep 22 14:04:53 2009
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Id$
+-->
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";>
+
+ <!-- ======================================================================
-->
+ <!-- A P P E N D E R S
-->
+ <!-- ======================================================================
-->
+
+ <!-- console -->
+ <appender name="console" class="org.apache.log4j.ConsoleAppender">
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} %-5p
[%C.%M():%L] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- jetspeed appender -->
+ <appender name="jetspeed" class="org.apache.log4j.FileAppender">
+ <param name="File" value="${org.apache.portals.logdir}/jetspeed.log"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} %-5p
[%C.%M():%L] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- diagnostics appender -->
+ <appender name="diagnostics" class="org.apache.log4j.FileAppender">
+ <param name="File"
value="${org.apache.portals.logdir}/jetspeed-diagnostics.log"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} %-5p
[%C.%M():%L] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- digester appender -->
+ <appender name="digester" class="org.apache.log4j.FileAppender">
+ <param name="File"
value="${org.apache.portals.logdir}/jetspeed-digester.log"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} %-5p
[%C.%M():%L] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- pluto appender -->
+ <appender name="pluto" class="org.apache.log4j.FileAppender">
+ <param name="File"
value="${org.apache.portals.logdir}/jetspeed-pluto.log"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} %-5p
[%C.%M():%L] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- deployment appender -->
+ <appender name="deployment" class="org.apache.log4j.FileAppender">
+ <param name="File"
value="${org.apache.portals.logdir}/jetspeed-deployment.log"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} %-5p
[%C.%M():%L] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- deployment appender -->
+ <appender name="scheduler" class="org.apache.log4j.FileAppender">
+ <param name="File"
value="${org.apache.portals.logdir}/jetspeed-scheduler.log"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} %-5p
[%C.%M():%L] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- velocity appender -->
+ <appender name="velocity" class="org.apache.log4j.FileAppender">
+ <param name="File"
value="${org.apache.portals.logdir}/jetspeed-velocity.log"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} %-5p
[%C.%M():%L] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ojb appender -->
+ <appender name="ojb" class="org.apache.log4j.FileAppender">
+ <param name="File" value="${org.apache.portals.logdir}/jetspeed-ojb.log"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} %-5p
[%C.%M():%L] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ======================================================================
-->
+ <!-- L O G G E R S
-->
+ <!-- ======================================================================
-->
+
+ <category additivity="false" name="org.apache.jetspeed">
+ <level value="ERROR"/>
+ <appender-ref ref="jetspeed"/>
+ </category>
+
+ <category additivity="false" name="org.apache.jetspeed.tools">
+ <level value="ERROR"/>
+ <appender-ref ref="jetspeed"/>
+ </category>
+
+ <category additivity="false" name="org.apache.portals.tutorials">
+ <level value="ERROR"/>
+ <appender-ref ref="jetspeed"/>
+ </category>
+
+ <category additivity="false" name="org.apache.commons.digester">
+ <level value="ERROR"/>
+ <appender-ref ref="digester"/>
+ </category>
+
+ <category additivity="false" name="diagnostics">
+ <level value="ERROR"/>
+ <appender-ref ref="diagnostics"/>
+ </category>
+
+ <category additivity="false" name="velocity">
+ <level value="ERROR"/>
+ <appender-ref ref="velocity"/>
+ </category>
+
+ <category additivity="false" name="org.apache.ojb">
+ <level value="ERROR"/>
+ <appender-ref ref="ojb"/>
+ </category>
+
+ <category additivity="false" name="scheduler">
+ <level value="ERROR"/>
+ <appender-ref ref="scheduler"/>
+ </category>
+
+ <category additivity="false" name="org.apache.pluto">
+ <level value="ERROR"/>
+ <appender-ref ref="pluto"/>
+ </category>
+
+ <category additivity="false" name="deployment">
+ <level value="ERROR"/>
+ <appender-ref ref="deployment"/>
+ </category>
+
+ <category additivity="false" name="console">
+ <level value="ERROR"/>
+ <appender-ref ref="console"/>
+ </category>
+
+ <root>
+ <level value="error"/>
+ <appender-ref ref="jetspeed"/>
+ </root>
+
+</log4j:configuration>
Propchange:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/resources/log4j.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/resources/log4j.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/resources/log4j.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
