logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggreg...@apache.org
Subject svn commit: r1514043 - in /logging/log4j/log4j2/trunk: core/src/test/resources/log4j-strict1.xml src/site/xdoc/manual/configuration.xml.vm
Date Wed, 14 Aug 2013 20:55:44 GMT
Author: ggregory
Date: Wed Aug 14 20:55:43 2013
New Revision: 1514043

URL: http://svn.apache.org/r1514043
Log:
[LOG4J2-353] Use consistent conventions in configuration files: Use CamelCase for XML elements.

Modified:
    logging/log4j/log4j2/trunk/core/src/test/resources/log4j-strict1.xml
    logging/log4j/log4j2/trunk/src/site/xdoc/manual/configuration.xml.vm

Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-strict1.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-strict1.xml?rev=1514043&r1=1514042&r2=1514043&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-strict1.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-strict1.xml Wed Aug 14 20:55:43
2013
@@ -20,21 +20,21 @@
   <properties>
     <property name="filename">target/test.log</property>
   </properties>
-  <filter type="ThresholdFilter" level="trace"/>
+  <Filter type="ThresholdFilter" level="trace"/>
 
   <appenders>
     <appender type="Console" name="STDOUT">
       <layout type="PatternLayout" pattern="%m MDC%X%n"/>
       <filters>
-        <filter type="MarkerFilter" marker="FLOW" onMatch="DENY" onMismatch="NEUTRAL"/>
-        <filter type="MarkerFilter" marker="EXCEPTION" onMatch="DENY" onMismatch="ACCEPT"/>
+        <Filter type="MarkerFilter" marker="FLOW" onMatch="DENY" onMismatch="NEUTRAL"/>
+        <Filter type="MarkerFilter" marker="EXCEPTION" onMatch="DENY" onMismatch="ACCEPT"/>
       </filters>
     </appender>
     <appender type="Console" name="FLOW">
       <layout type="PatternLayout" pattern="%C{1}.%M %m %ex%n"/>
       <filters>
-        <filter type="MarkerFilter" marker="FLOW" onMatch="ACCEPT" onMismatch="NEUTRAL"/>
-        <filter type="MarkerFilter" marker="EXCEPTION" onMatch="ACCEPT" onMismatch="DENY"/>
+        <Filter type="MarkerFilter" marker="FLOW" onMatch="ACCEPT" onMismatch="NEUTRAL"/>
+        <Filter type="MarkerFilter" marker="EXCEPTION" onMatch="ACCEPT" onMismatch="DENY"/>
       </filters>
     </appender>
     <appender type="File" name="File" fileName="${filename}">
@@ -48,7 +48,7 @@
 
   <loggers>
     <logger name="org.apache.logging.log4j.test1" level="debug" additivity="false">
-      <filter type="ThreadContextMapFilter">
+      <Filter type="ThreadContextMapFilter">
         <KeyValuePair key="test" value="123"/>
       </filter>
       <AppenderRef ref="STDOUT"/>

Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/configuration.xml.vm
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/configuration.xml.vm?rev=1514043&r1=1514042&r2=1514043&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/configuration.xml.vm (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/configuration.xml.vm Wed Aug 14 20:55:43
2013
@@ -430,16 +430,16 @@ public class Bar {
     <property name="name1">value</property>
     <property name="name2" value="value2"/>
   </properties>
-  <filter type="type" ... />
+  <Filter type="type" ... />
   <appenders>
     <appender type="type" name="name">
-      <filter type="type" ... />
+      <Filter type="type" ... />
     </appender>
     ...
   </appenders>
   <loggers>
     <logger name="name1">
-      <filter type="type" ... />
+      <Filter type="type" ... />
     </logger>
     ...
     <root level="level">
@@ -457,21 +457,21 @@ public class Bar {
   <properties>
     <property name="filename">target/test.log</property>
   </properties>
-  <filter type="ThresholdFilter" level="trace"/>
+  <Filter type="ThresholdFilter" level="trace"/>
 
   <appenders>
     <appender type="Console" name="STDOUT">
       <layout type="PatternLayout" pattern="%m MDC%X%n"/>
       <filters>
-        <filter type="MarkerFilter" marker="FLOW" onMatch="DENY" onMismatch="NEUTRAL"/>
-        <filter type="MarkerFilter" marker="EXCEPTION" onMatch="DENY" onMismatch="ACCEPT"/>
+        <Filter type="MarkerFilter" marker="FLOW" onMatch="DENY" onMismatch="NEUTRAL"/>
+        <Filter type="MarkerFilter" marker="EXCEPTION" onMatch="DENY" onMismatch="ACCEPT"/>
       </filters>
     </appender>
     <appender type="Console" name="FLOW">
       <layout type="PatternLayout" pattern="%C{1}.%M %m %ex%n"/><!-- class &
line number -->
       <filters>
-        <filter type="MarkerFilter" marker="FLOW" onMatch="ACCEPT" onMismatch="NEUTRAL"/>
-        <filter type="MarkerFilter" marker="EXCEPTION" onMatch="ACCEPT" onMismatch="DENY"/>
+        <Filter type="MarkerFilter" marker="FLOW" onMatch="ACCEPT" onMismatch="NEUTRAL"/>
+        <Filter type="MarkerFilter" marker="EXCEPTION" onMatch="ACCEPT" onMismatch="DENY"/>
       </filters>
     </appender>
     <appender type="File" name="File" fileName="${filename}">
@@ -485,7 +485,7 @@ public class Bar {
 
   <loggers>
     <logger name="org.apache.logging.log4j.test1" level="debug" additivity="false">
-      <filter type="ThreadContextMapFilter">
+      <Filter type="ThreadContextMapFilter">
         <KeyValuePair key="test" value="123"/>
       </filter>
       <AppenderRef ref="STDOUT"/>



Mime
View raw message