Return-Path: 
 <commits-return-2754-apmail-logging-commits-archive=logging.apache.org@logging.apache.org>
X-Original-To: apmail-logging-commits-archive@minotaur.apache.org
Delivered-To: apmail-logging-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 7BFF91017E
	for <apmail-logging-commits-archive@minotaur.apache.org>;
 Thu, 15 Aug 2013 15:55:07 +0000 (UTC)
Received: (qmail 86640 invoked by uid 500); 15 Aug 2013 15:55:05 -0000
Delivered-To: apmail-logging-commits-archive@logging.apache.org
Received: (qmail 86608 invoked by uid 500); 15 Aug 2013 15:55:02 -0000
Mailing-List: contact commits-help@logging.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@logging.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@logging.apache.org>
List-Post: <mailto:commits@logging.apache.org>
List-Id: <commits.logging.apache.org>
Reply-To: dev@logging.apache.org
Delivered-To: mailing list commits@logging.apache.org
Received: (qmail 86597 invoked by uid 99); 15 Aug 2013 15:55:00 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Aug 2013 15:55:00 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Aug 2013 15:54:59 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id E68032388A32;
	Thu, 15 Aug 2013 15:54:38 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1514333 - in /logging/log4j/log4j2/trunk:
 flume-ng/src/test/resources/ jcl-bridge/src/test/resources/
 log4j12-api/src/test/resources/ samples/flume-embedded/src/main/resources/
 samples/flume-remote/src/main/resources/ slf4j-impl/src/test/r...
Date: Thu, 15 Aug 2013 15:54:38 -0000
To: commits@logging.apache.org
From: ggregory@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20130815155438.E68032388A32@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: ggregory
Date: Thu Aug 15 15:54:38 2013
New Revision: 1514333

URL: http://svn.apache.org/r1514333
Log:
[LOG4J2-353] Use consistent conventions in configuration files.

Modified:
    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/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/site/xdoc/manual/migration.xml
    logging/log4j/log4j2/trunk/taglib/src/test/resources/log4j-test1.xml

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=1514333&r1=1514332&r2=1514333&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 15:54:38 2013
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Configuration status="warn" name="MyApp" packages="">
-  <appenders>
+  <Appenders>
     <Flume name="eventLogger" ignoreExceptions="false" compress="true" type="embedded" dataDir="InMemory">
       <Agent host="localhost" port="${sys:primaryPort}"/>
       <Agent host="localhost" port="${sys:alternatePort}"/>
@@ -9,13 +9,13 @@
     <Console name="STDOUT">
       <PatternLayout pattern="%d %t - [%p] %c %m%n"/>
     </Console>
-  </appenders>
-  <loggers>
-    <logger name="EventLogger" level="info" additivity="false">
+  </Appenders>
+  <Loggers>
+    <Logger name="EventLogger" level="info" additivity="false">
       <AppenderRef ref="eventLogger"/>
-    </logger>
-    <root level="error">
+    </Logger>
+    <Root level="error">
       <AppenderRef ref="STDOUT"/>
-    </root>
-  </loggers>
+    </Root>
+  </Loggers>
 </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=1514333&r1=1514332&r2=1514333&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 15:54:38 2013
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Configuration status="warn" name="MyApp" packages="">
-  <appenders>
+  <Appenders>
     <Flume name="eventLogger" ignoreExceptions="false" compress="true" type="embedded">
       <Property name="channels">primary</Property>
       <Property name="channels.primary.type">memory</Property>
@@ -29,13 +29,13 @@
     <Console name="STDOUT">
       <PatternLayout pattern="%d [%p] %c %m%n"/>
     </Console>
-  </appenders>
-  <loggers>
-    <logger name="EventLogger" level="info" additivity="false">
+  </Appenders>
+  <Loggers>
+    <Logger name="EventLogger" level="info" additivity="false">
       <AppenderRef ref="eventLogger"/>
-    </logger>
-    <root level="warn">
+    </Logger>
+    <Root level="warn">
       <AppenderRef ref="STDOUT"/>
-    </root>
-  </loggers>
+    </Root>
+  </Loggers>
 </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=1514333&r1=1514332&r2=1514333&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 15:54:38 2013
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Configuration status="info" name="MyApp" packages="org.apache.logging.log4j.flume.test">
-  <appenders>
+  <Appenders>
     <Flume name="eventLogger" ignoreExceptions="false" compress="true" type="persistent" dataDir="target/persistent"
         batchsize="100" maxDelay="500">
       <Agent host="localhost" port="${sys:primaryPort}"/>
@@ -12,13 +12,13 @@
     <Console name="STDOUT">
       <PatternLayout pattern="%d %t - [%p] %c %m%n"/>
     </Console>
-  </appenders>
-  <loggers>
-    <logger name="EventLogger" level="info" additivity="false">
+  </Appenders>
+  <Loggers>
+    <Logger name="EventLogger" level="info" additivity="false">
       <AppenderRef ref="eventLogger"/>
-    </logger>
-    <root level="error">
+    </Logger>
+    <Root level="error">
       <AppenderRef ref="STDOUT"/>
-    </root>
-  </loggers>
+    </Root>
+  </Loggers>
 </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=1514333&r1=1514332&r2=1514333&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 15:54:38 2013
@@ -5,7 +5,7 @@
   </properties>
   <ThresholdFilter level="trace"/>
 
-  <appenders>
+  <Appenders>
     <List name="EventLogger">
       <PatternLayout pattern="%C{1.} %m%n"/>
     </List>
@@ -20,20 +20,20 @@
     <List name="List">
       <PatternLayout pattern="%C{1.} %m MDC%X%n%ex{0}"/>
     </List>
-  </appenders>
+  </Appenders>
 
-  <loggers>
-    <logger name="EventLogger" level="info" additivity="false">
+  <Loggers>
+    <Logger name="EventLogger" level="info" additivity="false">
       <AppenderRef ref="EventLogger"/>
-    </logger>>
+    </Logger>>
 
-    <logger name="org.apache.logging.log4j.test2" level="debug" additivity="false">
+    <Logger name="org.apache.logging.log4j.test2" level="debug" additivity="false">
       <AppenderRef ref="File"/>
-    </logger>>
+    </Logger>>
 
-    <root level="trace">
+    <Root level="trace">
       <AppenderRef ref="List"/>
-    </root>
-  </loggers>
+    </Root>
+  </Loggers>
 
 </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=1514333&r1=1514332&r2=1514333&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 15:54:38 2013
@@ -18,22 +18,22 @@
 -->
 <Configuration name="ConfigTest" status="error" packages="org.apache.logging.log4j.test"
                monitorInterval="5">
-  <appenders>
+  <Appenders>
     <Console name="STDOUT">
       <PatternLayout pattern="%m%n"/>
     </Console>
     <List name="List">
     </List>
-  </appenders>
-  <loggers>
-    <logger name="org.apache.test.logging" level="debug" additivity="false">
+  </Appenders>
+  <Loggers>
+    <Logger name="org.apache.test.logging" level="debug" additivity="false">
       <AppenderRef ref="List"/>
-    </logger>
-    <logger name="org.apache.test" level="trace" additivity="false">
+    </Logger>
+    <Logger name="org.apache.test" level="trace" additivity="false">
       <AppenderRef ref="List"/>
-    </logger>
-    <root level="error">
+    </Logger>
+    <Root level="error">
       <AppenderRef ref="STDOUT"/>
-    </root>
-  </loggers>
+    </Root>
+  </Loggers>
 </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=1514333&r1=1514332&r2=1514333&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 15:54:38 2013
@@ -18,7 +18,7 @@
 -->
 <Configuration status="debug" name="Flume" verbose="false" monitorInterval="30">
 	<MarkerFilter marker="EVENT" onMatch="ACCEPT" onMismatch="NEUTRAL" />
-	<appenders>
+	<Appenders>
 
 		<Flume name="flume" ignoreExceptions="false" mdcPrefix="ReqCtx_" compress="false" embedded="true" dataDir="/tmp">
 			<Agent host="localhost" port="8800" />
@@ -37,13 +37,13 @@
 				<SizeBasedTriggeringPolicy size="250 MB" />
 			</Policies>
 		</RollingFile>
-	</appenders>
-	<loggers>
-		<logger name="EventLogger" level="WARN" additivity="false">
+	</Appenders>
+	<Loggers>
+		<Logger name="EventLogger" level="WARN" additivity="false">
 			<AppenderRef ref="flume" />
-		</logger>
-		<root level="debug">
+		</Logger>
+		<Root level="debug">
 			<AppenderRef ref="RollingFile" />
-		</root>
-	</loggers>
+		</Root>
+	</Loggers>
 </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=1514333&r1=1514332&r2=1514333&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 15:54:38 2013
@@ -18,7 +18,7 @@
 -->
 <Configuration status="debug" name="Flume" verbose="false" monitorInterval="30">
 	<MarkerFilter marker="EVENT" onMatch="ACCEPT" onMismatch="NEUTRAL" />
-	<appenders>
+	<Appenders>
 
 		<Flume name="flume" ignoreExceptions="false" mdcPrefix="ReqCtx_" compress="false">
 			<Agent host="localhost" port="8800" />
@@ -37,13 +37,13 @@
 				<SizeBasedTriggeringPolicy size="250 MB" />
 			</Policies>
 		</RollingFile>
-	</appenders>
-	<loggers>
-		<logger name="EventLogger" level="WARN" additivity="false">
+	</Appenders>
+	<Loggers>
+		<Logger name="EventLogger" level="WARN" additivity="false">
 			<AppenderRef ref="flume" />
-		</logger>
-		<root level="debug">
+		</Logger>
+		<Root level="debug">
 			<AppenderRef ref="RollingFile" />
-		</root>
-	</loggers>
+		</Root>
+	</Loggers>
 </Configuration>

Modified: logging/log4j/log4j2/trunk/slf4j-impl/src/test/resources/log4j-test1.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/slf4j-impl/src/test/resources/log4j-test1.xml?rev=1514333&r1=1514332&r2=1514333&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/slf4j-impl/src/test/resources/log4j-test1.xml (original)
+++ logging/log4j/log4j2/trunk/slf4j-impl/src/test/resources/log4j-test1.xml Thu Aug 15 15:54:38 2013
@@ -5,7 +5,7 @@
   </properties>
   <ThresholdFilter level="trace"/>
 
-  <appenders>
+  <Appenders>
     <List name="EventLogger">
       <PatternLayout pattern="%C{1.} %m%n"/>
     </List>
@@ -21,20 +21,20 @@
       <PatternLayout pattern="%C{1.} %m MDC%X%n%ex{0}"/>
     </List>
     <SLF4J name="SLF4J"/>
-  </appenders>
+  </Appenders>
 
-  <loggers>
-    <logger name="EventLogger" level="info" additivity="false">
+  <Loggers>
+    <Logger name="EventLogger" level="info" additivity="false">
       <AppenderRef ref="EventLogger"/>
-    </logger>>
+    </Logger>>
 
-    <logger name="org.apache.logging.log4j.test2" level="debug" additivity="false">
+    <Logger name="org.apache.logging.log4j.test2" level="debug" additivity="false">
       <AppenderRef ref="File"/>
-    </logger>>
+    </Logger>>
 
-    <root level="trace">
+    <Root level="trace">
       <AppenderRef ref="List"/>
-    </root>
-  </loggers>
+    </Root>
+  </Loggers>
 
 </configuration>
\ No newline at end of file

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=1514333&r1=1514332&r2=1514333&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 15:54:38 2013
@@ -93,7 +93,7 @@
     </Console>
   </Appenders>
   <Loggers>
-    <logger name="org.apache.log4j.xml" level="info"/>
+    <Logger name="org.apache.log4j.xml" level="info"/>
     <Root level="debug">
       <AppenderRef ref="STDOUT"/>
     </Root>
@@ -124,7 +124,7 @@
   <root>
     <priority value ="debug" />
     <appender-ref ref="STDOUT" />
-  </root>
+  </Root>
 </log4j:configuration>]]></pre>
 
            <p>Log4j 2 XML configuration</p>
@@ -139,9 +139,9 @@
     </Console>
   </Appenders>
   <Loggers>
-    <logger name="org.apache.log4j.xml" level="debug">
+    <Logger name="org.apache.log4j.xml" level="debug">
       <AppenderRef ref="A1"/>
-    </logger>
+    </Logger>
     <Root level="debug">
       <AppenderRef ref="STDOUT"/>
     </Root>
@@ -174,7 +174,7 @@
   <root>
     <priority value="debug"/>
     <appender-ref ref="STDOUT"/>
-  </root>
+  </Root>
 </log4j:configuration>]]></pre>
 
            <p>Log4j 2 XML configuration</p>
@@ -189,9 +189,9 @@
     </Console>
   </Appenders>
   <Loggers>
-    <logger name="org.apache.log4j.xml" level="debug">
+    <Logger name="org.apache.log4j.xml" level="debug">
       <AppenderRef ref="A1"/>
-    </logger>
+    </Logger>
     <Root level="debug">
       <AppenderRef ref="STDOUT"/>
     </Root>
@@ -215,7 +215,7 @@
   <root>
     <priority value="debug"/>
     <appender-ref ref="ASYNC"/>
-  </root>
+  </Root>
 </log4j:configuration>]]></pre>
 
            <p>Log4j 2 XML configuration. </p>
@@ -260,7 +260,7 @@
   <root>
     <priority value="debug"/>
     <appender-ref ref="ASYNC"/>
-  </root>
+  </Root>
 </log4j:configuration>]]></pre>
 
             <p>Log4j 2 XML configuration. Note that the Async Appender should be configured after the appenders it

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=1514333&r1=1514332&r2=1514333&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 15:54:38 2013
@@ -5,7 +5,7 @@
   </properties>
   <ThresholdFilter level="trace"/>
 
-  <appenders>
+  <Appenders>
     <List name="EventLogger">
       <PatternLayout pattern="%C{1.} %m%n"/>
     </List>
@@ -20,22 +20,22 @@
     <List name="List">
       <PatternLayout pattern="%C{1.} %m %level M-%marker E%ex{1}"/>
     </List>
-  </appenders>
+  </Appenders>
 
-  <loggers>
-    <logger name="EventLogger" level="info" additivity="false">
+  <Loggers>
+    <Logger name="EventLogger" level="info" additivity="false">
       <AppenderRef ref="EventLogger"/>
-    </logger>>
+    </Logger>>
 
-    <logger name="org.apache.logging.log4j.test2" level="debug" additivity="false">
+    <Logger name="org.apache.logging.log4j.test2" level="debug" additivity="false">
       <AppenderRef ref="File"/>
-    </logger>>
+    </Logger>>
 
-    <root level="trace">
+    <Root level="trace">
       <AppenderRef ref="List"/>
-    </root>
+    </Root>
 
-    <logger name="IfEnabledTagTest" level="warn" />
-  </loggers>
+    <Logger name="IfEnabledTagTest" level="warn" />
+  </Loggers>
 
 </Configuration>
\ No newline at end of file