[prev in list] [next in list] [prev in thread] [next in thread]
List: log4cxx-dev
Subject: svn commit: r577904 - in /logging/log4cxx/trunk/src:
From: carnold () apache ! org
Date: 2007-09-20 20:16:22
Message-ID: 20070920201622.E6E041A9832 () eris ! apache ! org
[Download RAW message or body]
Author: carnold
Date: Thu Sep 20 13:16:21 2007
New Revision: 577904
URL: http://svn.apache.org/viewvc?rev=577904&view=rev
Log:
LOGCXX-168: log4j.dtd does not contain rollingPolicy and other o.a.l.r.RFA elements
Removed:
logging/log4cxx/trunk/src/test/resources/log4j.dtd
Modified:
logging/log4cxx/trunk/src/main/cpp/domconfigurator.cpp
logging/log4cxx/trunk/src/main/include/log4cxx/xml/domconfigurator.h
logging/log4cxx/trunk/src/main/include/log4cxx/xml/xmllayout.h
logging/log4cxx/trunk/src/test/resources/input/xml/log4j.dtd
Modified: logging/log4cxx/trunk/src/main/cpp/domconfigurator.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/domconfigurator.cpp?rev=577904&r1=577903&r2=577904&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/domconfigurator.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/domconfigurator.cpp Thu Sep 20 13:16:21 2007
@@ -741,12 +741,6 @@
}
#endif
-/**
- Used internally to configure the log4j framework by parsing a DOM
- tree of XML elements based on <a
- href="doc-files/log4j.dtd">log4j.dtd</a>.
-
-*/
void DOMConfigurator::parse(apr_xml_elem* element,
apr_xml_doc* doc,
AppenderMap& appenders)
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/xml/domconfigurator.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/xml/domconfigurator.h?rev=577904&r1=577903&r2=577904&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/xml/domconfigurator.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/xml/domconfigurator.h Thu Sep 20 \
13:16:21 2007 @@ -180,10 +180,8 @@
config::PropertySetter& propSetter);
/**
- Used internally to configure the log4cxx framework by \
parsing a DOM
- tree of XML elements based on <a
- href="docs/log4j.dtd">log4j.dtd</a>.
-
+ Used internally to configure the log4cxx framework from
+ an in-memory representation of an XML document.
*/
void parse(apr_xml_elem* element,
apr_xml_doc* doc,
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/xml/xmllayout.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/xml/xmllayout.h?rev=577904&r1=577903&r2=577904&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/xml/xmllayout.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/xml/xmllayout.h Thu Sep 20 \
13:16:21 2007 @@ -29,8 +29,7 @@
/**
The output of the XMLLayout consists of a series of log4j:event
- elements as defined in the <a
- href="doc-files/log4j.dtd">log4j.dtd</a>. It does not output a
+ elements. It does not output a
complete well-formed XML file. The output is designed to be
included as an <em>external entity</em> in a separate file to form
a correct XML file.
@@ -41,7 +40,7 @@
<code>
<?xml version="1.0" ?>
- <!DOCTYPE log4j:eventSet SYSTEM "log4j.dtd" [<!ENTITY data SYSTEM \
"abc">]> + <!DOCTYPE log4j:eventSet [<!ENTITY data SYSTEM "abc">]>
<log4j:eventSet version="1.2" \
xmlns:log4j="http://jakarta.apache.org/log4j/">
Modified: logging/log4cxx/trunk/src/test/resources/input/xml/log4j.dtd
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/resources/input/xml/log4j.dtd?rev=577904&r1=577903&r2=577904&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/resources/input/xml/log4j.dtd (original)
+++ logging/log4cxx/trunk/src/test/resources/input/xml/log4j.dtd Thu Sep 20 13:16:21 \
2007 @@ -14,7 +14,6 @@
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.
-
-->
<!-- Authors: Chris Taylor, Ceki Gulcu. -->
@@ -25,12 +24,11 @@
elements,appender elements, categories and an optional root
element. -->
-<!ELEMENT log4j:configuration (renderer*, appender*,(category|logger)*,root?,
- categoryFactory?)>
+<!ELEMENT log4j:configuration (renderer*, appender*,plugin*, \
(category|logger)*,root?, + \
(categoryFactory|loggerFactory)?)>
-<!-- The "threshold" attribute takes a level value such that all -->
-<!-- logging statements with a level equal or below this value are -->
-<!-- disabled. -->
+<!-- The "threshold" attribute takes a level value below which -->
+<!-- all logging statements are disabled. -->
<!-- Setting the "debug" enable the printing of internal log4j logging -->
<!-- statements. -->
@@ -44,8 +42,9 @@
<!ATTLIST log4j:configuration
xmlns:log4j CDATA #FIXED "http://jakarta.apache.org/log4j/"
- threshold (all|debug|info|warn|error|fatal|off|null) "null"
+ threshold (all|trace|debug|info|warn|error|fatal|off|null) "null"
debug (true|false|null) "null"
+ reset (true|false) "false"
>
<!-- renderer elements allow the user to customize the conversion of -->
@@ -60,9 +59,11 @@
<!-- 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*)>
+<!ELEMENT appender (errorHandler?, param*,
+ rollingPolicy?, triggeringPolicy?, connectionSource?,
+ layout?, filter*, appender-ref*)>
<!ATTLIST appender
- name ID #REQUIRED
+ name CDATA #REQUIRED
class CDATA #REQUIRED
>
@@ -88,7 +89,7 @@
<!ELEMENT logger-ref EMPTY>
<!ATTLIST logger-ref
- ref IDREF #REQUIRED
+ ref CDATA #REQUIRED
>
<!ELEMENT param EMPTY>
@@ -126,7 +127,7 @@
<!-- touch the level of the named logger. -->
<!ELEMENT logger (level?,appender-ref*)>
<!ATTLIST logger
- name ID #REQUIRED
+ name CDATA #REQUIRED
additivity (true|false) "true"
>
@@ -135,11 +136,45 @@
<!ATTLIST categoryFactory
class CDATA #REQUIRED>
+<!ELEMENT loggerFactory (param*)>
+<!ATTLIST loggerFactory
+ class CDATA #REQUIRED>
+
<!ELEMENT appender-ref EMPTY>
<!ATTLIST appender-ref
- ref IDREF #REQUIRED
+ ref CDATA #REQUIRED
+>
+
+<!-- plugins must have a name and class and can have optional parameters -->
+<!ELEMENT plugin (param*, connectionSource?)>
+<!ATTLIST plugin
+ name CDATA #REQUIRED
+ class CDATA #REQUIRED
+>
+
+<!ELEMENT connectionSource (dataSource?, param*)>
+<!ATTLIST connectionSource
+ class CDATA #REQUIRED
+>
+
+<!ELEMENT dataSource (param*)>
+<!ATTLIST dataSource
+ class CDATA #REQUIRED
+>
+
+<!ELEMENT triggeringPolicy ((param|filter)*)>
+<!ATTLIST triggeringPolicy
+ name CDATA #IMPLIED
+ class CDATA #REQUIRED
+>
+
+<!ELEMENT rollingPolicy (param*)>
+<!ATTLIST rollingPolicy
+ name CDATA #IMPLIED
+ class CDATA #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. -->
@@ -159,7 +194,7 @@
<!ELEMENT log4j:event (log4j:message, log4j:NDC?, log4j:throwable?,
- log4j:locationInfo?) >
+ log4j:locationInfo?, log4j:properties?) >
<!-- The timestamp format is application dependent. -->
<!ATTLIST log4j:event
@@ -167,6 +202,7 @@
level CDATA #REQUIRED
thread CDATA #REQUIRED
timestamp CDATA #REQUIRED
+ time CDATA #IMPLIED
>
<!ELEMENT log4j:message (#PCDATA)>
@@ -180,4 +216,12 @@
method CDATA #REQUIRED
file CDATA #REQUIRED
line CDATA #REQUIRED
+>
+
+<!ELEMENT log4j:properties (log4j:data*)>
+
+<!ELEMENT log4j:data EMPTY>
+<!ATTLIST log4j:data
+ name CDATA #REQUIRED
+ value CDATA #REQUIRED
>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic