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/14 22:05:57 UTC
svn commit: r1514021 [1/2] - in /logging/log4j/log4j2/trunk:
core/src/main/java/org/apache/logging/log4j/core/appender/
core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/
core/src/main/java/org/apache/logging/log4j/core/async/ core/src/...
Author: ggregory
Date: Wed Aug 14 20:05:54 2013
New Revision: 1514021
URL: http://svn.apache.org/r1514021
Log:
[LOG4J2-353] Use consistent conventions in configuration files: "appender-ref" -> "AppenderRef".
Modified:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoversPlugin.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderRef.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
logging/log4j/log4j2/trunk/core/src/main/resources/Log4j-config.xsd
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/Log4jInitPerformance.java
logging/log4j/log4j2/trunk/core/src/test/resources/AsyncLoggerConfigTest.xml
logging/log4j/log4j2/trunk/core/src/test/resources/AsyncLoggerConfigTest2.xml
logging/log4j/log4j2/trunk/core/src/test/resources/AsyncLoggerLocationTest.xml
logging/log4j/log4j2/trunk/core/src/test/resources/AsyncLoggerTest.xml
logging/log4j/log4j2/trunk/core/src/test/resources/FlumeFuncTest.xml
logging/log4j/log4j2/trunk/core/src/test/resources/RandomAccessFileAppenderLocationTest.xml
logging/log4j/log4j2/trunk/core/src/test/resources/RandomAccessFileAppenderTest.xml
logging/log4j/log4j2/trunk/core/src/test/resources/RollingRandomAccessFileAppenderLocationTest.xml
logging/log4j/log4j2/trunk/core/src/test/resources/RollingRandomAccessFileAppenderTest.xml
logging/log4j/log4j2/trunk/core/src/test/resources/XmlCompactFileAppenderTest.xml
logging/log4j/log4j2/trunk/core/src/test/resources/XmlCompactFileAppenderValidationTest.xml
logging/log4j/log4j2/trunk/core/src/test/resources/XmlCompactFileAsyncAppenderValidationTest.xml
logging/log4j/log4j2/trunk/core/src/test/resources/XmlCompleteFileAppenderTest.xml
logging/log4j/log4j2/trunk/core/src/test/resources/XmlFileAppenderTest.xml
logging/log4j/log4j2/trunk/core/src/test/resources/XmlRandomAccessFileAppenderTest.xml
logging/log4j/log4j2/trunk/core/src/test/resources/bad/log4j-badfilename.xml
logging/log4j/log4j2/trunk/core/src/test/resources/bad/log4j-badfilterparam.xml
logging/log4j/log4j2/trunk/core/src/test/resources/bad/log4j-badlayout.xml
logging/log4j/log4j2/trunk/core/src/test/resources/bad/log4j-loggers.xml
logging/log4j/log4j2/trunk/core/src/test/resources/bad/log4j-nofilter.xml
logging/log4j/log4j2/trunk/core/src/test/resources/bad/log4j-status.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-advertiser.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-asynch-no-location.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-asynch.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-burst.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-failover.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-filetest.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-jmsqueue-failover.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-jmsqueue.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-jmstopic-failover.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-loggerprops.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-props.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-props1.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-reference-level.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-replace.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-rewrite.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-rolling1.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-rolling2.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-rolling3.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-rolling4.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-rootthrowablefilter.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-routing-by-jndi.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-routing.json
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-routing.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-routing2.json
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-routing3.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-socket.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-socket2.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-strict1.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-style.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-test1.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-test2.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-test3.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-threaded.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-throwable.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-throwablefilter.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-xinclude-appenders.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-xinclude-loggers.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-xinclude.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j.dtd
logging/log4j/log4j2/trunk/core/src/test/resources/log4j12-perf.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j12-perf2.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-config.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-console-highlight-default.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-console-highlight-logback.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-console-highlight.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-console-style-ansi.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-console-style-name-ansi.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-console.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-dynamicfilter.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-mapfilter.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-perf-filter.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-perf.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-perf2.xml
logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-sdfilter.xml
logging/log4j/log4j2/trunk/core/src/test/resources/logback-flume.xml
logging/log4j/log4j2/trunk/core/src/test/resources/logback-perf-filter.xml
logging/log4j/log4j2/trunk/core/src/test/resources/logback-perf.xml
logging/log4j/log4j2/trunk/core/src/test/resources/logback-perf2.xml
logging/log4j/log4j2/trunk/core/src/test/resources/logback-subst.xml
logging/log4j/log4j2/trunk/core/src/test/resources/missingRootLogger.xml
logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-data-source.xml
logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-h2-driver-manager.xml
logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-h2-factory-method.xml
logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-hsqldb-driver-manager.xml
logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-hsqldb-factory-method.xml
logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-h2-jpa-base.xml
logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-h2-jpa-basic.xml
logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-hsqldb-jpa-base.xml
logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-hsqldb-jpa-basic.xml
logging/log4j/log4j2/trunk/core/src/test/resources/perf-log4j12-async.xml
logging/log4j/log4j2/trunk/core/src/test/resources/perf-log4j12.xml
logging/log4j/log4j2/trunk/core/src/test/resources/perf-logback-async.xml
logging/log4j/log4j2/trunk/core/src/test/resources/perf-logback.xml
logging/log4j/log4j2/trunk/core/src/test/resources/perf1syncFastFile.xml
logging/log4j/log4j2/trunk/core/src/test/resources/perf1syncFile.xml
logging/log4j/log4j2/trunk/core/src/test/resources/perf2syncRollFastFile.xml
logging/log4j/log4j2/trunk/core/src/test/resources/perf2syncRollFile.xml
logging/log4j/log4j2/trunk/core/src/test/resources/perf3PlainNoLoc.xml
logging/log4j/log4j2/trunk/core/src/test/resources/perf4PlainLocation.xml
logging/log4j/log4j2/trunk/core/src/test/resources/perf5AsyncApndNoLoc.xml
logging/log4j/log4j2/trunk/core/src/test/resources/perf6AsyncApndLoc.xml
logging/log4j/log4j2/trunk/core/src/test/resources/perf7MixedNoLoc.xml
logging/log4j/log4j2/trunk/core/src/test/resources/perf8MixedLoc.xml
logging/log4j/log4j2/trunk/core/src/test/resources/xml-events.xml
logging/log4j/log4j2/trunk/flume-ng/src/test/resources/default_embedded.xml
logging/log4j/log4j2/trunk/flume-ng/src/test/resources/embedded.xml
logging/log4j/log4j2/trunk/flume-ng/src/test/resources/persistent.xml
logging/log4j/log4j2/trunk/jcl-bridge/src/test/resources/log4j-test1.xml
logging/log4j/log4j2/trunk/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java
logging/log4j/log4j2/trunk/log4j12-api/src/test/resources/log4j2-config.xml
logging/log4j/log4j2/trunk/samples/flume-embedded/src/main/resources/log4j-embedded.xml
logging/log4j/log4j2/trunk/samples/flume-remote/src/main/resources/log4j-remote.xml
logging/log4j/log4j2/trunk/slf4j-impl/src/test/resources/log4j-test1.xml
logging/log4j/log4j2/trunk/src/changes/changes.xml
logging/log4j/log4j2/trunk/src/site/xdoc/manual/appenders.xml
logging/log4j/log4j2/trunk/src/site/xdoc/manual/async.xml
logging/log4j/log4j2/trunk/src/site/xdoc/manual/configuration.xml.vm
logging/log4j/log4j2/trunk/src/site/xdoc/manual/extending.xml
logging/log4j/log4j2/trunk/src/site/xdoc/manual/filters.xml
logging/log4j/log4j2/trunk/src/site/xdoc/manual/flowtracing.xml
logging/log4j/log4j2/trunk/src/site/xdoc/manual/migration.xml
logging/log4j/log4j2/trunk/taglib/src/test/resources/log4j-test1.xml
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java Wed Aug 14 20:05:54 2013
@@ -169,7 +169,7 @@ public final class AsyncAppender<T exten
*/
@PluginFactory
public static <S extends Serializable> AsyncAppender<S> createAppender(
- @PluginElement("appender-ref") final AppenderRef[] appenderRefs,
+ @PluginElement("AppenderRef") final AppenderRef[] appenderRefs,
@PluginAttr("error-ref") final String errorRef,
@PluginAttr("blocking") final String blocking,
@PluginAttr("bufferSize") final String size,
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoversPlugin.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoversPlugin.java?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoversPlugin.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoversPlugin.java Wed Aug 14 20:05:54 2013
@@ -43,10 +43,10 @@ public final class FailoversPlugin {
* @return The appender references.
*/
@PluginFactory
- public static String[] createFailovers(@PluginElement("appender-ref") final AppenderRef... refs) {
+ public static String[] createFailovers(@PluginElement("AppenderRef") final AppenderRef... refs) {
if (refs == null) {
- LOGGER.error("failovers must contain an appender-reference");
+ LOGGER.error("failovers must contain an appender reference");
return null;
}
final String[] arr = new String[refs.length];
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java Wed Aug 14 20:05:54 2013
@@ -108,7 +108,7 @@ public final class RewriteAppender<T ext
@PluginFactory
public static <S extends Serializable> RewriteAppender<S> createAppender(@PluginAttr("name") final String name,
@PluginAttr("ignoreExceptions") final String ignore,
- @PluginElement("appender-ref") final AppenderRef[] appenderRefs,
+ @PluginElement("appenderRef") final AppenderRef[] appenderRefs,
@PluginConfiguration final Configuration config,
@PluginElement("rewritePolicy") final RewritePolicy rewritePolicy,
@PluginElement("filter") final Filter filter) {
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java Wed Aug 14 20:05:54 2013
@@ -152,7 +152,7 @@ public class AsyncLoggerConfig extends L
@PluginAttr("level") final String levelName,
@PluginAttr("name") final String loggerName,
@PluginAttr("includeLocation") final String includeLocation,
- @PluginElement("appender-ref") final AppenderRef[] refs,
+ @PluginElement("AppenderRef") final AppenderRef[] refs,
@PluginElement("properties") final Property[] properties,
@PluginConfiguration final Configuration config,
@PluginElement("filters") final Filter filter) {
@@ -194,7 +194,7 @@ public class AsyncLoggerConfig extends L
@PluginAttr("additivity") final String additivity,
@PluginAttr("level") final String levelName,
@PluginAttr("includeLocation") final String includeLocation,
- @PluginElement("appender-ref") final AppenderRef[] refs,
+ @PluginElement("AppenderRef") final AppenderRef[] refs,
@PluginElement("properties") final Property[] properties,
@PluginConfiguration final Configuration config,
@PluginElement("filters") final Filter filter) {
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderRef.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderRef.java?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderRef.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderRef.java Wed Aug 14 20:05:54 2013
@@ -28,7 +28,7 @@ import org.apache.logging.log4j.status.S
/**
* An Appender reference.
*/
-@Plugin(name = "appender-ref", category = "Core", printObject = true)
+@Plugin(name = "AppenderRef", category = "Core", printObject = true)
public final class AppenderRef {
private static final Logger LOGGER = StatusLogger.getLogger();
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java Wed Aug 14 20:05:54 2013
@@ -452,7 +452,7 @@ public class LoggerConfig extends Abstra
@PluginAttr("level") final String levelName,
@PluginAttr("name") final String loggerName,
@PluginAttr("includeLocation") final String includeLocation,
- @PluginElement("appender-ref") final AppenderRef[] refs,
+ @PluginElement("AppenderRef") final AppenderRef[] refs,
@PluginElement("properties") final Property[] properties,
@PluginConfiguration final Configuration config,
@PluginElement("filters") final Filter filter) {
@@ -500,7 +500,7 @@ public class LoggerConfig extends Abstra
@PluginAttr("additivity") final String additivity,
@PluginAttr("level") final String levelName,
@PluginAttr("includeLocation") final String includeLocation,
- @PluginElement("appender-ref") final AppenderRef[] refs,
+ @PluginElement("AppenderRef") final AppenderRef[] refs,
@PluginElement("properties") final Property[] properties,
@PluginConfiguration final Configuration config,
@PluginElement("filters") final Filter filter) {
Modified: logging/log4j/log4j2/trunk/core/src/main/resources/Log4j-config.xsd
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/resources/Log4j-config.xsd?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/resources/Log4j-config.xsd (original)
+++ logging/log4j/log4j2/trunk/core/src/main/resources/Log4j-config.xsd Wed Aug 14 20:05:54 2013
@@ -17,17 +17,17 @@
-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
- <xs:element name="configuration" type="configurationType"/>
- <xs:complexType name="configurationType">
+ <xs:element name="Configuration" type="ConfigurationType"/>
+ <xs:complexType name="ConfigurationType">
<xs:sequence>
- <xs:element name="properties" type="propertiesType"/>
+ <xs:element name="Properties" type="PropertiesType"/>
<xs:choice minOccurs="0" maxOccurs="1">
- <xs:element name="filters" type="filtersType"/>
- <xs:element name="filter" type="filterType"/>
+ <xs:element name="Filters" type="FiltersType"/>
+ <xs:element name="Filter" type="FilterType"/>
</xs:choice>
- <xs:element name="thresholdFilter" type="thresholdFilterType"/>
- <xs:element name="appenders" type="appendersType"/>
- <xs:element name="loggers" type="loggersType"/>
+ <xs:element name="ThresholdFilter" type="ThresholdFilterType"/>
+ <xs:element name="Appenders" type="AppendersType"/>
+ <xs:element name="Loggers" type="LoggersType"/>
</xs:sequence>
<xs:attribute name="packages" type="xs:string"/>
<xs:attribute name="status" type="xs:string"/>
@@ -35,30 +35,30 @@
<xs:attribute name="name" type="xs:string"/>
<xs:attribute name="advertiser" type="xs:string"/>
</xs:complexType>
- <xs:complexType name="propertiesType">
+ <xs:complexType name="PropertiesType">
<xs:sequence>
- <xs:element name="property" type="propertyType"/>
+ <xs:element name="Property" type="PropertyType"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="appenderType">
+ <xs:complexType name="AppenderType">
<xs:sequence>
- <xs:element name="layout" type="layoutType" minOccurs="0"/>
+ <xs:element name="Layout" type="LayoutType" minOccurs="0"/>
<xs:choice minOccurs="0" maxOccurs="1">
- <xs:element name="filters" type="filtersType"/>
- <xs:element name="filter" type="filterType"/>
+ <xs:element name="Filters" type="FiltersType"/>
+ <xs:element name="Filter" type="FilterType"/>
</xs:choice>
</xs:sequence>
<xs:attribute name="type" type="xs:string" use="required"/>
<xs:attribute name="name" type="xs:string" use="required"/>
<xs:attribute name="fileName" type="xs:string" use="optional"/>
</xs:complexType>
- <xs:complexType name="rootType">
+ <xs:complexType name="RootType">
<xs:sequence>
- <xs:element name="appender-ref" type="appender-refType" minOccurs="1" maxOccurs="unbounded"/>
+ <xs:element name="AppenderRef" type="AppenderRefType" minOccurs="1" maxOccurs="unbounded"/>
</xs:sequence>
<xs:attribute name="level" type="xs:string"/>
</xs:complexType>
- <xs:complexType name="propertyType">
+ <xs:complexType name="PropertyType">
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute name="name" type="xs:string"/>
@@ -73,31 +73,31 @@
</xs:extension>
</xs:simpleContent>
</xs:complexType>
- <xs:complexType name="appendersType">
+ <xs:complexType name="AppendersType">
<xs:sequence>
- <xs:element name="appender" type="appenderType" minOccurs="1" maxOccurs="unbounded"/>
+ <xs:element name="Appender" type="AppenderType" minOccurs="1" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="appender-refType">
+ <xs:complexType name="AppenderRefType">
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute name="ref" type="xs:string" use="required"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
- <xs:complexType name="loggerType">
+ <xs:complexType name="LoggerType">
<xs:sequence>
<xs:choice minOccurs="0" maxOccurs="1">
- <xs:element name="filters" type="filtersType"/>
- <xs:element name="filter" type="filterType"/>
+ <xs:element name="Filters" type="FiltersType"/>
+ <xs:element name="Filter" type="FilterType"/>
</xs:choice>
- <xs:element name="appender-ref" type="appender-refType"/>
+ <xs:element name="AppenderRef" type="AppenderRefType"/>
</xs:sequence>
<xs:attribute name="name" type="xs:string" use="required"/>
<xs:attribute name="level" type="xs:string" use="optional"/>
<xs:attribute name="additivity" type="xs:string" use="optional"/>
</xs:complexType>
- <xs:complexType name="filterType" mixed="true">
+ <xs:complexType name="FilterType" mixed="true">
<xs:sequence>
<xs:element name="KeyValuePair" type="KeyValuePairType" minOccurs="0"/>
</xs:sequence>
@@ -107,25 +107,25 @@
<xs:attribute name="onMatch" type="xs:string" use="optional"/>
<xs:attribute name="onMismatch" type="xs:string" use="optional"/>
</xs:complexType>
- <xs:complexType name="filtersType">
+ <xs:complexType name="FiltersType">
<xs:sequence>
- <xs:element name="filter" type="filterType" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element name="Filter" type="FilterType" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="loggersType" mixed="true">
+ <xs:complexType name="LoggersType" mixed="true">
<xs:sequence>
- <xs:element name="logger" type="loggerType" minOccurs="0" maxOccurs="unbounded"/>
- <xs:element name="root" type="rootType" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="Logger" type="LoggerType" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element name="Root" type="RootType" minOccurs="1" maxOccurs="1"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="layoutType" mixed="true">
+ <xs:complexType name="LayoutType" mixed="true">
<xs:sequence>
- <xs:element name="pattern" type="xs:string" minOccurs="0"/>
+ <xs:element name="Pattern" type="xs:string" minOccurs="0"/>
</xs:sequence>
- <xs:attribute name="type" type="xs:string" use="required"/>
- <xs:attribute name="pattern" type="xs:string" use="optional"/>
+ <xs:attribute name="Type" type="xs:string" use="required"/>
+ <xs:attribute name="Pattern" type="xs:string" use="optional"/>
</xs:complexType>
- <xs:complexType name="thresholdFilterType">
+ <xs:complexType name="ThresholdFilterType">
<xs:attribute name="level" type="xs:string" use="optional"/>
<xs:attribute name="onMatch" type="xs:string" use="optional"/>
<xs:attribute name="onMismatch" type="xs:string" use="optional"/>
Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/Log4jInitPerformance.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/Log4jInitPerformance.java?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/Log4jInitPerformance.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/Log4jInitPerformance.java Wed Aug 14 20:05:54 2013
@@ -38,7 +38,7 @@ public class Log4jInitPerformance {
"</appenders>" +
"<loggers>" +
" <root level=\"error\">" +
- " <appender-ref ref=\"STDOUT\"/>" +
+ " <AppenderRef ref=\"STDOUT\"/>" +
" </root>" +
"</loggers>" +
"</configuration>";
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/AsyncLoggerConfigTest.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/AsyncLoggerConfigTest.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/AsyncLoggerConfigTest.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/AsyncLoggerConfigTest.xml Wed Aug 14 20:05:54 2013
@@ -14,10 +14,10 @@
<loggers>
<asyncLogger name="com.foo.Bar" level="trace" includeLocation="false">
- <appender-ref ref="File"/>
+ <AppenderRef ref="File"/>
</asyncLogger>
<root level="info">
- <appender-ref ref="File"/>
+ <AppenderRef ref="File"/>
</root>
</loggers>
</configuration>
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/AsyncLoggerConfigTest2.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/AsyncLoggerConfigTest2.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/AsyncLoggerConfigTest2.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/AsyncLoggerConfigTest2.xml Wed Aug 14 20:05:54 2013
@@ -14,7 +14,7 @@
<loggers>
<asyncRoot level="info">
- <appender-ref ref="File"/>
+ <AppenderRef ref="File"/>
</asyncRoot>
</loggers>
</configuration>
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/AsyncLoggerLocationTest.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/AsyncLoggerLocationTest.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/AsyncLoggerLocationTest.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/AsyncLoggerLocationTest.xml Wed Aug 14 20:05:54 2013
@@ -11,7 +11,7 @@
<loggers>
<root level="info" includeLocation="true">
- <appender-ref ref="RandomAccessFile"/>
+ <AppenderRef ref="RandomAccessFile"/>
</root>
</loggers>
</configuration>
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/AsyncLoggerTest.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/AsyncLoggerTest.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/AsyncLoggerTest.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/AsyncLoggerTest.xml Wed Aug 14 20:05:54 2013
@@ -11,7 +11,7 @@
<loggers>
<root level="info" includeLocation="false">
- <appender-ref ref="RandomAccessFile"/>
+ <AppenderRef ref="RandomAccessFile"/>
</root>
</loggers>
</configuration>
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/FlumeFuncTest.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/FlumeFuncTest.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/FlumeFuncTest.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/FlumeFuncTest.xml Wed Aug 14 20:05:54 2013
@@ -30,10 +30,10 @@
<loggers>
<logger name="EventLogger" level="info" additivity="false">
- <appender-ref ref="eventLogger"/>
+ <AppenderRef ref="eventLogger"/>
</logger>
<root level="error">
- <appender-ref ref="console"/>
+ <AppenderRef ref="console"/>
</root>
</loggers>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/RandomAccessFileAppenderLocationTest.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/RandomAccessFileAppenderLocationTest.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/RandomAccessFileAppenderLocationTest.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/RandomAccessFileAppenderLocationTest.xml Wed Aug 14 20:05:54 2013
@@ -13,7 +13,7 @@
<loggers>
<asyncRoot level="info" includeLocation="true">
- <appender-ref ref="RandomAccessFile"/>
+ <AppenderRef ref="RandomAccessFile"/>
</asyncRoot>
</loggers>
</configuration>
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/RandomAccessFileAppenderTest.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/RandomAccessFileAppenderTest.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/RandomAccessFileAppenderTest.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/RandomAccessFileAppenderTest.xml Wed Aug 14 20:05:54 2013
@@ -13,7 +13,7 @@
<loggers>
<asyncRoot level="info" includeLocation="false">
- <appender-ref ref="RandomAccessFile"/>
+ <AppenderRef ref="RandomAccessFile"/>
</asyncRoot>
</loggers>
</configuration>
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/RollingRandomAccessFileAppenderLocationTest.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/RollingRandomAccessFileAppenderLocationTest.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/RollingRandomAccessFileAppenderLocationTest.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/RollingRandomAccessFileAppenderLocationTest.xml Wed Aug 14 20:05:54 2013
@@ -15,7 +15,7 @@
<loggers>
<asyncRoot level="info" includeLocation="true">
- <appender-ref ref="RollingRandomAccessFile"/>
+ <AppenderRef ref="RollingRandomAccessFile"/>
</asyncRoot>
</loggers>
</configuration>
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/RollingRandomAccessFileAppenderTest.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/RollingRandomAccessFileAppenderTest.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/RollingRandomAccessFileAppenderTest.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/RollingRandomAccessFileAppenderTest.xml Wed Aug 14 20:05:54 2013
@@ -15,7 +15,7 @@
<loggers>
<asyncRoot level="info" includeLocation="false">
- <appender-ref ref="RollingRandomAccessFile"/>
+ <AppenderRef ref="RollingRandomAccessFile"/>
</asyncRoot>
</loggers>
</configuration>
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/XmlCompactFileAppenderTest.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/XmlCompactFileAppenderTest.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/XmlCompactFileAppenderTest.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/XmlCompactFileAppenderTest.xml Wed Aug 14 20:05:54 2013
@@ -8,7 +8,7 @@
<Loggers>
<AsyncRoot level="info" includeLocation="false">
- <Appender-ref ref="XmlFile"/>
+ <AppenderRef ref="XmlFile"/>
</AsyncRoot>
</Loggers>
</Configuration>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/XmlCompactFileAppenderValidationTest.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/XmlCompactFileAppenderValidationTest.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/XmlCompactFileAppenderValidationTest.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/XmlCompactFileAppenderValidationTest.xml Wed Aug 14 20:05:54 2013
@@ -8,7 +8,7 @@
<Loggers>
<Root level="info" includeLocation="false">
- <appender-ref ref="XmlFile"/>
+ <AppenderRef ref="XmlFile"/>
</Root>
</Loggers>
</Configuration>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/XmlCompactFileAsyncAppenderValidationTest.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/XmlCompactFileAsyncAppenderValidationTest.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/XmlCompactFileAsyncAppenderValidationTest.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/XmlCompactFileAsyncAppenderValidationTest.xml Wed Aug 14 20:05:54 2013
@@ -8,7 +8,7 @@
<Loggers>
<AsyncRoot level="info" includeLocation="false">
- <appender-ref ref="XmlFile"/>
+ <AppenderRef ref="XmlFile"/>
</AsyncRoot>
</Loggers>
</Configuration>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/XmlCompleteFileAppenderTest.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/XmlCompleteFileAppenderTest.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/XmlCompleteFileAppenderTest.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/XmlCompleteFileAppenderTest.xml Wed Aug 14 20:05:54 2013
@@ -8,7 +8,7 @@
<Loggers>
<AsyncRoot level="info" includeLocation="false">
- <Appender-ref ref="XmlFile"/>
+ <AppenderRef ref="XmlFile"/>
</AsyncRoot>
</Loggers>
</Configuration>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/XmlFileAppenderTest.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/XmlFileAppenderTest.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/XmlFileAppenderTest.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/XmlFileAppenderTest.xml Wed Aug 14 20:05:54 2013
@@ -8,7 +8,7 @@
<Loggers>
<AsyncRoot level="info" includeLocation="false">
- <Appender-ref ref="XmlFile"/>
+ <AppenderRef ref="XmlFile"/>
</AsyncRoot>
</Loggers>
</Configuration>
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/XmlRandomAccessFileAppenderTest.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/XmlRandomAccessFileAppenderTest.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/XmlRandomAccessFileAppenderTest.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/XmlRandomAccessFileAppenderTest.xml Wed Aug 14 20:05:54 2013
@@ -8,7 +8,7 @@
<loggers>
<asyncRoot level="info" includeLocation="false">
- <appender-ref ref="XmlRandomAccessFile"/>
+ <AppenderRef ref="XmlRandomAccessFile"/>
</asyncRoot>
</loggers>
</configuration>
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/bad/log4j-badfilename.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/bad/log4j-badfilename.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/bad/log4j-badfilename.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/bad/log4j-badfilename.xml Wed Aug 14 20:05:54 2013
@@ -40,15 +40,15 @@
<ThreadContextMapFilter>
<KeyValuePair key="test" value="123"/>
</ThreadContextMapFilter>
- <appender-ref ref="STDOUT"/>
+ <AppenderRef ref="STDOUT"/>
</logger>>
<logger name="org.apache.logging.log4j.test2" level="debug" additivity="false">
- <appender-ref ref="File"/>
+ <AppenderRef ref="File"/>
</logger>>
<root level="error">
- <appender-ref ref="STDOUT"/>
+ <AppenderRef ref="STDOUT"/>
</root>
</loggers>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/bad/log4j-badfilterparam.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/bad/log4j-badfilterparam.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/bad/log4j-badfilterparam.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/bad/log4j-badfilterparam.xml Wed Aug 14 20:05:54 2013
@@ -43,15 +43,15 @@
<ThreadContextMapFilter>
<KeyValuePair key1="test" value="123"/>
</ThreadContextMapFilter>
- <appender-ref ref="STDOUT"/>
+ <AppenderRef ref="STDOUT"/>
</logger>>
<logger name="org.apache.logging.log4j.test2" level="debug" additivity="false">
- <appender-ref ref="File"/>
+ <AppenderRef ref="File"/>
</logger>>
<root level="error">
- <appender-ref ref="STDOUT"/>
+ <AppenderRef ref="STDOUT"/>
</root>
</loggers>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/bad/log4j-badlayout.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/bad/log4j-badlayout.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/bad/log4j-badlayout.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/bad/log4j-badlayout.xml Wed Aug 14 20:05:54 2013
@@ -40,15 +40,15 @@
<loggers>
<logger name="org.apache.logging.log4j.test1" level="debug" additivity="false">
- <appender-ref ref="STDOUT"/>
+ <AppenderRef ref="STDOUT"/>
</logger>>
<logger name="org.apache.logging.log4j.test2" level="debug" additivity="false">
- <appender-ref ref="File"/>
+ <AppenderRef ref="File"/>
</logger>>
<root level="error">
- <appender-ref ref="STDOUT"/>
+ <AppenderRef ref="STDOUT"/>
</root>
</loggers>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/bad/log4j-loggers.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/bad/log4j-loggers.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/bad/log4j-loggers.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/bad/log4j-loggers.xml Wed Aug 14 20:05:54 2013
@@ -42,15 +42,15 @@
<ThreadContextMapFilter>
<KeyValuePair key="test" value="123"/>
</ThreadContextMapFilter>
- <appender-ref ref="STDOUT"/>
+ <AppenderRef ref="STDOUT"/>
</logger>>
<logger name="org.apache.logging.log4j.test2" level="debug" additivity="false">
- <appender-ref ref="File"/>
+ <AppenderRef ref="File"/>
</logger>>
<root level="error">
- <appender-ref ref="STDOUT"/>
+ <AppenderRef ref="STDOUT"/>
</root>
</configuration>
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/bad/log4j-nofilter.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/bad/log4j-nofilter.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/bad/log4j-nofilter.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/bad/log4j-nofilter.xml Wed Aug 14 20:05:54 2013
@@ -43,15 +43,15 @@
<filters>
<!-- This isn't really an error -->
</filters>
- <appender-ref ref="STDOUT"/>
+ <AppenderRef ref="STDOUT"/>
</logger>>
<logger name="org.apache.logging.log4j.test2" level="debug" additivity="false">
- <appender-ref ref="File"/>
+ <AppenderRef ref="File"/>
</logger>>
<root level="error">
- <appender-ref ref="STDOUT"/>
+ <AppenderRef ref="STDOUT"/>
</root>
</loggers>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/bad/log4j-status.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/bad/log4j-status.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/bad/log4j-status.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/bad/log4j-status.xml Wed Aug 14 20:05:54 2013
@@ -43,15 +43,15 @@
<ThreadContextMapFilter>
<KeyValuePair key="test" value="123"/>
</ThreadContextMapFilter>
- <appender-ref ref="STDOUT"/>
+ <AppenderRef ref="STDOUT"/>
</logger>>
<logger name="org.apache.logging.log4j.test2" level="debug" additivity="false">
- <appender-ref ref="File"/>
+ <AppenderRef ref="File"/>
</logger>>
<root level="error">
- <appender-ref ref="STDOUT"/>
+ <AppenderRef ref="STDOUT"/>
</root>
</loggers>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-advertiser.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-advertiser.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-advertiser.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-advertiser.xml Wed Aug 14 20:05:54 2013
@@ -43,11 +43,11 @@
<loggers>
<logger name="org.apache.logging.log4j.test2" level="debug" additivity="false">
- <appender-ref ref="File2"/>
+ <AppenderRef ref="File2"/>
</logger>>
<root level="error">
- <appender-ref ref="File1"/>
+ <AppenderRef ref="File1"/>
</root>
</loggers>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-asynch-no-location.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-asynch-no-location.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-asynch-no-location.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-asynch-no-location.xml Wed Aug 14 20:05:54 2013
@@ -26,13 +26,13 @@
<PatternLayout pattern="%C %M %m"/>
</List>
<Async name="Async"> <!-- includeLocation="false" the default for async -->
- <appender-ref ref="List"/>
+ <AppenderRef ref="List"/>
</Async>
</appenders>
<loggers>
<root level="debug">
- <appender-ref ref="Async"/>
+ <AppenderRef ref="Async"/>
</root>
</loggers>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-asynch.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-asynch.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-asynch.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-asynch.xml Wed Aug 14 20:05:54 2013
@@ -26,13 +26,13 @@
<PatternLayout pattern="%C %M %m"/>
</List>
<Async name="Async" includeLocation="true">
- <appender-ref ref="List"/>
+ <AppenderRef ref="List"/>
</Async>
</appenders>
<loggers>
<root level="debug">
- <appender-ref ref="Async"/>
+ <AppenderRef ref="Async"/>
</root>
</loggers>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-burst.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-burst.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-burst.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-burst.xml Wed Aug 14 20:05:54 2013
@@ -26,7 +26,7 @@
<loggers>
<root level="TRACE">
- <appender-ref ref="ListAppender"/>
+ <AppenderRef ref="ListAppender"/>
</root>
</loggers>
</configuration>
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-failover.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-failover.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-failover.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-failover.xml Wed Aug 14 20:05:54 2013
@@ -23,22 +23,22 @@
<List name="List" />
<Failover name="Failover" primary="Fail" ignoreExceptions="false">
<Failovers>
- <appender-ref ref="List"/>
+ <AppenderRef ref="List"/>
</Failovers>
</Failover>
<Failover name="FailoverOnce" primary="Once" ignoreExceptions="false" retryInterval="1">
<Failovers>
- <appender-ref ref="List"/>
+ <AppenderRef ref="List"/>
</Failovers>
</Failover>
</Appenders>
<loggers>
<logger name="Once" level="error" additivity="false">
- <appender-ref ref="FailoverOnce"/>
+ <AppenderRef ref="FailoverOnce"/>
</logger>
<root level="error">
- <appender-ref ref="Failover"/>
+ <AppenderRef ref="Failover"/>
</root>
</loggers>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-filetest.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-filetest.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-filetest.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-filetest.xml Wed Aug 14 20:05:54 2013
@@ -43,15 +43,15 @@
<ThreadContextMapFilter>
<KeyValuePair key="test" value="123"/>
</ThreadContextMapFilter>
- <appender-ref ref="STDOUT"/>
+ <AppenderRef ref="STDOUT"/>
</logger>>
<logger name="org.apache.logging.log4j.test2" level="debug" additivity="false">
- <appender-ref ref="File"/>
+ <AppenderRef ref="File"/>
</logger>>
<root level="error">
- <appender-ref ref="STDOUT"/>
+ <AppenderRef ref="STDOUT"/>
</root>
</loggers>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-jmsqueue-failover.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-jmsqueue-failover.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-jmsqueue-failover.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-jmsqueue-failover.xml Wed Aug 14 20:05:54 2013
@@ -25,27 +25,27 @@
<PropertiesRewritePolicy>
<Property name="appender">List</Property>
</PropertiesRewritePolicy>
- <appender-ref ref="Log4j2Queue"/>
+ <AppenderRef ref="Log4j2Queue"/>
</Rewrite>
<Failover name="Failover" primary="Rewrite" ignoreExceptions="false">
<Failovers>
- <appender-ref ref="List"/>
+ <AppenderRef ref="List"/>
</Failovers>
</Failover>
</Appenders>
<loggers>
<root level="debug">
- <appender-ref ref="Failover">
+ <AppenderRef ref="Failover">
<ThreadContextMapFilter onMatch="ACCEPT" onMismatch="DENY">
<KeyValuePair key="appender" value="Failover"/>
</ThreadContextMapFilter>
- </appender-ref>
- <appender-ref ref="List">
+ </AppenderRef>
+ <AppenderRef ref="List">
<ThreadContextMapFilter onMatch="ACCEPT" onMismatch="DENY">
<KeyValuePair key="appender" value="List"/>
</ThreadContextMapFilter>
- </appender-ref>
+ </AppenderRef>
</root>
</loggers>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-jmsqueue.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-jmsqueue.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-jmsqueue.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-jmsqueue.xml Wed Aug 14 20:05:54 2013
@@ -25,7 +25,7 @@
</appenders>
<loggers>
<root level="error">
- <appender-ref ref="JMSQueue"/>
+ <AppenderRef ref="JMSQueue"/>
</root>
</loggers>
</configuration>
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-jmstopic-failover.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-jmstopic-failover.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-jmstopic-failover.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-jmstopic-failover.xml Wed Aug 14 20:05:54 2013
@@ -25,27 +25,27 @@
<PropertiesRewritePolicy>
<Property name="appender">List</Property>
</PropertiesRewritePolicy>
- <appender-ref ref="Log4j2Topic"/>
+ <AppenderRef ref="Log4j2Topic"/>
</Rewrite>
<Failover name="Failover" primary="Rewrite" ignoreExceptions="false">
<Failovers>
- <appender-ref ref="List"/>
+ <AppenderRef ref="List"/>
</Failovers>
</Failover>
</Appenders>
<loggers>
<root level="debug">
- <appender-ref ref="Failover">
+ <AppenderRef ref="Failover">
<ThreadContextMapFilter onMatch="ACCEPT" onMismatch="DENY">
<KeyValuePair key="appender" value="Failover"/>
</ThreadContextMapFilter>
- </appender-ref>
- <appender-ref ref="List">
+ </AppenderRef>
+ <AppenderRef ref="List">
<ThreadContextMapFilter onMatch="ACCEPT" onMismatch="DENY">
<KeyValuePair key="appender" value="List"/>
</ThreadContextMapFilter>
- </appender-ref>
+ </AppenderRef>
</root>
</loggers>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-loggerprops.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-loggerprops.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-loggerprops.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-loggerprops.xml Wed Aug 14 20:05:54 2013
@@ -10,12 +10,12 @@
<logger name="org.apache.logging.log4j.core" level="debug" additivity="false">
<property name="user">$${sys:user.name}</property>
<property name="test">${sys:test}</property>
- <appender-ref ref="List"/>
+ <AppenderRef ref="List"/>
</logger>
<root level="debug">
<property name="user">${sys:user.name}</property>
<property name="test">${sys:test}</property>
- <appender-ref ref="List" />
+ <AppenderRef ref="List" />
</root>
</loggers>
</configuration>
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-props.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-props.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-props.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-props.xml Wed Aug 14 20:05:54 2013
@@ -8,7 +8,7 @@
<loggers>
<root level="${sys:log.level}">
- <appender-ref ref="Console" />
+ <AppenderRef ref="Console" />
</root>
</loggers>
</configuration>
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-props1.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-props1.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-props1.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-props1.xml Wed Aug 14 20:05:54 2013
@@ -8,7 +8,7 @@
<loggers>
<root level="${sys:log.level}">
- <appender-ref ref="Console" />
+ <AppenderRef ref="Console" />
</root>
</loggers>
</configuration>
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-reference-level.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-reference-level.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-reference-level.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-reference-level.xml Wed Aug 14 20:05:54 2013
@@ -27,23 +27,23 @@
<loggers>
<logger name="org.apache.logging.log4j.test1" level="trace" additivity="false">
- <appender-ref ref="LIST1" level="trace"/>
- <appender-ref ref="LIST2" level="error"/>
+ <AppenderRef ref="LIST1" level="trace"/>
+ <AppenderRef ref="LIST2" level="error"/>
</logger>>
<logger name="org.apache.logging.log4j.test2" level="debug" additivity="false">
- <appender-ref ref="LIST1" level="WARN"/>
- <appender-ref ref="LIST2" level="debug"/>
+ <AppenderRef ref="LIST1" level="WARN"/>
+ <AppenderRef ref="LIST2" level="debug"/>
</logger>>
<logger name="org.apache.logging.log4j.test3" level="trace" additivity="false">
- <appender-ref ref="LIST1" level="trace">
+ <AppenderRef ref="LIST1" level="trace">
<MarkerFilter marker="TEST" onmatch="deny" onmismatch="accept"/>
- </appender-ref>
+ </AppenderRef>
</logger>>
<root level="error">
- <appender-ref ref="STDOUT"/>
+ <AppenderRef ref="STDOUT"/>
</root>
</loggers>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-replace.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-replace.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-replace.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-replace.xml Wed Aug 14 20:05:54 2013
@@ -33,10 +33,10 @@
<loggers>
<logger level="trace" name="ReplacementTest" additivity="false">
- <appender-ref ref="List2"/>
+ <AppenderRef ref="List2"/>
</logger>
<root level="trace">
- <appender-ref ref="List"/>
+ <AppenderRef ref="List"/>
</root>
</loggers>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-rewrite.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-rewrite.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-rewrite.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-rewrite.xml Wed Aug 14 20:05:54 2013
@@ -33,14 +33,14 @@
<KeyValuePair key="Key1" Value="Apache"/>
<KeyValuePair key="Key3" Value="Log4j"/>
</MapRewritePolicy>
- <appender-ref ref="List"/>
+ <AppenderRef ref="List"/>
</Rewrite>
<Rewrite name="Rewrite2">
<PropertiesRewritePolicy>
<Property name="user">$${sys:user.name}</Property>
<Property name="os">${sys:os.name}</Property>
</PropertiesRewritePolicy>
- <appender-ref ref="List2"/>
+ <AppenderRef ref="List2"/>
</Rewrite>
<Rewrite name="Rewrite3">
<MapFilter>
@@ -50,23 +50,23 @@
<KeyValuePair key="Key1" Value="Apache"/>
<KeyValuePair key="Key3" Value="Log4j"/>
</MapRewritePolicy>
- <appender-ref ref="List"/>
+ <AppenderRef ref="List"/>
</Rewrite>
</appenders>
<loggers>
<logger name="EventLogger" level="trace" additivity="false">
- <appender-ref ref="Rewrite"/>
+ <AppenderRef ref="Rewrite"/>
</logger>
<logger name="org.apache.logging.log4j.core.Logging" level="trace" additivity="false">
- <appender-ref ref="Rewrite3"/>
+ <AppenderRef ref="Rewrite3"/>
</logger>
<logger name="org.apache.logging.log4j" level="trace" additivity="false">
- <appender-ref ref="Rewrite2"/>
+ <AppenderRef ref="Rewrite2"/>
</logger>
<root level="error">
- <appender-ref ref="STDOUT"/>
+ <AppenderRef ref="STDOUT"/>
</root>
</loggers>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-rolling1.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-rolling1.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-rolling1.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-rolling1.xml Wed Aug 14 20:05:54 2013
@@ -43,15 +43,15 @@
<ThreadContextMapFilter>
<KeyValuePair key="test" value="123"/>
</ThreadContextMapFilter>
- <appender-ref ref="STDOUT"/>
+ <AppenderRef ref="STDOUT"/>
</logger>>
<logger name="org.apache.logging.log4j.core.appender.rolling" level="debug" additivity="false">
- <appender-ref ref="RollingFile"/>
+ <AppenderRef ref="RollingFile"/>
</logger>>
<root level="error">
- <appender-ref ref="STDOUT"/>
+ <AppenderRef ref="STDOUT"/>
</root>
</loggers>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-rolling2.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-rolling2.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-rolling2.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-rolling2.xml Wed Aug 14 20:05:54 2013
@@ -43,11 +43,11 @@
<loggers>
<logger name="org.apache.logging.log4j.core.appender.rolling" level="debug" additivity="false">
- <appender-ref ref="RollingFile"/>
+ <AppenderRef ref="RollingFile"/>
</logger>>
<root level="error">
- <appender-ref ref="STDOUT"/>
+ <AppenderRef ref="STDOUT"/>
</root>
</loggers>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-rolling3.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-rolling3.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-rolling3.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-rolling3.xml Wed Aug 14 20:05:54 2013
@@ -42,11 +42,11 @@
<loggers>
<logger name="org.apache.logging.log4j.core.appender.rolling" level="debug" additivity="false">
- <appender-ref ref="RollingFile"/>
+ <AppenderRef ref="RollingFile"/>
</logger>>
<root level="error">
- <appender-ref ref="STDOUT"/>
+ <AppenderRef ref="STDOUT"/>
</root>
</loggers>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-rolling4.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-rolling4.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-rolling4.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-rolling4.xml Wed Aug 14 20:05:54 2013
@@ -43,15 +43,15 @@
<ThreadContextMapFilter>
<KeyValuePair key="test" value="123"/>
</ThreadContextMapFilter>
- <appender-ref ref="STDOUT"/>
+ <AppenderRef ref="STDOUT"/>
</logger>>
<logger name="org.apache.logging.log4j.core.appender.rolling" level="debug" additivity="false">
- <appender-ref ref="RollingFile"/>
+ <AppenderRef ref="RollingFile"/>
</logger>>
<root level="error">
- <appender-ref ref="STDOUT"/>
+ <AppenderRef ref="STDOUT"/>
</root>
</loggers>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-rootthrowablefilter.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-rootthrowablefilter.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-rootthrowablefilter.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-rootthrowablefilter.xml Wed Aug 14 20:05:54 2013
@@ -33,7 +33,7 @@
<loggers>
<root level="error">
- <appender-ref ref="List"/>
+ <AppenderRef ref="List"/>
</root>
</loggers>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-routing-by-jndi.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-routing-by-jndi.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-routing-by-jndi.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-routing-by-jndi.xml Wed Aug 14 20:05:54 2013
@@ -48,12 +48,12 @@
<loggers>
<logger name="EventLogger" level="info" additivity="false">
- <appender-ref ref="Routing"/>
- <appender-ref ref="STDOUT"/>
+ <AppenderRef ref="Routing"/>
+ <AppenderRef ref="STDOUT"/>
</logger>
<root level="error">
- <appender-ref ref="STDOUT"/>
+ <AppenderRef ref="STDOUT"/>
</root>
</loggers>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-routing.json
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-routing.json?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-routing.json (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-routing.json Wed Aug 14 20:05:54 2013
@@ -44,8 +44,8 @@
}
},
"loggers": {
- "logger": { "name": "EventLogger", "level": "info", "additivity": "false", "appender-ref": { "ref": "Routing" }},
- "root": { "level": "error", "appender-ref": { "ref": "STDOUT" }}
+ "logger": { "name": "EventLogger", "level": "info", "additivity": "false", "AppenderRef": { "ref": "Routing" }},
+ "root": { "level": "error", "AppenderRef": { "ref": "STDOUT" }}
}
}
}
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-routing.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-routing.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-routing.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-routing.xml Wed Aug 14 20:05:54 2013
@@ -48,11 +48,11 @@
<loggers>
<logger name="EventLogger" level="info" additivity="false">
- <appender-ref ref="Routing"/>
+ <AppenderRef ref="Routing"/>
</logger>
<root level="error">
- <appender-ref ref="STDOUT"/>
+ <AppenderRef ref="STDOUT"/>
</root>
</loggers>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-routing2.json
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-routing2.json?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-routing2.json (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-routing2.json Wed Aug 14 20:05:54 2013
@@ -43,10 +43,10 @@
},
"loggers": {
"logger": [
- { "name": "EventLogger", "level": "info", "additivity": "false", "appender-ref": { "ref": "Routing" }},
- { "name": "com.foo.bar", "level": "error", "additivity": "false", "appender-ref": { "ref": "STDOUT" }}
+ { "name": "EventLogger", "level": "info", "additivity": "false", "AppenderRef": { "ref": "Routing" }},
+ { "name": "com.foo.bar", "level": "error", "additivity": "false", "AppenderRef": { "ref": "STDOUT" }}
],
- "root": { "level": "error", "appender-ref": { "ref": "STDOUT" }}
+ "root": { "level": "error", "AppenderRef": { "ref": "STDOUT" }}
}
}
}
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-routing3.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-routing3.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-routing3.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-routing3.xml Wed Aug 14 20:05:54 2013
@@ -47,11 +47,11 @@
<loggers>
<logger name="EventLogger" level="info" additivity="false">
- <appender-ref ref="Routing"/>
+ <AppenderRef ref="Routing"/>
</logger>
<root level="error">
- <appender-ref ref="STDOUT"/>
+ <AppenderRef ref="STDOUT"/>
</root>
</loggers>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-socket.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-socket.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-socket.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-socket.xml Wed Aug 14 20:05:54 2013
@@ -8,7 +8,7 @@
</appenders>
<loggers>
<root level="debug">
- <appender-ref ref="socket"/>
+ <AppenderRef ref="socket"/>
</root>
</loggers>
</configuration>
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-socket2.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-socket2.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-socket2.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-socket2.xml Wed Aug 14 20:05:54 2013
@@ -8,7 +8,7 @@
</appenders>
<loggers>
<root level="debug">
- <appender-ref ref="socket"/>
+ <AppenderRef ref="socket"/>
</root>
</loggers>
</configuration>
\ No newline at end of file
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=1514021&r1=1514020&r2=1514021&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:05:54 2013
@@ -51,15 +51,15 @@
<filter type="ThreadContextMapFilter">
<KeyValuePair key="test" value="123"/>
</filter>
- <appender-ref ref="STDOUT"/>
+ <AppenderRef ref="STDOUT"/>
</logger>>
<logger name="org.apache.logging.log4j.test2" level="debug" additivity="false">
- <appender-ref ref="File"/>
+ <AppenderRef ref="File"/>
</logger>>
<root level="trace">
- <appender-ref ref="List"/>
+ <AppenderRef ref="List"/>
</root>
</loggers>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-style.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-style.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-style.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-style.xml Wed Aug 14 20:05:54 2013
@@ -27,7 +27,7 @@
<loggers>
<root level="trace">
- <appender-ref ref="List"/>
+ <AppenderRef ref="List"/>
</root>
</loggers>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-test1.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-test1.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-test1.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-test1.xml Wed Aug 14 20:05:54 2013
@@ -16,43 +16,43 @@
limitations under the License.
-->
-<configuration status="warn" name="XMLConfigTest" packages="org.apache.logging.log4j.test">
- <properties>
- <property name="filename">target/test.log</property>
- </properties>
+<Configuration status="warn" name="XMLConfigTest" packages="org.apache.logging.log4j.test">
+ <Properties>
+ <Property name="filename">target/test.log</Property>
+ </Properties>
<ThresholdFilter level="debug"/>
- <appenders>
+ <Appenders>
<Console name="STDOUT">
<PatternLayout pattern="%m%n"/>
</Console>
<File name="File" fileName="${filename}" bufferedIO="false">
<PatternLayout>
- <pattern>%d %p %C{1.} [%t] %m%n</pattern>
+ <Pattern>%d %p %C{1.} [%t] %m%n</Pattern>
</PatternLayout>
</File>
<List name="List">
- <filters>
+ <Filters>
<ThresholdFilter level="error"/>
- </filters>
+ </Filters>
</List>
- </appenders>
+ </Appenders>
- <loggers>
- <logger name="org.apache.logging.log4j.test1" level="debug" additivity="false">
+ <Loggers>
+ <Logger name="org.apache.logging.log4j.test1" level="debug" additivity="false">
<ThreadContextMapFilter>
<KeyValuePair key="test" value="123"/>
</ThreadContextMapFilter>
- <appender-ref ref="STDOUT"/>
- </logger>>
+ <AppenderRef ref="STDOUT"/>
+ </Logger>>
- <logger name="org.apache.logging.log4j.test2" level="debug" additivity="false">
- <appender-ref ref="File"/>
- </logger>>
-
- <root level="error">
- <appender-ref ref="STDOUT"/>
- </root>
- </loggers>
+ <Logger name="org.apache.logging.log4j.test2" level="debug" additivity="false">
+ <AppenderRef ref="File"/>
+ </Logger>>
+
+ <Root level="error">
+ <AppenderRef ref="STDOUT"/>
+ </Root>
+ </Loggers>
-</configuration>
\ No newline at end of file
+</Configuration>
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-test2.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-test2.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-test2.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-test2.xml Wed Aug 14 20:05:54 2013
@@ -57,25 +57,25 @@
<ThreadContextMapFilter>
<KeyValuePair key="test" value="123"/>
</ThreadContextMapFilter>
- <appender-ref ref="STDOUT"/>
+ <AppenderRef ref="STDOUT"/>
</logger>>
<logger name="org.apache.logging.log4j.hosttest" level="debug" additivity="false">
- <appender-ref ref="HostTest"/>
+ <AppenderRef ref="HostTest"/>
</logger>
<logger name="org.apache.logging.log4j.nothrown" level="debug" additivity="false">
- <appender-ref ref="NoThrowable"/>
+ <AppenderRef ref="NoThrowable"/>
</logger>
<logger name="org.apache.logging.log4j.test2" level="debug" additivity="false">
- <appender-ref ref="File"/>
+ <AppenderRef ref="File"/>
</logger>
<logger name="org" level="error" additivity="true"/>
<root level="trace">
- <appender-ref ref="List"/>
+ <AppenderRef ref="List"/>
</root>
</loggers>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-test3.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-test3.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-test3.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-test3.xml Wed Aug 14 20:05:54 2013
@@ -28,11 +28,11 @@
<loggers>
<logger name="org.apache.logging.log4j.test1" level="debug" additivity="false">
- <appender-ref ref="STDOUT"/>
+ <AppenderRef ref="STDOUT"/>
</logger>>
<root level="trace">
- <appender-ref ref="List"/>
+ <AppenderRef ref="List"/>
</root>
</loggers>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-threaded.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-threaded.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-threaded.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-threaded.xml Wed Aug 14 20:05:54 2013
@@ -36,7 +36,7 @@
<loggers>
<root level="debug">
- <appender-ref ref="File"/>
+ <AppenderRef ref="File"/>
</root>
</loggers>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-throwable.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-throwable.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-throwable.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-throwable.xml Wed Aug 14 20:05:54 2013
@@ -33,7 +33,7 @@
<loggers>
<root level="error">
- <appender-ref ref="List"/>
+ <AppenderRef ref="List"/>
</root>
</loggers>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-throwablefilter.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-throwablefilter.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-throwablefilter.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-throwablefilter.xml Wed Aug 14 20:05:54 2013
@@ -33,7 +33,7 @@
<loggers>
<root level="error">
- <appender-ref ref="List"/>
+ <AppenderRef ref="List"/>
</root>
</loggers>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-xinclude-appenders.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-xinclude-appenders.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-xinclude-appenders.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-xinclude-appenders.xml Wed Aug 14 20:05:54 2013
@@ -16,18 +16,18 @@
limitations under the License.
-->
-<appenders>
+<Appenders>
<Console name="STDOUT">
<PatternLayout pattern="%m%n" />
</Console>
<File name="File" fileName="${filename}" bufferedIO="false">
<PatternLayout>
- <pattern>%d %p %C{1.} [%t] %m%n</pattern>
+ <Pattern>%d %p %C{1.} [%t] %m%n</Pattern>
</PatternLayout>
</File>
<List name="List">
- <filters>
+ <Filters>
<ThresholdFilter level="error" />
- </filters>
+ </Filters>
</List>
-</appenders>
+</Appenders>
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-xinclude-loggers.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-xinclude-loggers.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-xinclude-loggers.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-xinclude-loggers.xml Wed Aug 14 20:05:54 2013
@@ -16,20 +16,20 @@
limitations under the License.
-->
-<loggers>
- <logger name="org.apache.logging.log4j.test1" level="debug" additivity="false">
+<Loggers>
+ <Logger name="org.apache.logging.log4j.test1" level="debug" additivity="false">
<ThreadContextMapFilter>
<KeyValuePair key="test" value="123" />
</ThreadContextMapFilter>
- <appender-ref ref="STDOUT" />
- </logger>
+ <AppenderRef ref="STDOUT" />
+ </Logger>
- <logger name="org.apache.logging.log4j.test2" level="debug" additivity="false">
- <appender-ref ref="File" />
- </logger>
+ <Logger name="org.apache.logging.log4j.test2" level="debug" additivity="false">
+ <AppenderRef ref="File" />
+ </Logger>
- <root level="error">
- <appender-ref ref="STDOUT" />
- </root>
-</loggers>
+ <Root level="error">
+ <AppenderRef ref="STDOUT" />
+ </Root>
+</Loggers>
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-xinclude.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-xinclude.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-xinclude.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-xinclude.xml Wed Aug 14 20:05:54 2013
@@ -16,12 +16,12 @@
limitations under the License.
-->
-<configuration xmlns:xi="http://www.w3.org/2001/XInclude"
+<Configuration xmlns:xi="http://www.w3.org/2001/XInclude"
status="warn" name="XMLConfigTest" packages="org.apache.logging.log4j.test">
- <properties>
- <property name="filename">target/test.log</property>
- </properties>
+ <Properties>
+ <Property name="filename">target/test.log</Property>
+ </Properties>
<ThresholdFilter level="debug"/>
<xi:include href="target/test-classes/log4j-xinclude-appenders.xml" />
<xi:include href="target/test-classes/log4j-xinclude-loggers.xml" />
-</configuration>
\ No newline at end of file
+</Configuration>
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j.dtd
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j.dtd?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j.dtd (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j.dtd Wed Aug 14 20:05:54 2013
@@ -47,7 +47,7 @@ element. -->
<!-- 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*, layout?, filter*, AppenderRef*)>
<!ATTLIST appender
name ID #REQUIRED
class CDATA #REQUIRED
@@ -66,7 +66,7 @@ element. -->
<!-- ErrorHandlers can be of any class. They can admit any number of -->
<!-- parameters. -->
-<!ELEMENT errorHandler (param*, root-ref?, logger-ref*, appender-ref?)>
+<!ELEMENT errorHandler (param*, root-ref?, logger-ref*, AppenderRef?)>
<!ATTLIST errorHandler
class CDATA #REQUIRED
>
@@ -102,7 +102,7 @@ element. -->
<!-- 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*)>
+<!ELEMENT category (param*,(priority|level)?,AppenderRef*)>
<!ATTLIST category
class CDATA #IMPLIED
name CDATA #REQUIRED
@@ -111,7 +111,7 @@ element. -->
<!-- If no level element is specified, then the configurator MUST not -->
<!-- touch the level of the named logger. -->
-<!ELEMENT logger (level?,appender-ref*)>
+<!ELEMENT logger (level?,AppenderRef*)>
<!ATTLIST logger
name ID #REQUIRED
additivity (true|false) "true"
@@ -122,15 +122,15 @@ element. -->
<!ATTLIST categoryFactory
class CDATA #REQUIRED>
-<!ELEMENT appender-ref EMPTY>
-<!ATTLIST appender-ref
+<!ELEMENT AppenderRef EMPTY>
+<!ATTLIST AppenderRef
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*)>
+<!ELEMENT root (param*, (priority|level)?, AppenderRef*)>
<!-- ==================================================================== -->
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j12-perf.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j12-perf.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j12-perf.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j12-perf.xml Wed Aug 14 20:05:54 2013
@@ -26,6 +26,6 @@
</appender>
<root>
<level value="debug"/>
- <appender-ref ref="TestLogfile"/>
+ <AppenderRef ref="TestLogfile"/>
</root>
</log4j:configuration>
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j12-perf2.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j12-perf2.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j12-perf2.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j12-perf2.xml Wed Aug 14 20:05:54 2013
@@ -26,6 +26,6 @@
</appender>
<root>
<level value="error"/>
- <appender-ref ref="TestLogfile"/>
+ <AppenderRef ref="TestLogfile"/>
</root>
</log4j:configuration>
\ No newline at end of file