You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2013/08/15 03:43:50 UTC
svn commit: r1514121 [2/2] - in /logging/log4j/log4j2/trunk:
core/src/test/resources/ core/src/test/resources/bad/
core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/
core/src/test/resources/org/apache/logging/log4j/core/appender/db...
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/perf4PlainLocation.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/perf4PlainLocation.xml?rev=1514121&r1=1514120&r2=1514121&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/perf4PlainLocation.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/perf4PlainLocation.xml Thu Aug 15 01:43:48 2013
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<configuration status="OFF">
+<Configuration status="OFF">
<appenders>
<RandomAccessFile name="RandomAccessFile" fileName="perftest.log" immediateFlush="false" append="false">
<PatternLayout>
@@ -12,4 +12,4 @@
<AppenderRef ref="RandomAccessFile"/>
</root>
</loggers>
-</configuration>
+</Configuration>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/perf5AsyncApndNoLoc.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/perf5AsyncApndNoLoc.xml?rev=1514121&r1=1514120&r2=1514121&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/perf5AsyncApndNoLoc.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/perf5AsyncApndNoLoc.xml Thu Aug 15 01:43:48 2013
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<configuration status="OFF">
+<Configuration status="OFF">
<appenders>
<RandomAccessFile name="RandomAccessFile" fileName="perftest.log" immediateFlush="false" append="false">
<PatternLayout>
@@ -15,4 +15,4 @@
<AppenderRef ref="Async"/>
</root>
</loggers>
-</configuration>
+</Configuration>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/perf6AsyncApndLoc.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/perf6AsyncApndLoc.xml?rev=1514121&r1=1514120&r2=1514121&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/perf6AsyncApndLoc.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/perf6AsyncApndLoc.xml Thu Aug 15 01:43:48 2013
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<configuration status="OFF">
+<Configuration status="OFF">
<appenders>
<RandomAccessFile name="RandomAccessFile" fileName="perftest.log" immediateFlush="false" append="false">
<PatternLayout>
@@ -15,4 +15,4 @@
<AppenderRef ref="Async"/>
</root>
</loggers>
-</configuration>
+</Configuration>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/perf7MixedNoLoc.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/perf7MixedNoLoc.xml?rev=1514121&r1=1514120&r2=1514121&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/perf7MixedNoLoc.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/perf7MixedNoLoc.xml Thu Aug 15 01:43:48 2013
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<configuration status="OFF">
+<Configuration status="OFF">
<appenders>
<RandomAccessFile name="RandomAccessFile" fileName="perftest.log" immediateFlush="false" append="false">
<PatternLayout>
@@ -12,4 +12,4 @@
<AppenderRef ref="RandomAccessFile"/>
</asyncRoot>
</loggers>
-</configuration>
+</Configuration>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/perf8MixedLoc.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/perf8MixedLoc.xml?rev=1514121&r1=1514120&r2=1514121&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/perf8MixedLoc.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/perf8MixedLoc.xml Thu Aug 15 01:43:48 2013
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<configuration status="OFF">
+<Configuration status="OFF">
<appenders>
<RandomAccessFile name="RandomAccessFile" fileName="perftest.log" immediateFlush="false" append="false">
<PatternLayout>
@@ -12,4 +12,4 @@
<AppenderRef ref="RandomAccessFile"/>
</asyncRoot>
</loggers>
-</configuration>
\ No newline at end of file
+</Configuration>
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/xml-events.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/xml-events.xml?rev=1514121&r1=1514120&r2=1514121&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/xml-events.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/xml-events.xml Thu Aug 15 01:43:48 2013
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<configuration status="error" name="MyApp" packages="">
+<Configuration status="error" name="MyApp" packages="">
<appenders>
<Console name="STDOUT">
<PatternLayout pattern="%d [%p] %c %m%n"/>
@@ -16,4 +16,4 @@
<AppenderRef ref="STDOUT"/>
</root>
</loggers>
-</configuration>
\ No newline at end of file
+</Configuration>
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/flume-ng/src/test/resources/default_embedded.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/test/resources/default_embedded.xml?rev=1514121&r1=1514120&r2=1514121&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/test/resources/default_embedded.xml (original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/test/resources/default_embedded.xml Thu Aug 15 01:43:48 2013
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<configuration status="warn" name="MyApp" packages="">
+<Configuration status="warn" name="MyApp" packages="">
<appenders>
<Flume name="eventLogger" ignoreExceptions="false" compress="true" type="embedded" dataDir="InMemory">
<Agent host="localhost" port="${sys:primaryPort}"/>
@@ -18,4 +18,4 @@
<AppenderRef ref="STDOUT"/>
</root>
</loggers>
-</configuration>
\ No newline at end of file
+</Configuration>
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/flume-ng/src/test/resources/embedded.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/test/resources/embedded.xml?rev=1514121&r1=1514120&r2=1514121&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/test/resources/embedded.xml (original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/test/resources/embedded.xml Thu Aug 15 01:43:48 2013
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<configuration status="warn" name="MyApp" packages="">
+<Configuration status="warn" name="MyApp" packages="">
<appenders>
<Flume name="eventLogger" ignoreExceptions="false" compress="true" type="embedded">
<Property name="channels">primary</Property>
@@ -38,4 +38,4 @@
<AppenderRef ref="STDOUT"/>
</root>
</loggers>
-</configuration>
\ No newline at end of file
+</Configuration>
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/flume-ng/src/test/resources/persistent.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/test/resources/persistent.xml?rev=1514121&r1=1514120&r2=1514121&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/test/resources/persistent.xml (original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/test/resources/persistent.xml Thu Aug 15 01:43:48 2013
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<configuration status="info" name="MyApp" packages="org.apache.logging.log4j.flume.test">
+<Configuration status="info" name="MyApp" packages="org.apache.logging.log4j.flume.test">
<appenders>
<Flume name="eventLogger" ignoreExceptions="false" compress="true" type="persistent" dataDir="target/persistent"
batchsize="100" maxDelay="500">
@@ -21,4 +21,4 @@
<AppenderRef ref="STDOUT"/>
</root>
</loggers>
-</configuration>
\ No newline at end of file
+</Configuration>
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/jcl-bridge/src/test/resources/log4j-test1.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/jcl-bridge/src/test/resources/log4j-test1.xml?rev=1514121&r1=1514120&r2=1514121&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/jcl-bridge/src/test/resources/log4j-test1.xml (original)
+++ logging/log4j/log4j2/trunk/jcl-bridge/src/test/resources/log4j-test1.xml Thu Aug 15 01:43:48 2013
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<configuration packages="org.apache.logging.log4j.test" status="debug" name="LoggerTest">
+<Configuration packages="org.apache.logging.log4j.test" status="debug" name="LoggerTest">
<properties>
<property name="filename">target/test.log</property>
</properties>
@@ -36,4 +36,4 @@
</root>
</loggers>
-</configuration>
\ No newline at end of file
+</Configuration>
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/log4j12-api/src/test/resources/log4j2-config.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/src/test/resources/log4j2-config.xml?rev=1514121&r1=1514120&r2=1514121&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/src/test/resources/log4j2-config.xml (original)
+++ logging/log4j/log4j2/trunk/log4j12-api/src/test/resources/log4j2-config.xml Thu Aug 15 01:43:48 2013
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<configuration name="ConfigTest" status="error" packages="org.apache.logging.log4j.test"
+<Configuration name="ConfigTest" status="error" packages="org.apache.logging.log4j.test"
monitorInterval="5">
<appenders>
<Console name="STDOUT">
@@ -36,4 +36,4 @@
<AppenderRef ref="STDOUT"/>
</root>
</loggers>
-</configuration>
\ No newline at end of file
+</Configuration>
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/samples/flume-embedded/src/main/resources/log4j-embedded.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/samples/flume-embedded/src/main/resources/log4j-embedded.xml?rev=1514121&r1=1514120&r2=1514121&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/samples/flume-embedded/src/main/resources/log4j-embedded.xml (original)
+++ logging/log4j/log4j2/trunk/samples/flume-embedded/src/main/resources/log4j-embedded.xml Thu Aug 15 01:43:48 2013
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<configuration status="debug" name="Flume" verbose="false" monitorInterval="30">
+<Configuration status="debug" name="Flume" verbose="false" monitorInterval="30">
<MarkerFilter marker="EVENT" onMatch="ACCEPT" onMismatch="NEUTRAL" />
<appenders>
@@ -46,4 +46,4 @@
<AppenderRef ref="RollingFile" />
</root>
</loggers>
-</configuration>
+</Configuration>
Modified: logging/log4j/log4j2/trunk/samples/flume-remote/src/main/resources/log4j-remote.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/samples/flume-remote/src/main/resources/log4j-remote.xml?rev=1514121&r1=1514120&r2=1514121&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/samples/flume-remote/src/main/resources/log4j-remote.xml (original)
+++ logging/log4j/log4j2/trunk/samples/flume-remote/src/main/resources/log4j-remote.xml Thu Aug 15 01:43:48 2013
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<configuration status="debug" name="Flume" verbose="false" monitorInterval="30">
+<Configuration status="debug" name="Flume" verbose="false" monitorInterval="30">
<MarkerFilter marker="EVENT" onMatch="ACCEPT" onMismatch="NEUTRAL" />
<appenders>
@@ -46,4 +46,4 @@
<AppenderRef ref="RollingFile" />
</root>
</loggers>
-</configuration>
+</Configuration>
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=1514121&r1=1514120&r2=1514121&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 Thu Aug 15 01:43:48 2013
@@ -153,7 +153,7 @@ public class Bar {
configuration equivalent to the default would look like:
<pre class="prettyprint linenums"><![CDATA[
<?xml version="1.0" encoding="UTF-8"?>
-<configuration status="WARN">
+<Configuration status="WARN">
<appenders>
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
@@ -164,7 +164,7 @@ public class Bar {
<AppenderRef ref="Console"/>
</root>
</loggers>
-</configuration>]]></pre>
+</Configuration>]]></pre>
Once the file above is placed into the classpath as log4j2.xml you will get results identical to
those listed above. Changing the root level to trace will result in results similar to:
<pre>
@@ -202,7 +202,7 @@ public class Bar {
</p>
<pre class="prettyprint linenums"><![CDATA[
<?xml version="1.0" encoding="UTF-8"?>
-<configuration status="WARN">
+<Configuration status="WARN">
<appenders>
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
@@ -216,7 +216,7 @@ public class Bar {
<AppenderRef ref="Console"/>
</root>
</loggers>
-</configuration>]]></pre>
+</Configuration>]]></pre>
<p>would result in</p>
<pre class="prettyprint linenums">
17:13:01.540 [main] TRACE com.foo.Bar - entry
@@ -234,7 +234,7 @@ public class Bar {
and so it is possible to disable it by setting the additivity attribute on the logger to false:
</p>
<pre class="prettyprint linenums"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<configuration status="WARN">
+<Configuration status="WARN">
<appenders>
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
@@ -248,7 +248,7 @@ public class Bar {
<AppenderRef ref="Console"/>
</root>
</loggers>
-</configuration>]]></pre>
+</Configuration>]]></pre>
<p>
Once an event reaches a logger with its additivity set to false the event will not be passed to
any of its parent loggers, regardless of their additivity setting.
@@ -266,9 +266,9 @@ public class Bar {
</p>
<pre class="prettyprint linenums"><![CDATA[
<?xml version="1.0" encoding="UTF-8"?>
-<configuration monitorInterval="30">
+<Configuration monitorInterval="30">
...
-</configuration>]]></pre>
+</Configuration>]]></pre>
</subsection>
<a name="AdvertisingAppenderConfigurations"/>
<subsection name="Advertising Appender Configurations">
@@ -295,9 +295,9 @@ public class Bar {
</p>
<pre class="prettyprint linenums"><![CDATA[
<?xml version="1.0" encoding="UTF-8"?>
-<configuration advertiser="multicastdns">
+<Configuration advertiser="multicastdns">
...
-</configuration>
+</Configuration>
<appenders>
<File name="File1" fileName="target/test.log" bufferedIO="false" advertiseURI="file://path/to/output.log" advertise="true">
...
@@ -411,7 +411,7 @@ public class Bar {
<AppenderRef ref="name"/>
</root>
</loggers>
-</configuration>]]></pre>
+</Configuration>]]></pre>
<p>
See the many examples on this page for sample appender, filter and logger declarations.
</p>
@@ -446,13 +446,13 @@ public class Bar {
<AppenderRef ref="name"/>
</root>
</loggers>
-</configuration>]]></pre>
+</Configuration>]]></pre>
<p>
Below is a sample configuration using the strict format.
</p>
<pre class="prettyprint linenums"><![CDATA[
<?xml version="1.0" encoding="UTF-8"?>
-<configuration status="debug" strict="true" name="XMLConfigTest"
+<Configuration status="debug" strict="true" name="XMLConfigTest"
packages="org.apache.logging.log4j.test">
<properties>
<property name="filename">target/test.log</property>
@@ -500,7 +500,7 @@ public class Bar {
</root>
</loggers>
-</configuration>]]></pre>
+</Configuration>]]></pre>
<a name="JSON"/>
<h4>Configuration with JSON</h4>
<p>
@@ -686,7 +686,7 @@ public class Bar {
shows how multiple filters can be configured on the ConsoleAppender.
</p>
<pre class="prettyprint linenums"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<configuration status="debug" name="XMLConfigTest" packages="org.apache.logging.log4j.test">
+<Configuration status="debug" name="XMLConfigTest" packages="org.apache.logging.log4j.test">
<properties>
<property name="filename">target/test.log</property>
</properties>
@@ -736,7 +736,7 @@ public class Bar {
</root>
</loggers>
-</configuration>]]></pre>
+</Configuration>]]></pre>
</subsection>
<a name="PropertySubstitution"/>
<subsection name="Property Substitution">
@@ -752,7 +752,7 @@ public class Bar {
shows the filename for the rolling file appender being declared as a property.
</p>
<pre class="prettyprint linenums"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<configuration status="debug" name="RoutingTest" packages="org.apache.logging.log4j.test">
+<Configuration status="debug" name="RoutingTest" packages="org.apache.logging.log4j.test">
<properties>
<property name="filename">target/rolling1/rollingtest-${dollar}${dollar}{sd:type}.log</property>
</properties>
@@ -792,7 +792,7 @@ public class Bar {
</root>
</loggers>
-</configuration>]]></pre>
+</Configuration>]]></pre>
<p>
While this is useful, there are many more places properties can originate from. To accommodate this,
Log4j also supports the syntax <code>${dollar}{prefix:name}</code> where the prefix identifies tells Log4j
@@ -860,7 +860,7 @@ public class Bar {
<property name="type">Audit</property>
</properties>
...
-</configuration>]]></pre>
+</Configuration>]]></pre>
<p>
<i>As a footnote, it is worth pointing out that the variables in the RollingFile appender declaration
will also not be evaluated when the configuration is processed. This is simply because the resolution
@@ -891,7 +891,7 @@ public class Bar {
configuration has the status attribute set to debug.
<pre class="prettyprint linenums"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>;
-<configuration status="debug" name="RoutingTest"
+<Configuration status="debug" name="RoutingTest"
packages="org.apache.logging.log4j.test">
<properties>
<property name="filename">target/rolling1/rollingtest-${dollar}${dollar}{sd:type}.log</property>
@@ -932,7 +932,7 @@ public class Bar {
</root>
</loggers>
-</configuration>]]></pre>
+</Configuration>]]></pre>
During startup this configuration produces:
#if ($isPDF)
<pre>
Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/filters.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/filters.xml?rev=1514121&r1=1514120&r2=1514121&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/filters.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/filters.xml Thu Aug 15 01:43:48 2013
@@ -96,7 +96,7 @@
A configuration containing the BurstFilter might look like:
<pre class="prettyprint linenums"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<configuration status="warn" name="MyApp" packages="">
+<Configuration status="warn" name="MyApp" packages="">
<appenders>
<RollingFile name="RollingFile" fileName="logs/app.log"
filePattern="logs/app-%d{MM-dd-yyyy}.log.gz">
@@ -112,7 +112,7 @@
<AppenderRef ref="RollingFile"/>
</root>
</loggers>
-</configuration>]]></pre>
+</Configuration>]]></pre>
</p>
</subsection>
<a name="CompositeFilter"/>
@@ -126,7 +126,7 @@
A configuration containing the CompositeFilter might look like:
<pre class="prettyprint linenums"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<configuration status="warn" name="MyApp" packages="">
+<Configuration status="warn" name="MyApp" packages="">
<filters>
<Marker marker="EVENT" onMatch="ACCEPT" onMismatch="NEUTRAL"/>
<DynamicThresholdFilter key="loginId" defaultThreshold="ERROR"
@@ -157,7 +157,7 @@
<AppenderRef ref="RollingFile"/>
</root>
</loggers>
-</configuration>]]></pre>
+</Configuration>]]></pre>
</p>
</subsection>
<a name="DynamicThresholdFilter"/>
@@ -203,7 +203,7 @@
Here is a sample configuration containing the DynamicThresholdFilter:
<pre class="prettyprint linenums"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<configuration status="warn" name="MyApp" packages="">
+<Configuration status="warn" name="MyApp" packages="">
<DynamicThresholdFilter key="loginId" defaultThreshold="ERROR"
onMatch="ACCEPT" onMismatch="NEUTRAL">
<KeyValuePair key="User1" value="DEBUG"/>
@@ -223,7 +223,7 @@
<AppenderRef ref="RollingFile"/>
</root>
</loggers>
-</configuration>]]></pre>
+</Configuration>]]></pre>
</p>
</subsection>
<a name="MapFilter"/>
@@ -267,7 +267,7 @@
As in this configuration, the MapFilter can be used to log particular events:
<pre class="prettyprint linenums"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<configuration status="warn" name="MyApp" packages="">
+<Configuration status="warn" name="MyApp" packages="">
<MapFilter onMatch="ACCEPT" onMismatch="NEUTRAL" operator="or">
<KeyValuePair key="eventId" value="Login"/>
<KeyValuePair key="eventId" value="Logout"/>
@@ -287,14 +287,14 @@
<AppenderRef ref="RollingFile"/>
</root>
</loggers>
-</configuration>]]></pre>
+</Configuration>]]></pre>
</p>
<p>
This sample configuration will exhibit the same behavior as the preceding example since the only
logger configured is the root.
<pre class="prettyprint linenums"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<configuration status="warn" name="MyApp" packages="">
+<Configuration status="warn" name="MyApp" packages="">
<appenders>
<RollingFile name="RollingFile" fileName="logs/app.log"
filePattern="logs/app-%d{MM-dd-yyyy}.log.gz">
@@ -315,14 +315,14 @@
</AppenderRef>
</root>
</loggers>
-</configuration>]]></pre>
+</Configuration>]]></pre>
</p>
<p>
This third sample configuration will exhibit the same behavior as the preceding examples since the only
logger configured is the root and the root is only configured with a single appender reference.
<pre class="prettyprint linenums"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<configuration status="warn" name="MyApp" packages="">
+<Configuration status="warn" name="MyApp" packages="">
<appenders>
<RollingFile name="RollingFile" fileName="logs/app.log"
filePattern="logs/app-%d{MM-dd-yyyy}.log.gz">
@@ -343,7 +343,7 @@
</AppenderRef>
</root>
</loggers>
-</configuration>]]></pre>
+</Configuration>]]></pre>
</p>
</subsection>
<a name="MarkerFilter"/>
@@ -383,7 +383,7 @@
A sample configuration that only allows the event to be written by the appender if the Marker matches:
<pre class="prettyprint linenums"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<configuration status="warn" name="MyApp" packages="">
+<Configuration status="warn" name="MyApp" packages="">
<appenders>
<RollingFile name="RollingFile" fileName="logs/app.log"
filePattern="logs/app-%d{MM-dd-yyyy}.log.gz">
@@ -399,7 +399,7 @@
<AppenderRef ref="RollingFile"/>
</root>
</loggers>
-</configuration>]]></pre>
+</Configuration>]]></pre>
</p>
</subsection>
<a name="RegexFilter"/>
@@ -443,7 +443,7 @@
A sample configuration that only allows the event to be written by the appender if it contains the word "test":
<pre class="prettyprint linenums"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<configuration status="warn" name="MyApp" packages="">
+<Configuration status="warn" name="MyApp" packages="">
<appenders>
<RollingFile name="RollingFile" fileName="logs/app.log"
filePattern="logs/app-%d{MM-dd-yyyy}.log.gz">
@@ -459,7 +459,7 @@
<AppenderRef ref="RollingFile"/>
</root>
</loggers>
-</configuration>]]></pre>
+</Configuration>]]></pre>
</p>
</subsection>
<a name="StructuredDataFilter"/>
@@ -506,7 +506,7 @@
As in this configuration, the StructuredDataFilter can be used to log particular events:
<pre class="prettyprint linenums"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<configuration status="warn" name="MyApp" packages="">
+<Configuration status="warn" name="MyApp" packages="">
<StructuredDataFilter onMatch="ACCEPT" onMismatch="NEUTRAL" operator="or">
<KeyValuePair key="id" value="Login"/>
<KeyValuePair key="id" value="Logout"/>
@@ -526,7 +526,7 @@
<AppenderRef ref="RollingFile"/>
</root>
</loggers>
-</configuration>]]></pre>
+</Configuration>]]></pre>
</p>
</subsection>
<a name="ThreadContextMapFilter"/>
@@ -570,7 +570,7 @@
A configuration containing the ThreadContextMapFilter might look like:
<pre class="prettyprint linenums"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<configuration status="warn" name="MyApp" packages="">
+<Configuration status="warn" name="MyApp" packages="">
<ThreadContextMapFilter onMatch="ACCEPT" onMismatch="NEUTRAL" operator="or">
<KeyValuePair key="User1" value="DEBUG"/>
<KeyValuePair key="User2" value="WARN"/>
@@ -590,12 +590,12 @@
<AppenderRef ref="RollingFile"/>
</root>
</loggers>
-</configuration>]]></pre>
+</Configuration>]]></pre>
</p>
<p>
The ThreadContextMapFilter can also be applied to a logger for filtering:
<pre class="prettyprint linenums"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<configuration status="warn" name="MyApp" packages="">
+<Configuration status="warn" name="MyApp" packages="">
<appenders>
<RollingFile name="RollingFile" fileName="logs/app.log"
filePattern="logs/app-%d{MM-dd-yyyy}.log.gz">
@@ -615,7 +615,7 @@
</ThreadContextMapFilter>
</root>
</loggers>
-</configuration>
+</Configuration>
]]></pre>
</p>
</subsection>
@@ -657,7 +657,7 @@
A sample configuration that only allows the event to be written by the appender if the level matches:
<pre class="prettyprint linenums"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<configuration status="warn" name="MyApp" packages="">
+<Configuration status="warn" name="MyApp" packages="">
<appenders>
<RollingFile name="RollingFile" fileName="logs/app.log"
filePattern="logs/app-%d{MM-dd-yyyy}.log.gz">
@@ -673,7 +673,7 @@
<AppenderRef ref="RollingFile"/>
</root>
</loggers>
-</configuration>]]></pre>
+</Configuration>]]></pre>
</p>
</subsection>
<a name="TimeFilter"/>
@@ -727,7 +727,7 @@
day using the default timezone:
<pre class="prettyprint linenums"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<configuration status="warn" name="MyApp" packages="">
+<Configuration status="warn" name="MyApp" packages="">
<appenders>
<RollingFile name="RollingFile" fileName="logs/app.log"
filePattern="logs/app-%d{MM-dd-yyyy}.log.gz">
@@ -743,7 +743,7 @@
<AppenderRef ref="RollingFile"/>
</root>
</loggers>
-</configuration>]]></pre>
+</Configuration>]]></pre>
</p>
</subsection>
</section>
Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/flowtracing.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/flowtracing.xml?rev=1514121&r1=1514120&r2=1514121&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/flowtracing.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/flowtracing.xml Thu Aug 15 01:43:48 2013
@@ -140,7 +140,7 @@ public class App {
</p>
<pre class="prettyprint linenums"><![CDATA[
<?xml version="1.0" encoding="UTF-8"?>
-<configuration status="error">
+<Configuration status="error">
<appenders>
<Console name="Console" target="SYSTEM_OUT">
<ThresholdFilter level="ERROR" onMatch="ACCEPT" onMismatch="DENY"/>
@@ -157,7 +157,7 @@ public class App {
<AppenderRef ref="log"/>
</root>
</loggers>
-</configuration>]]></pre>
+</Configuration>]]></pre>
<p>
Here is the output that results from the Java classes and configuration above.
</p>
Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/migration.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/migration.xml?rev=1514121&r1=1514120&r2=1514121&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/migration.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/migration.xml Thu Aug 15 01:43:48 2013
@@ -98,7 +98,7 @@
<AppenderRef ref="STDOUT"/>
</root>
</loggers>
-</configuration>]]></pre>
+</Configuration>]]></pre>
<h4>Sample 2 - Simple configuration using a File Appender</h4>
<p>Log4j 1.x XML configuration</p>
@@ -146,7 +146,7 @@
<AppenderRef ref="STDOUT"/>
</root>
</loggers>
-</configuration>]]></pre>
+</Configuration>]]></pre>
<h4>Sample 3 - SocketAppender</h4>
<p>Log4j 1.x XML configuration. This example from Log4j 1.x is misleading. The SocketAppender does not
@@ -196,7 +196,7 @@
<AppenderRef ref="STDOUT"/>
</root>
</loggers>
-</configuration>]]></pre>
+</Configuration>]]></pre>
<h4>Sample 4 - AsyncAppender</h4>
<p>Log4j 1.x XML configuration using the AsyncAppender.</p>
@@ -220,21 +220,21 @@
<p>Log4j 2 XML configuration. </p>
<pre class="prettyprint linenums"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<configuration status="debug">
- <appenders>
+<Configuration status="debug">
+ <Appenders>
<File name="TEMP" fileName="temp">
<PatternLayout pattern="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
</File>
<Async name="ASYNC">
<AppenderRef ref="TEMP"/>
</Async>
- </appenders>
- <loggers>
- <root level="debug">
+ </Appenders>
+ <Loggers>
+ <Root level="debug">
<AppenderRef ref="ASYNC"/>
- </root>
- </loggers>
-</configuration>]]></pre>
+ </Root>
+ </Loggers>
+</Configuration>]]></pre>
<h4>Sample 5 - AsyncAppender with Console and File</h4>
@@ -284,7 +284,7 @@
<AppenderRef ref="ASYNC"/>
</root>
</loggers>
-</configuration>]]></pre>
+</Configuration>]]></pre>
</subsection>
</section>
</body>
Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/plugins.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/plugins.xml?rev=1514121&r1=1514120&r2=1514121&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/plugins.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/plugins.xml Thu Aug 15 01:43:48 2013
@@ -134,7 +134,7 @@
<argument>${project.build.outputDirectory}</argument>
<argument>org.myorg.myproject.log4j</argument>
</arguments>
- </configuration>
+ </Configuration>
</plugin>]]></pre>
</subsection>
</section>
Modified: logging/log4j/log4j2/trunk/taglib/src/test/resources/log4j-test1.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/taglib/src/test/resources/log4j-test1.xml?rev=1514121&r1=1514120&r2=1514121&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/taglib/src/test/resources/log4j-test1.xml (original)
+++ logging/log4j/log4j2/trunk/taglib/src/test/resources/log4j-test1.xml Thu Aug 15 01:43:48 2013
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<configuration packages="org.apache.logging.log4j.test" status="warn" name="TaglibLoggerTest">
+<Configuration packages="org.apache.logging.log4j.test" status="warn" name="TaglibLoggerTest">
<properties>
<property name="filename">target/test.log</property>
</properties>
@@ -38,4 +38,4 @@
<logger name="IfEnabledTagTest" level="warn" />
</loggers>
-</configuration>
\ No newline at end of file
+</Configuration>
\ No newline at end of file