logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggreg...@apache.org
Subject svn commit: r1514021 [2/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/...
Date Wed, 14 Aug 2013 20:05:57 GMT
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-config.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-config.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-config.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-config.xml Wed Aug 14 20:05:54 2013
@@ -30,10 +30,10 @@
   </appenders>
   <loggers>
     <logger name="org.apache.test" level="trace" additivity="false">
-      <appender-ref ref="List"/>
+      <AppenderRef ref="List"/>
     </logger>
     <root level="error">
-      <appender-ref ref="STDOUT"/>
+      <AppenderRef ref="STDOUT"/>
     </root>
   </loggers>
 </configuration>
\ No newline at end of file

Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-console-highlight-default.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-console-highlight-default.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-console-highlight-default.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-console-highlight-default.xml Wed Aug 14 20:05:54 2013
@@ -25,7 +25,7 @@
   <loggers>
     <logger name="org.foo" level="DEBUG" />
     <root level="TRACE">
-      <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/log4j2-console-highlight-logback.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-console-highlight-logback.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-console-highlight-logback.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-console-highlight-logback.xml Wed Aug 14 20:05:54 2013
@@ -25,7 +25,7 @@
   <loggers>
     <logger name="org.foo" level="DEBUG" />
     <root level="TRACE">
-      <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/log4j2-console-highlight.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-console-highlight.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-console-highlight.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-console-highlight.xml Wed Aug 14 20:05:54 2013
@@ -25,7 +25,7 @@
   <loggers>
     <logger name="org.foo" level="DEBUG" />
     <root level="TRACE">
-      <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/log4j2-console-style-ansi.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-console-style-ansi.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-console-style-ansi.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-console-style-ansi.xml Wed Aug 14 20:05:54 2013
@@ -25,7 +25,7 @@
   <loggers>
     <logger name="org.foo" level="DEBUG" />
     <root level="TRACE">
-      <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/log4j2-console-style-name-ansi.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-console-style-name-ansi.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-console-style-name-ansi.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-console-style-name-ansi.xml Wed Aug 14 20:05:54 2013
@@ -25,7 +25,7 @@
   <loggers>
     <logger name="org.foo" level="DEBUG" />
     <root level="TRACE">
-      <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/log4j2-console.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-console.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-console.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-console.xml Wed Aug 14 20:05:54 2013
@@ -25,7 +25,7 @@
   <loggers>
     <logger name="org.foo" level="DEBUG" />
     <root level="TRACE">
-      <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/log4j2-dynamicfilter.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-dynamicfilter.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-dynamicfilter.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-dynamicfilter.xml Wed Aug 14 20:05:54 2013
@@ -27,7 +27,7 @@
   </appenders>
   <loggers>
     <root level="error">
-      <appender-ref ref="STDOUT"/>
+      <AppenderRef ref="STDOUT"/>
     </root>
   </loggers>
 </configuration>
\ No newline at end of file

Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-mapfilter.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-mapfilter.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-mapfilter.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-mapfilter.xml Wed Aug 14 20:05:54 2013
@@ -28,7 +28,7 @@
   </appenders>
   <loggers>
     <root level="error">
-      <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/log4j2-perf-filter.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-perf-filter.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-perf-filter.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-perf-filter.xml Wed Aug 14 20:05:54 2013
@@ -30,7 +30,7 @@
   </appenders>
   <loggers>
     <root level="error">
-      <appender-ref ref="TestLogfile"/>
+      <AppenderRef ref="TestLogfile"/>
     </root>
   </loggers>
 </configuration>
\ No newline at end of file

Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-perf.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-perf.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-perf.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-perf.xml Wed Aug 14 20:05:54 2013
@@ -26,7 +26,7 @@
   </appenders>
   <loggers>
     <root level="debug">
-      <appender-ref ref="TestLogfile"/>
+      <AppenderRef ref="TestLogfile"/>
     </root>
   </loggers>
 </configuration>
\ No newline at end of file

Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-perf2.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-perf2.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-perf2.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-perf2.xml Wed Aug 14 20:05:54 2013
@@ -26,7 +26,7 @@
   </appenders>
   <loggers>
     <root level="error">
-      <appender-ref ref="TestLogfile"/>
+      <AppenderRef ref="TestLogfile"/>
     </root>
   </loggers>
 </configuration>
\ No newline at end of file

Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-sdfilter.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-sdfilter.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-sdfilter.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j2-sdfilter.xml Wed Aug 14 20:05:54 2013
@@ -28,7 +28,7 @@
   </appenders>
   <loggers>
     <root level="error">
-      <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/logback-flume.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/logback-flume.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/logback-flume.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/logback-flume.xml Wed Aug 14 20:05:54 2013
@@ -23,6 +23,6 @@
  </appender>
 
  <root level="error">
-   <appender-ref ref="Console" />
+   <AppenderRef ref="Console" />
  </root>
 </configuration>
\ No newline at end of file

Modified: logging/log4j/log4j2/trunk/core/src/test/resources/logback-perf-filter.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/logback-perf-filter.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/logback-perf-filter.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/logback-perf-filter.xml Wed Aug 14 20:05:54 2013
@@ -31,6 +31,6 @@
  </appender>
 
  <root level="error">
-   <appender-ref ref="TestLogfile" />
+   <AppenderRef ref="TestLogfile" />
  </root>
 </configuration>
\ No newline at end of file

Modified: logging/log4j/log4j2/trunk/core/src/test/resources/logback-perf.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/logback-perf.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/logback-perf.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/logback-perf.xml Wed Aug 14 20:05:54 2013
@@ -25,6 +25,6 @@
  </appender>
 
  <root level="debug">
-   <appender-ref ref="TestLogfile" />
+   <AppenderRef ref="TestLogfile" />
  </root>
 </configuration>
\ No newline at end of file

Modified: logging/log4j/log4j2/trunk/core/src/test/resources/logback-perf2.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/logback-perf2.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/logback-perf2.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/logback-perf2.xml Wed Aug 14 20:05:54 2013
@@ -24,6 +24,6 @@
  </appender>
 
  <root level="error">
-   <appender-ref ref="TestLogfile" />
+   <AppenderRef ref="TestLogfile" />
  </root>
 </configuration>
\ No newline at end of file

Modified: logging/log4j/log4j2/trunk/core/src/test/resources/logback-subst.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/logback-subst.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/logback-subst.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/logback-subst.xml Wed Aug 14 20:05:54 2013
@@ -23,6 +23,6 @@
  </appender>
 
  <root level="debug">
-   <appender-ref ref="stdout" />
+   <AppenderRef ref="stdout" />
  </root>
 </configuration>
\ No newline at end of file

Modified: logging/log4j/log4j2/trunk/core/src/test/resources/missingRootLogger.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/missingRootLogger.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/missingRootLogger.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/missingRootLogger.xml Wed Aug 14 20:05:54 2013
@@ -11,11 +11,11 @@
   <loggers>
   <!-- 
     <root level="info" includeLocation="false">
-      <appender-ref ref="List"/>
+      <AppenderRef ref="List"/>
     </root>
      -->
     <logger name="sample" level="info" includeLocation="false">
-      <appender-ref ref="List"/>
+      <AppenderRef ref="List"/>
     </logger>
   </loggers>
 </configuration>
\ No newline at end of file

Modified: logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-data-source.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-data-source.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-data-source.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-data-source.xml Wed Aug 14 20:05:54 2013
@@ -34,11 +34,11 @@
 
   <loggers>
     <logger name="org.apache.logging.log4j.core.appender.db" level="debug">
-      <appender-ref ref="databaseAppender" />
+      <AppenderRef ref="databaseAppender" />
     </logger>
 
     <root level="error">
-      <appender-ref ref="STDOUT"/>
+      <AppenderRef ref="STDOUT"/>
     </root>
   </loggers>
 

Modified: logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-h2-driver-manager.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-h2-driver-manager.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-h2-driver-manager.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-h2-driver-manager.xml Wed Aug 14 20:05:54 2013
@@ -34,11 +34,11 @@
 
   <loggers>
     <logger name="org.apache.logging.log4j.core.appender.db" level="debug" additivity="false">
-      <appender-ref ref="databaseAppender" />
+      <AppenderRef ref="databaseAppender" />
     </logger>
 
     <root level="error">
-      <appender-ref ref="STDOUT"/>
+      <AppenderRef ref="STDOUT"/>
     </root>
   </loggers>
 

Modified: logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-h2-factory-method.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-h2-factory-method.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-h2-factory-method.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-h2-factory-method.xml Wed Aug 14 20:05:54 2013
@@ -35,11 +35,11 @@
 
   <loggers>
     <logger name="org.apache.logging.log4j.core.appender.db" level="debug">
-      <appender-ref ref="databaseAppender" />
+      <AppenderRef ref="databaseAppender" />
     </logger>
 
     <root level="error">
-      <appender-ref ref="STDOUT"/>
+      <AppenderRef ref="STDOUT"/>
     </root>
   </loggers>
 

Modified: logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-hsqldb-driver-manager.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-hsqldb-driver-manager.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-hsqldb-driver-manager.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-hsqldb-driver-manager.xml Wed Aug 14 20:05:54 2013
@@ -34,11 +34,11 @@
 
   <loggers>
     <logger name="org.apache.logging.log4j.core.appender.db" level="debug" additivity="false">
-      <appender-ref ref="databaseAppender" />
+      <AppenderRef ref="databaseAppender" />
     </logger>
 
     <root level="error">
-      <appender-ref ref="STDOUT"/>
+      <AppenderRef ref="STDOUT"/>
     </root>
   </loggers>
 

Modified: logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-hsqldb-factory-method.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-hsqldb-factory-method.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-hsqldb-factory-method.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-hsqldb-factory-method.xml Wed Aug 14 20:05:54 2013
@@ -35,11 +35,11 @@
 
   <loggers>
     <logger name="org.apache.logging.log4j.core.appender.db" level="debug">
-      <appender-ref ref="databaseAppender" />
+      <AppenderRef ref="databaseAppender" />
     </logger>
 
     <root level="error">
-      <appender-ref ref="STDOUT"/>
+      <AppenderRef ref="STDOUT"/>
     </root>
   </loggers>
 

Modified: logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-h2-jpa-base.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-h2-jpa-base.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-h2-jpa-base.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-h2-jpa-base.xml Wed Aug 14 20:05:54 2013
@@ -27,11 +27,11 @@
 
   <loggers>
     <logger name="org.apache.logging.log4j.core.appender.db" level="debug">
-      <appender-ref ref="databaseAppender" />
+      <AppenderRef ref="databaseAppender" />
     </logger>
 
     <root level="error">
-      <appender-ref ref="STDOUT"/>
+      <AppenderRef ref="STDOUT"/>
     </root>
   </loggers>
 

Modified: logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-h2-jpa-basic.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-h2-jpa-basic.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-h2-jpa-basic.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-h2-jpa-basic.xml Wed Aug 14 20:05:54 2013
@@ -27,11 +27,11 @@
 
   <loggers>
     <logger name="org.apache.logging.log4j.core.appender.db" level="debug" additivity="false">
-      <appender-ref ref="databaseAppender" />
+      <AppenderRef ref="databaseAppender" />
     </logger>
 
     <root level="error">
-      <appender-ref ref="STDOUT"/>
+      <AppenderRef ref="STDOUT"/>
     </root>
   </loggers>
 

Modified: logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-hsqldb-jpa-base.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-hsqldb-jpa-base.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-hsqldb-jpa-base.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-hsqldb-jpa-base.xml Wed Aug 14 20:05:54 2013
@@ -27,11 +27,11 @@
 
   <loggers>
     <logger name="org.apache.logging.log4j.core.appender.db" level="debug">
-      <appender-ref ref="databaseAppender" />
+      <AppenderRef ref="databaseAppender" />
     </logger>
 
     <root level="error">
-      <appender-ref ref="STDOUT"/>
+      <AppenderRef ref="STDOUT"/>
     </root>
   </loggers>
 

Modified: logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-hsqldb-jpa-basic.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-hsqldb-jpa-basic.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-hsqldb-jpa-basic.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-hsqldb-jpa-basic.xml Wed Aug 14 20:05:54 2013
@@ -27,11 +27,11 @@
 
   <loggers>
     <logger name="org.apache.logging.log4j.core.appender.db" level="debug" additivity="false">
-      <appender-ref ref="databaseAppender" />
+      <AppenderRef ref="databaseAppender" />
     </logger>
 
     <root level="error">
-      <appender-ref ref="STDOUT"/>
+      <AppenderRef ref="STDOUT"/>
     </root>
   </loggers>
 

Modified: logging/log4j/log4j2/trunk/core/src/test/resources/perf-log4j12-async.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/perf-log4j12-async.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/perf-log4j12-async.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/perf-log4j12-async.xml Wed Aug 14 20:05:54 2013
@@ -11,10 +11,10 @@
      </appender>
      <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
          <param name="BufferSize" value="262144"/>
-         <appender-ref ref="File"/>
+         <AppenderRef ref="File"/>
      </appender>
   <root> 
     <priority value="debug" /> 
-    <appender-ref ref="ASYNC" /> 
+    <AppenderRef ref="ASYNC" /> 
   </root>
 </log4j:configuration>
\ No newline at end of file

Modified: logging/log4j/log4j2/trunk/core/src/test/resources/perf-log4j12.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/perf-log4j12.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/perf-log4j12.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/perf-log4j12.xml Wed Aug 14 20:05:54 2013
@@ -11,6 +11,6 @@
      </appender>
   <root> 
     <priority value="debug" /> 
-    <appender-ref ref="File" /> 
+    <AppenderRef ref="File" /> 
   </root>
 </log4j:configuration>
\ No newline at end of file

Modified: logging/log4j/log4j2/trunk/core/src/test/resources/perf-logback-async.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/perf-logback-async.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/perf-logback-async.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/perf-logback-async.xml Wed Aug 14 20:05:54 2013
@@ -12,10 +12,10 @@
     <queueSize>262144</queueSize>
     <discardingThreshold>0</discardingThreshold>
     <includeCallerData>false</includeCallerData>
-    <appender-ref ref="FILE" />
+    <AppenderRef ref="FILE" />
   </appender>
 
   <root level="debug">
-    <appender-ref ref="ASYNC" />
+    <AppenderRef ref="ASYNC" />
   </root>
 </configuration>
\ No newline at end of file

Modified: logging/log4j/log4j2/trunk/core/src/test/resources/perf-logback.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/perf-logback.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/perf-logback.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/perf-logback.xml Wed Aug 14 20:05:54 2013
@@ -10,6 +10,6 @@
   </appender>
 
   <root level="debug">
-    <appender-ref ref="FILE" />
+    <AppenderRef ref="FILE" />
   </root>
 </configuration>
\ No newline at end of file

Modified: logging/log4j/log4j2/trunk/core/src/test/resources/perf1syncFastFile.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/perf1syncFastFile.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/perf1syncFastFile.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/perf1syncFastFile.xml Wed Aug 14 20:05:54 2013
@@ -9,7 +9,7 @@
   </appenders>
   <loggers>
     <root level="info" includeLocation="false">
-      <appender-ref ref="RandomAccessFile"/>
+      <AppenderRef ref="RandomAccessFile"/>
     </root>
   </loggers>
 </configuration>

Modified: logging/log4j/log4j2/trunk/core/src/test/resources/perf1syncFile.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/perf1syncFile.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/perf1syncFile.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/perf1syncFile.xml Wed Aug 14 20:05:54 2013
@@ -9,7 +9,7 @@
   </appenders>
   <loggers>
     <root level="info" includeLocation="false">
-      <appender-ref ref="File"/>
+      <AppenderRef ref="File"/>
     </root>
   </loggers>
 </configuration>

Modified: logging/log4j/log4j2/trunk/core/src/test/resources/perf2syncRollFastFile.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/perf2syncRollFastFile.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/perf2syncRollFastFile.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/perf2syncRollFastFile.xml Wed Aug 14 20:05:54 2013
@@ -14,7 +14,7 @@
   </appenders>
   <loggers>
     <root level="info" includeLocation="false">
-      <appender-ref ref="RollingRandomAccessFile"/>
+      <AppenderRef ref="RollingRandomAccessFile"/>
     </root>
   </loggers>
 </configuration>

Modified: logging/log4j/log4j2/trunk/core/src/test/resources/perf2syncRollFile.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/perf2syncRollFile.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/perf2syncRollFile.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/perf2syncRollFile.xml Wed Aug 14 20:05:54 2013
@@ -14,7 +14,7 @@
   </appenders>
   <loggers>
     <root level="info" includeLocation="false">
-      <appender-ref ref="RollingFile"/>
+      <AppenderRef ref="RollingFile"/>
     </root>
   </loggers>
 </configuration>

Modified: logging/log4j/log4j2/trunk/core/src/test/resources/perf3PlainNoLoc.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/perf3PlainNoLoc.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/perf3PlainNoLoc.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/perf3PlainNoLoc.xml Wed Aug 14 20:05:54 2013
@@ -9,7 +9,7 @@
   </appenders>
   <loggers>
     <root level="info" includeLocation="false">
-      <appender-ref ref="RandomAccessFile"/>
+      <AppenderRef ref="RandomAccessFile"/>
     </root>
   </loggers>
 </configuration>

Modified: logging/log4j/log4j2/trunk/core/src/test/resources/perf4PlainLocation.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/perf4PlainLocation.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/perf4PlainLocation.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/perf4PlainLocation.xml Wed Aug 14 20:05:54 2013
@@ -9,7 +9,7 @@
   </appenders>
   <loggers>
     <root level="info" includeLocation="true">
-      <appender-ref ref="RandomAccessFile"/>
+      <AppenderRef ref="RandomAccessFile"/>
     </root>
   </loggers>
 </configuration>

Modified: logging/log4j/log4j2/trunk/core/src/test/resources/perf5AsyncApndNoLoc.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/perf5AsyncApndNoLoc.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/perf5AsyncApndNoLoc.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/perf5AsyncApndNoLoc.xml Wed Aug 14 20:05:54 2013
@@ -7,12 +7,12 @@
       </PatternLayout>
     </RandomAccessFile>
     <Async name="Async"  blocking="true" bufferSize="262144">
-      <appender-ref ref="RandomAccessFile"/>
+      <AppenderRef ref="RandomAccessFile"/>
     </Async>
   </appenders>  
   <loggers>
     <root level="info" includeLocation="false">
-      <appender-ref ref="Async"/>
+      <AppenderRef ref="Async"/>
     </root>
   </loggers>
 </configuration>

Modified: logging/log4j/log4j2/trunk/core/src/test/resources/perf6AsyncApndLoc.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/perf6AsyncApndLoc.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/perf6AsyncApndLoc.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/perf6AsyncApndLoc.xml Wed Aug 14 20:05:54 2013
@@ -7,12 +7,12 @@
       </PatternLayout>
     </RandomAccessFile>
     <Async name="Async" includeLocation="true" blocking="true" bufferSize="262144">
-      <appender-ref ref="RandomAccessFile"/>
+      <AppenderRef ref="RandomAccessFile"/>
     </Async>
   </appenders>  
   <loggers>
     <root level="info" includeLocation="true">
-      <appender-ref ref="Async"/>
+      <AppenderRef ref="Async"/>
     </root>
   </loggers>
 </configuration>

Modified: logging/log4j/log4j2/trunk/core/src/test/resources/perf7MixedNoLoc.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/perf7MixedNoLoc.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/perf7MixedNoLoc.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/perf7MixedNoLoc.xml Wed Aug 14 20:05:54 2013
@@ -9,7 +9,7 @@
   </appenders>
   <loggers>
     <asyncRoot level="info" includeLocation="false">
-      <appender-ref ref="RandomAccessFile"/>
+      <AppenderRef ref="RandomAccessFile"/>
     </asyncRoot>
   </loggers>
 </configuration>

Modified: logging/log4j/log4j2/trunk/core/src/test/resources/perf8MixedLoc.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/perf8MixedLoc.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/perf8MixedLoc.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/perf8MixedLoc.xml Wed Aug 14 20:05:54 2013
@@ -9,7 +9,7 @@
   </appenders>
   <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/xml-events.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/xml-events.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/xml-events.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/xml-events.xml Wed Aug 14 20:05:54 2013
@@ -10,10 +10,10 @@
   </appenders>
   <loggers>
     <logger name="EventLogger" level="info">
-      <appender-ref ref="events"/>
+      <AppenderRef ref="events"/>
     </logger>
     <root level="warn">
-      <appender-ref ref="STDOUT"/>
+      <AppenderRef ref="STDOUT"/>
     </root>
   </loggers>
 </configuration>
\ No newline at end of file

Modified: logging/log4j/log4j2/trunk/flume-ng/src/test/resources/default_embedded.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/test/resources/default_embedded.xml?rev=1514021&r1=1514020&r2=1514021&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 Wed Aug 14 20:05:54 2013
@@ -12,10 +12,10 @@
   </appenders>
   <loggers>
     <logger name="EventLogger" level="info" additivity="false">
-      <appender-ref ref="eventLogger"/>
+      <AppenderRef ref="eventLogger"/>
     </logger>
     <root level="error">
-      <appender-ref ref="STDOUT"/>
+      <AppenderRef ref="STDOUT"/>
     </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=1514021&r1=1514020&r2=1514021&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 Wed Aug 14 20:05:54 2013
@@ -32,10 +32,10 @@
   </appenders>
   <loggers>
     <logger name="EventLogger" level="info" additivity="false">
-      <appender-ref ref="eventLogger"/>
+      <AppenderRef ref="eventLogger"/>
     </logger>
     <root level="warn">
-      <appender-ref ref="STDOUT"/>
+      <AppenderRef ref="STDOUT"/>
     </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=1514021&r1=1514020&r2=1514021&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 Wed Aug 14 20:05:54 2013
@@ -15,10 +15,10 @@
   </appenders>
   <loggers>
     <logger name="EventLogger" level="info" additivity="false">
-      <appender-ref ref="eventLogger"/>
+      <AppenderRef ref="eventLogger"/>
     </logger>
     <root level="error">
-      <appender-ref ref="STDOUT"/>
+      <AppenderRef ref="STDOUT"/>
     </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=1514021&r1=1514020&r2=1514021&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 Wed Aug 14 20:05:54 2013
@@ -24,15 +24,15 @@
 
   <loggers>
     <logger name="EventLogger" level="info" additivity="false">
-      <appender-ref ref="EventLogger"/>
+      <AppenderRef ref="EventLogger"/>
     </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/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java Wed Aug 14 20:05:54 2013
@@ -24,22 +24,23 @@ import static org.junit.Assert.assertTru
 import java.util.Date;
 import java.util.List;
 
-import ch.qos.logback.classic.joran.JoranConfigurator;
-import ch.qos.logback.classic.spi.ILoggingEvent;
-import ch.qos.logback.core.joran.spi.JoranException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.ThreadContext;
 import org.apache.logging.log4j.message.MessageFactory;
 import org.apache.logging.log4j.message.ParameterizedMessageFactory;
 import org.apache.logging.log4j.message.StringFormatterMessageFactory;
-import ch.qos.logback.core.testUtil.StringListAppender;
-import ch.qos.logback.classic.LoggerContext;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.slf4j.LoggerFactory;
 
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.joran.JoranConfigurator;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.joran.spi.JoranException;
+import ch.qos.logback.core.testUtil.StringListAppender;
+
 /**
  *
  */
@@ -74,6 +75,8 @@ public class LoggerTest {
 
     @Before
     public void before() {
+    	assertNotNull(list);
+    	assertNotNull(list.strList);
         list.strList.clear();
     }
 

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=1514021&r1=1514020&r2=1514021&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 Wed Aug 14 20:05:54 2013
@@ -27,13 +27,13 @@
   </appenders>
   <loggers>
     <logger name="org.apache.test.logging" level="debug" additivity="false">
-      <appender-ref ref="List"/>
+      <AppenderRef ref="List"/>
     </logger>
     <logger name="org.apache.test" level="trace" additivity="false">
-      <appender-ref ref="List"/>
+      <AppenderRef ref="List"/>
     </logger>
     <root level="error">
-      <appender-ref ref="STDOUT"/>
+      <AppenderRef ref="STDOUT"/>
     </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=1514021&r1=1514020&r2=1514021&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 Wed Aug 14 20:05:54 2013
@@ -40,10 +40,10 @@
 	</appenders>
 	<loggers>
 		<logger name="EventLogger" level="WARN" additivity="false">
-			<appender-ref ref="flume" />
+			<AppenderRef ref="flume" />
 		</logger>
 		<root level="debug">
-			<appender-ref ref="RollingFile" />
+			<AppenderRef ref="RollingFile" />
 		</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=1514021&r1=1514020&r2=1514021&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 Wed Aug 14 20:05:54 2013
@@ -40,10 +40,10 @@
 	</appenders>
 	<loggers>
 		<logger name="EventLogger" level="WARN" additivity="false">
-			<appender-ref ref="flume" />
+			<AppenderRef ref="flume" />
 		</logger>
 		<root level="debug">
-			<appender-ref ref="RollingFile" />
+			<AppenderRef ref="RollingFile" />
 		</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=1514021&r1=1514020&r2=1514021&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 Wed Aug 14 20:05:54 2013
@@ -25,15 +25,15 @@
 
   <loggers>
     <logger name="EventLogger" level="info" additivity="false">
-      <appender-ref ref="EventLogger"/>
+      <AppenderRef ref="EventLogger"/>
     </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/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/changes.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/changes/changes.xml (original)
+++ logging/log4j/log4j2/trunk/src/changes/changes.xml Wed Aug 14 20:05:54 2013
@@ -432,7 +432,7 @@
         The blocking parameter did not work properly on AsynchAppender.
       </action>
       <action issue="LOG4J2-188" dev="rgoers" type="fix" due-to="Werner">
-        appender-refs on AsynchAppender didn't support the level and filter elements.
+        AppenderRefs on AsynchAppender didn't support the level and filter elements.
       </action>
       <action issue="LOG4J2-176" dev="rgoers" type="fix" due-to="Remko Popma">
         Avoid IllegalArgumentException in AsynchAppender.
@@ -797,7 +797,7 @@
     </release>
     <release version="2.0-alpha1" date="2012-07-29" description="Rewrite of Log4j">
       <action issue="LOG4J2-60" dev="rgoers" type="add" due-to="Shane Kelly">
-        Added ability to filter on the appender-ref by adding either a level or a filter.
+        Added ability to filter on the AppenderRef by adding either a level or a filter.
       </action>
       <action issue="LOG4J2-56" dev="rgoers" type="fix" due-to="John Owen Atala">
         Level.toLevel would throw an IllegalArgumentException instead of returning the default value.

Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/appenders.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/appenders.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/appenders.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/appenders.xml Wed Aug 14 20:05:54 2013
@@ -59,9 +59,9 @@
               <th>Description</th>
             </tr>
             <tr>
-              <td>appender-ref</td>
+              <td>AppenderRef</td>
               <td>String</td>
-              <td>The name of the Appenders to invoke asynchronously. Multiple appender-ref
+              <td>The name of the Appenders to invoke asynchronously. Multiple AppenderRef
                 elements can be configured.</td>
             </tr>
             <tr>
@@ -122,12 +122,12 @@
       </PatternLayout>
     </File>
     <Async name="Async">
-      <appender-ref ref="MyFile"/>
+      <AppenderRef ref="MyFile"/>
     </Async>
   </appenders>
   <loggers>
     <root level="error">
-      <appender-ref ref="Async"/>
+      <AppenderRef ref="Async"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -196,7 +196,7 @@
   </appenders>
   <loggers>
     <root level="error">
-      <appender-ref ref="STDOUT"/>
+      <AppenderRef ref="STDOUT"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -271,13 +271,13 @@
     </Console>
     <Failover name="Failover" primary="RollingFile">
       <Failovers>
-        <appender-ref ref="Console"/>
+        <AppenderRef ref="Console"/>
       </Failovers>
     </Failover>
   </appenders>
   <loggers>
     <root level="error">
-      <appender-ref ref="Failover"/>
+      <AppenderRef ref="Failover"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -387,7 +387,7 @@
   </appenders>
   <loggers>
     <root level="error">
-      <appender-ref ref="MyFile"/>
+      <AppenderRef ref="MyFile"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -588,7 +588,7 @@
   </appenders>
   <loggers>
     <root level="error">
-      <appender-ref ref="RollingRandomAccessFile"/>
+      <AppenderRef ref="RollingRandomAccessFile"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -613,7 +613,7 @@
   </appenders>
   <loggers>
     <root level="error">
-      <appender-ref ref="RollingRandomAccessFile"/>
+      <AppenderRef ref="RollingRandomAccessFile"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -647,7 +647,7 @@
   </appenders>
   <loggers>
     <root level="error">
-      <appender-ref ref="RollingRandomAccessFile"/>
+      <AppenderRef ref="RollingRandomAccessFile"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -749,7 +749,7 @@
   </appenders>
   <loggers>
     <root level="error">
-      <appender-ref ref="MyFile"/>
+      <AppenderRef ref="MyFile"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -927,7 +927,7 @@
   </appenders>
   <loggers>
     <root level="error">
-      <appender-ref ref="eventLogger"/>
+      <AppenderRef ref="eventLogger"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -948,7 +948,7 @@
   </appenders>
   <loggers>
     <root level="error">
-      <appender-ref ref="eventLogger"/>
+      <AppenderRef ref="eventLogger"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -972,10 +972,10 @@
   </appenders>
   <loggers>
     <logger name="EventLogger" level="info">
-      <appender-ref ref="eventLogger"/>
+      <AppenderRef ref="eventLogger"/>
     </logger>
     <root level="warn">
-      <appender-ref ref="STDOUT"/>
+      <AppenderRef ref="STDOUT"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -1016,10 +1016,10 @@
   </appenders>
   <loggers>
     <logger name="EventLogger" level="info">
-      <appender-ref ref="eventLogger"/>
+      <AppenderRef ref="eventLogger"/>
     </logger>
     <root level="warn">
-      <appender-ref ref="STDOUT"/>
+      <AppenderRef ref="STDOUT"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -1216,7 +1216,7 @@
   </appenders>
   <loggers>
     <root level="warn">
-      <appender-ref ref="databaseAppender"/>
+      <AppenderRef ref="databaseAppender"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -1235,7 +1235,7 @@
   </appenders>
   <loggers>
     <root level="warn">
-      <appender-ref ref="databaseAppender"/>
+      <AppenderRef ref="databaseAppender"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -1255,7 +1255,7 @@
   </appenders>
   <loggers>
     <root level="warn">
-      <appender-ref ref="databaseAppender"/>
+      <AppenderRef ref="databaseAppender"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -1365,7 +1365,7 @@
   </appenders>
   <loggers>
     <root level="error">
-      <appender-ref ref="jmsQueue"/>
+      <AppenderRef ref="jmsQueue"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -1476,7 +1476,7 @@
   </appenders>
   <loggers>
     <root level="error">
-      <appender-ref ref="jmsQueue"/>
+      <AppenderRef ref="jmsQueue"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -1552,7 +1552,7 @@
   </appenders>
   <loggers>
     <root level="warn">
-      <appender-ref ref="databaseAppender"/>
+      <AppenderRef ref="databaseAppender"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -1806,7 +1806,7 @@ public class JpaLogEntity extends Abstra
   </appenders>
   <loggers>
     <root level="warn">
-      <appender-ref ref="databaseAppender"/>
+      <AppenderRef ref="databaseAppender"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -1821,7 +1821,7 @@ public class JpaLogEntity extends Abstra
   </appenders>
   <loggers>
     <root level="warn">
-      <appender-ref ref="databaseAppender"/>
+      <AppenderRef ref="databaseAppender"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -1836,7 +1836,7 @@ public class JpaLogEntity extends Abstra
   </appenders>
   <loggers>
     <root level="warn">
-      <appender-ref ref="databaseAppender"/>
+      <AppenderRef ref="databaseAppender"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -1919,9 +1919,9 @@ public class JpaLogEntity extends Abstra
               <th>Description</th>
             </tr>
             <tr>
-              <td>appender-ref</td>
+              <td>AppenderRef</td>
               <td>String</td>
-              <td>The name of the Appenders to call after the LogEvent has been manipulated. Multiple appender-ref
+              <td>The name of the Appenders to call after the LogEvent has been manipulated. Multiple AppenderRef
                 elements can be configured.</td>
             </tr>
             <tr>
@@ -1989,7 +1989,7 @@ public class JpaLogEntity extends Abstra
       <PatternLayout pattern="%m%n"/>
     </Console>
     <Rewrite name="rewrite">
-      <appender-ref ref="STDOUT"/>
+      <AppenderRef ref="STDOUT"/>
       <MapRewritePolicy mode="Add">
         <KeyValuePair key="product" value="TestProduct"/>
       </MapRewritePolicy>
@@ -1997,7 +1997,7 @@ public class JpaLogEntity extends Abstra
   </appenders>
   <loggers>
     <root level="error">
-      <appender-ref ref="Rewrite"/>
+      <AppenderRef ref="Rewrite"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -2032,7 +2032,7 @@ public class JpaLogEntity extends Abstra
       <PatternLayout pattern="%m%n"/>
     </Console>
     <Rewrite name="rewrite">
-      <appender-ref ref="STDOUT"/>
+      <AppenderRef ref="STDOUT"/>
       <PropertiesRewritePolicy>
         <Property key="user">${sys:user.name}</Property>
         <Property key="env">${sys:environment}</Property>
@@ -2041,7 +2041,7 @@ public class JpaLogEntity extends Abstra
   </appenders>
   <loggers>
     <root level="error">
-      <appender-ref ref="Rewrite"/>
+      <AppenderRef ref="Rewrite"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -2357,7 +2357,7 @@ public class JpaLogEntity extends Abstra
   </appenders>
   <loggers>
     <root level="error">
-      <appender-ref ref="RollingFile"/>
+      <AppenderRef ref="RollingFile"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -2381,7 +2381,7 @@ public class JpaLogEntity extends Abstra
   </appenders>
   <loggers>
     <root level="error">
-      <appender-ref ref="RollingFile"/>
+      <AppenderRef ref="RollingFile"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -2408,7 +2408,7 @@ public class JpaLogEntity extends Abstra
   </appenders>
   <loggers>
     <root level="error">
-      <appender-ref ref="RollingFile"/>
+      <AppenderRef ref="RollingFile"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -2468,7 +2468,7 @@ public class JpaLogEntity extends Abstra
               can be configured as the default.
             </p>
             <p>
-              Each Route must reference an Appender. If the Route contains an appender-ref attribute then the
+              Each Route must reference an Appender. If the Route contains an AppenderRef attribute then the
               Route will reference an Appender that was defined in the configuration. If the Route contains an
               Appender definition then an Appender will be created within the context of the RoutingAppender and
               will be reused each time a matching Appender name is referenced through a Route.
@@ -2498,13 +2498,13 @@ public class JpaLogEntity extends Abstra
             <SizeBasedTriggeringPolicy size="500" />
           </RollingFile>
         </Route>
-        <Route appender-ref="AuditLogger" key="Audit"/>
+        <Route AppenderRef="AuditLogger" key="Audit"/>
       </Routes>
     </Routing>
   </appenders>
   <loggers>
     <root level="error">
-      <appender-ref ref="Routing"/>
+      <AppenderRef ref="Routing"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -2631,7 +2631,7 @@ public class JpaLogEntity extends Abstra
   </appenders>
   <loggers>
     <root level="error">
-      <appender-ref ref="Mail"/>
+      <AppenderRef ref="Mail"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -2722,7 +2722,7 @@ public class JpaLogEntity extends Abstra
   </appenders>
   <loggers>
     <root level="error">
-      <appender-ref ref="socket"/>
+      <AppenderRef ref="socket"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -2904,10 +2904,10 @@ public class JpaLogEntity extends Abstra
   </appenders>
   <loggers>
     <logger name="com.mycorp" level="error">
-      <appender-ref ref="RFC5424"/>
+      <AppenderRef ref="RFC5424"/>
     </logger>
     <root level="error">
-      <appender-ref ref="bsd"/>
+      <AppenderRef ref="bsd"/>
     </root>
   </loggers>
 </configuration>]]></pre>

Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/async.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/async.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/async.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/async.xml Wed Aug 14 20:05:54 2013
@@ -162,7 +162,7 @@
   </appenders>
   <loggers>
     <root level="info" includeLocation="false">
-      <appender-ref ref="RandomAccessFile"/>
+      <AppenderRef ref="RandomAccessFile"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -360,10 +360,10 @@
   <loggers>
     <!-- pattern layout actually uses location, so we need to include it -->
     <asyncLogger name="com.foo.Bar" level="trace" includeLocation="true">
-      <appender-ref ref="RandomAccessFile"/>
+      <AppenderRef ref="RandomAccessFile"/>
     </asyncLogger>
     <root level="info" includeLocation="true">
-      <appender-ref ref="RandomAccessFile"/>
+      <AppenderRef ref="RandomAccessFile"/>
     </root>
   </loggers>
 </configuration>]]></pre>

Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/configuration.xml.vm
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/configuration.xml.vm?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/configuration.xml.vm (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/configuration.xml.vm Wed Aug 14 20:05:54 2013
@@ -161,7 +161,7 @@ public class Bar {
   </appenders>
   <loggers>
     <root level="error">
-      <appender-ref ref="Console"/>
+      <AppenderRef ref="Console"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -186,7 +186,7 @@ public class Bar {
             <pre class="prettyprint linenums"><![CDATA[
 <logger name="com.foo.Bar" level="TRACE"/>
 <root level="ERROR">
-  <appender-ref ref="STDOUT">
+  <AppenderRef ref="STDOUT">
 </root>]]></pre>
           <p>
             With this configuration all log events from <code>com.foo.Bar</code> will be recorded while only error events will
@@ -210,10 +210,10 @@ public class Bar {
   </appenders>
   <loggers>
     <logger name="com.foo.Bar" level="trace">
-      <appender-ref ref="Console"/>
+      <AppenderRef ref="Console"/>
     </logger>
     <root level="error">
-      <appender-ref ref="Console"/>
+      <AppenderRef ref="Console"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -242,10 +242,10 @@ public class Bar {
   </appenders>
   <loggers>
     <logger name="com.foo.Bar" level="trace" additivity="false">
-      <appender-ref ref="Console"/>
+      <AppenderRef ref="Console"/>
     </logger>
     <root level="error">
-      <appender-ref ref="Console"/>
+      <AppenderRef ref="Console"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -408,7 +408,7 @@ public class Bar {
     </logger>
     ...
     <root level="level">
-      <appender-ref ref="name"/>
+      <AppenderRef ref="name"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -443,7 +443,7 @@ public class Bar {
     </logger>
     ...
     <root level="level">
-      <appender-ref ref="name"/>
+      <AppenderRef ref="name"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -488,15 +488,15 @@ public class Bar {
       <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>
 
@@ -537,16 +537,16 @@ public class Bar {
                 "SizeBasedTriggeringPolicy": { "size": "500" }
               }
             },
-            { "appender-ref": "STDOUT", "key": "Audit"},
-            { "appender-ref": "List", "key": "Service"}
+            { "AppenderRef": "STDOUT", "key": "Audit"},
+            { "AppenderRef": "List", "key": "Service"}
           ]
         }
       }
     },
     "loggers": {
       "logger": { "name": "EventLogger", "level": "info", "additivity": "false",
-                  "appender-ref": { "ref": "Routing" }},
-      "root": { "level": "error", "appender-ref": { "ref": "STDOUT" }}
+                  "AppenderRef": { "ref": "Routing" }},
+      "root": { "level": "error", "AppenderRef": { "ref": "STDOUT" }}
     }
   }
 }</pre>
@@ -580,8 +580,8 @@ public class Bar {
                   "SizeBasedTriggeringPolicy": { "size": "500" }
                 }
               },
-              { "appender-ref": "STDOUT", "key": "Audit"},
-              { "appender-ref": "List", "key": "Service"}
+              { "AppenderRef": "STDOUT", "key": "Audit"},
+              { "AppenderRef": "List", "key": "Service"}
             ]
           }
         }
@@ -590,11 +590,11 @@ public class Bar {
     "loggers": {
       "logger": [
         { "name": "EventLogger", "level": "info", "additivity": "false",
-          "appender-ref": { "ref": "Routing" }},
+          "AppenderRef": { "ref": "Routing" }},
         { "name": "com.foo.bar", "level": "error", "additivity": "false",
-          "appender-ref": { "ref": "Console" }}
+          "AppenderRef": { "ref": "Console" }}
       ],
-      "root": { "level": "error", "appender-ref": { "ref": "STDOUT" }}
+      "root": { "level": "error", "AppenderRef": { "ref": "STDOUT" }}
     }
   }
 }</pre>
@@ -638,7 +638,7 @@ public class Bar {
             using variables.
           </p>
           <p>
-            The LoggerConfig may also be configured with one or more appender-ref elements. Each appender
+            The LoggerConfig may also be configured with one or more AppenderRef elements. Each appender
             referenced will become associated with the specified LoggerConfig. If multiple appenders
             are configured on the LoggerConfig each of them be called when processing logging events.
           </p>
@@ -718,21 +718,21 @@ public class Bar {
       <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">
       <property name="user">${dollar}{sys:user.name}</property>
-      <appender-ref ref="File">
+      <AppenderRef ref="File">
         <ThreadContextMapFilter>
           <KeyValuePair key="test" value="123"/>
         </ThreadContextMapFilter>
-      </appender-ref>
-      <appender-ref ref="STDOUT" level="error"/>
+      </AppenderRef>
+      <AppenderRef ref="STDOUT" level="error"/>
     </logger>>
 
     <root level="trace">
-      <appender-ref ref="List"/>
+      <AppenderRef ref="List"/>
     </root>
   </loggers>
 
@@ -776,19 +776,19 @@ public class Bar {
             <SizeBasedTriggeringPolicy size="500" />
           </RollingFile>
         </Route>
-        <Route appender-ref="STDOUT" key="Audit"/>
-        <Route appender-ref="List" key="Service"/>
+        <Route AppenderRef="STDOUT" key="Audit"/>
+        <Route AppenderRef="List" key="Service"/>
       </Routes>
     </Routing>
   </appenders>
 
   <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>
 
@@ -916,19 +916,19 @@ public class Bar {
             <SizeBasedTriggeringPolicy size="500" />
           </RollingFile>
         </Route>
-        <Route appender-ref="STDOUT" key="Audit"/>
-        <Route appender-ref="List" key="Service"/>
+        <Route AppenderRef="STDOUT" key="Audit"/>
+        <Route AppenderRef="List" key="Service"/>
       </Routes>
     </Routing>
   </appenders>
 
   <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>
 
@@ -961,11 +961,11 @@ public class Bar {
        appender.ListAppender for element List with params(name="List", entryPerNewLine="null",
        raw="null", null, ThresholdFilter(DEBUG))
 2011-11-23 17:08:00,813 DEBUG Calling createRoute on class org.apache.logging.log4j.core.appender.
-       routing.Route for element Route with params(appender-ref="null", key="null", Node=Route)
+       routing.Route for element Route with params(AppenderRef="null", key="null", Node=Route)
 2011-11-23 17:08:00,823 DEBUG Calling createRoute on class org.apache.logging.log4j.core.appender.
-       routing.Route for element Route with params(appender-ref="STDOUT", key="Audit", Node=Route)
+       routing.Route for element Route with params(AppenderRef="STDOUT", key="Audit", Node=Route)
 2011-11-23 17:08:00,824 DEBUG Calling createRoute on class org.apache.logging.log4j.core.appender.
-       routing.Route for element Route with params(appender-ref="List", key="Service", Node=Route)
+       routing.Route for element Route with params(AppenderRef="List", key="Service", Node=Route)
 2011-11-23 17:08:00,825 DEBUG Calling createRoutes on class org.apache.logging.log4j.core.appender.
        routing.Routes for element Routes with params(pattern="${dollar}{sd:type}",
        routes={Route(type=dynamic default), Route(type=static Reference=STDOUT key='Audit'),
@@ -978,16 +978,16 @@ public class Bar {
 2011-11-23 17:08:00,827 DEBUG Calling createAppenders on class org.apache.logging.log4j.core.config.
        plugins.AppendersPlugin for element appenders with params(appenders={STDOUT, List, Routing})
 2011-11-23 17:08:00,828 DEBUG Calling createAppenderRef on class org.apache.logging.log4j.core.
-       config.plugins.AppenderRefPlugin for element appender-ref with params(ref="Routing")
+       config.plugins.AppenderRefPlugin for element AppenderRef with params(ref="Routing")
 2011-11-23 17:08:00,829 DEBUG Calling createLogger on class org.apache.logging.log4j.core.config.
        LoggerConfig for element logger with params(additivity="false", level="info", name="EventLogger",
-       appender-ref={Routing}, null)
+       AppenderRef={Routing}, null)
 2011-11-23 17:08:00,830 DEBUG Calling createAppenderRef on class org.apache.logging.log4j.core.
-       config.plugins.AppenderRefPlugin for element appender-ref with params(ref="STDOUT")</pre>
+       config.plugins.AppenderRefPlugin for element AppenderRef with params(ref="STDOUT")</pre>
             <pre class="prettyprint linenums">
 2011-11-23 17:08:00,831 DEBUG Calling createLogger on class org.apache.logging.log4j.core.config.
        LoggerConfig$RootLogger for element root with params(additivity="null", level="error",
-       appender-ref={STDOUT}, null)
+       AppenderRef={STDOUT}, null)
 2011-11-23 17:08:00,833 DEBUG Calling createLoggers on class org.apache.logging.log4j.core.
        config.plugins.LoggersPlugin for element loggers with params(loggers={EventLogger, root})
 2011-11-23 17:08:00,834 DEBUG Reconfiguration completed
@@ -1024,16 +1024,16 @@ public class Bar {
 2011-11-23 17:08:00,804 DEBUG Calling createAppender on class org.apache.logging.log4j.core.appender.ConsoleAppender for element Console with params(PatternLayout(%m%n), null, target="null", name="STDOUT", ignoreExceptions="null")
 2011-11-23 17:08:00,804 DEBUG Calling createFilter on class org.apache.logging.log4j.core.filter.ThresholdFilter for element ThresholdFilter with params(level="debug", onMatch="null", onMismatch="null")
 2011-11-23 17:08:00,806 DEBUG Calling createAppender on class org.apache.logging.log4j.test.appender.ListAppender for element List with params(name="List", entryPerNewLine="null", raw="null", null, ThresholdFilter(DEBUG))
-2011-11-23 17:08:00,813 DEBUG Calling createRoute on class org.apache.logging.log4j.core.appender.routing.Route for element Route with params(appender-ref="null", key="null", Node=Route)
-2011-11-23 17:08:00,823 DEBUG Calling createRoute on class org.apache.logging.log4j.core.appender.routing.Route for element Route with params(appender-ref="STDOUT", key="Audit", Node=Route)
-2011-11-23 17:08:00,824 DEBUG Calling createRoute on class org.apache.logging.log4j.core.appender.routing.Route for element Route with params(appender-ref="List", key="Service", Node=Route)
+2011-11-23 17:08:00,813 DEBUG Calling createRoute on class org.apache.logging.log4j.core.appender.routing.Route for element Route with params(AppenderRef="null", key="null", Node=Route)
+2011-11-23 17:08:00,823 DEBUG Calling createRoute on class org.apache.logging.log4j.core.appender.routing.Route for element Route with params(AppenderRef="STDOUT", key="Audit", Node=Route)
+2011-11-23 17:08:00,824 DEBUG Calling createRoute on class org.apache.logging.log4j.core.appender.routing.Route for element Route with params(AppenderRef="List", key="Service", Node=Route)
 2011-11-23 17:08:00,825 DEBUG Calling createRoutes on class org.apache.logging.log4j.core.appender.routing.Routes for element Routes with params(pattern="${dollar}{sd:type}", routes={Route(type=dynamic default), Route(type=static Reference=STDOUT key='Audit'), Route(type=static Reference=List key='Service')})
 2011-11-23 17:08:00,827 DEBUG Calling createAppender on class org.apache.logging.log4j.core.appender.routing.RoutingAppender for element Routing with params(name="Routing", ignoreExceptions="null", Routes({Route(type=dynamic default),Route(type=static Reference=STDOUT key='Audit'),Route(type=static Reference=List key='Service')}), Configuration(RoutingTest), null, null)
 2011-11-23 17:08:00,827 DEBUG Calling createAppenders on class org.apache.logging.log4j.core.config.plugins.AppendersPlugin for element appenders with params(appenders={STDOUT, List, Routing})
-2011-11-23 17:08:00,828 DEBUG Calling createAppenderRef on class org.apache.logging.log4j.core.config.plugins.AppenderRefPlugin for element appender-ref with params(ref="Routing")
-2011-11-23 17:08:00,829 DEBUG Calling createLogger on class org.apache.logging.log4j.core.config.LoggerConfig for element logger with params(additivity="false", level="info", name="EventLogger", appender-ref={Routing}, null)
-2011-11-23 17:08:00,830 DEBUG Calling createAppenderRef on class org.apache.logging.log4j.core.config.plugins.AppenderRefPlugin for element appender-ref with params(ref="STDOUT")
-2011-11-23 17:08:00,831 DEBUG Calling createLogger on class org.apache.logging.log4j.core.config.LoggerConfig$RootLogger for element root with params(additivity="null", level="error", appender-ref={STDOUT}, null)
+2011-11-23 17:08:00,828 DEBUG Calling createAppenderRef on class org.apache.logging.log4j.core.config.plugins.AppenderRefPlugin for element AppenderRef with params(ref="Routing")
+2011-11-23 17:08:00,829 DEBUG Calling createLogger on class org.apache.logging.log4j.core.config.LoggerConfig for element logger with params(additivity="false", level="info", name="EventLogger", AppenderRef={Routing}, null)
+2011-11-23 17:08:00,830 DEBUG Calling createAppenderRef on class org.apache.logging.log4j.core.config.plugins.AppenderRefPlugin for element AppenderRef with params(ref="STDOUT")
+2011-11-23 17:08:00,831 DEBUG Calling createLogger on class org.apache.logging.log4j.core.config.LoggerConfig$RootLogger for element root with params(additivity="null", level="error", AppenderRef={STDOUT}, null)
 2011-11-23 17:08:00,833 DEBUG Calling createLoggers on class org.apache.logging.log4j.core.config.plugins.LoggersPlugin for element loggers with params(loggers={EventLogger, root})
 2011-11-23 17:08:00,834 DEBUG Reconfiguration completed
 2011-11-23 17:08:00,846 DEBUG Calling createLayout on class org.apache.logging.log4j.core.layout.PatternLayout for element PatternLayout with params(pattern="%d %p %c{1.} [%t] %m%n", Configuration(RoutingTest), null, charset="null")
@@ -1053,7 +1053,7 @@ public class Bar {
             makes troubleshooting configuration errors possible. As an example, if the configuration above is changed
             to have the status set to error and the logger declaration is:</p>
 <pre class="prettyprint linenums"><![CDATA[<logger name="EventLogger" level="info" additivity="false">
-  <appender-ref ref="Routng"/>
+  <AppenderRef ref="Routng"/>
 </logger>]]></pre>
           <p>
             the following error message will be produced.

Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/extending.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/extending.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/extending.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/extending.xml Wed Aug 14 20:05:54 2013
@@ -143,7 +143,7 @@ public static class RootLogger extends L
     @PluginFactory
     public static LoggerConfig createLogger(@PluginAttr("additivity") String additivity,
                                             @PluginAttr("level") String loggerLevel,
-                                            @PluginElement("appender-ref") AppenderRef[] refs,
+                                            @PluginElement("AppenderRef") AppenderRef[] refs,
                                             @PluginElement("filters") Filter filter) {
         List<AppenderRef> appenderRefs = Arrays.asList(refs);
         Level level;

Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/filters.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/filters.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/filters.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/filters.xml Wed Aug 14 20:05:54 2013
@@ -109,7 +109,7 @@
   </appenders>
   <loggers>
     <root level="error">
-      <appender-ref ref="RollingFile"/>
+      <AppenderRef ref="RollingFile"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -151,10 +151,10 @@
   </appenders>
   <loggers>
     <logger name="EventLogger" level="info">
-      <appender-ref ref="Audit"/>
+      <AppenderRef ref="Audit"/>
     </logger>
     <root level="error">
-      <appender-ref ref="RollingFile"/>
+      <AppenderRef ref="RollingFile"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -220,7 +220,7 @@
   </appenders>
   <loggers>
     <root level="error">
-      <appender-ref ref="RollingFile"/>
+      <AppenderRef ref="RollingFile"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -284,7 +284,7 @@
   </appenders>
   <loggers>
     <root level="error">
-      <appender-ref ref="RollingFile"/>
+      <AppenderRef ref="RollingFile"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -311,8 +311,8 @@
         <KeyValuePair key="eventId" value="Login"/>
         <KeyValuePair key="eventId" value="Logout"/>
       </MapFilter>
-      <appender-ref ref="RollingFile">
-      </appender-ref>
+      <AppenderRef ref="RollingFile">
+      </AppenderRef>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -335,12 +335,12 @@
   </appenders>
   <loggers>
     <root level="error">
-      <appender-ref ref="RollingFile">
+      <AppenderRef ref="RollingFile">
         <MapFilter onMatch="ACCEPT" onMismatch="NEUTRAL" operator="or">
           <KeyValuePair key="eventId" value="Login"/>
           <KeyValuePair key="eventId" value="Logout"/>
         </MapFilter>
-      </appender-ref>
+      </AppenderRef>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -396,7 +396,7 @@
   </appenders>
   <loggers>
     <root level="error">
-      <appender-ref ref="RollingFile"/>
+      <AppenderRef ref="RollingFile"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -456,7 +456,7 @@
   </appenders>
   <loggers>
     <root level="error">
-      <appender-ref ref="RollingFile"/>
+      <AppenderRef ref="RollingFile"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -523,7 +523,7 @@
   </appenders>
   <loggers>
     <root level="error">
-      <appender-ref ref="RollingFile"/>
+      <AppenderRef ref="RollingFile"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -587,7 +587,7 @@
   </appenders>
   <loggers>
     <root level="error">
-      <appender-ref ref="RollingFile"/>
+      <AppenderRef ref="RollingFile"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -608,7 +608,7 @@
   </appenders>
   <loggers>
     <root level="error">
-      <appender-ref ref="RollingFile"/>
+      <AppenderRef ref="RollingFile"/>
       <ThreadContextMapFilter onMatch="ACCEPT" onMismatch="NEUTRAL" operator="or">
         <KeyValuePair key="foo" value="bar"/>
         <KeyValuePair key="User2" value="WARN"/>
@@ -670,7 +670,7 @@
   </appenders>
   <loggers>
     <root level="error">
-      <appender-ref ref="RollingFile"/>
+      <AppenderRef ref="RollingFile"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -740,7 +740,7 @@
   </appenders>
   <loggers>
     <root level="error">
-      <appender-ref ref="RollingFile"/>
+      <AppenderRef ref="RollingFile"/>
     </root>
   </loggers>
 </configuration>]]></pre>

Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/flowtracing.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/flowtracing.xml?rev=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/flowtracing.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/flowtracing.xml Wed Aug 14 20:05:54 2013
@@ -154,7 +154,7 @@ public class App {
   </appenders>
   <loggers>
     <root level="trace">
-      <appender-ref ref="log"/>
+      <AppenderRef ref="log"/>
     </root>
   </loggers>
 </configuration>]]></pre>

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=1514021&r1=1514020&r2=1514021&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/migration.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/migration.xml Wed Aug 14 20:05:54 2013
@@ -81,7 +81,7 @@
   </category>
   <root>
     <priority value ="debug" />
-    <appender-ref ref="STDOUT" />
+    <AppenderRef ref="STDOUT" />
   </root>
 </log4j:configuration>]]></pre>
             <p>Log4j 2 XML configuration</p>
@@ -95,7 +95,7 @@
   <loggers>
     <logger name="org.apache.log4j.xml" level="info"/>
     <root level="debug">
-      <appender-ref ref="STDOUT"/>
+      <AppenderRef ref="STDOUT"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -119,11 +119,11 @@
   </appender>
   <category name="org.apache.log4j.xml">
     <priority value="debug" />
-    <appender-ref ref="A1" />
+    <AppenderRef ref="A1" />
   </category>
   <root>
     <priority value ="debug" />
-    <appender-ref ref="STDOUT" />
+    <AppenderRef ref="STDOUT" />
   </root>
 </log4j:configuration>]]></pre>
 
@@ -140,10 +140,10 @@
   </appenders>
   <loggers>
     <logger name="org.apache.log4j.xml" level="debug">
-      <appender-ref ref="A1"/>
+      <AppenderRef ref="A1"/>
     </logger>
     <root level="debug">
-      <appender-ref ref="STDOUT"/>
+      <AppenderRef ref="STDOUT"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -169,11 +169,11 @@
   </appender>
   <category name="org.apache.log4j.xml">
     <priority value="debug"/>
-    <appender-ref ref="A1"/>
+    <AppenderRef ref="A1"/>
   </category>
   <root>
     <priority value="debug"/>
-    <appender-ref ref="STDOUT"/>
+    <AppenderRef ref="STDOUT"/>
   </root>
 </log4j:configuration>]]></pre>
 
@@ -190,10 +190,10 @@
   </appenders>
   <loggers>
     <logger name="org.apache.log4j.xml" level="debug">
-      <appender-ref ref="A1"/>
+      <AppenderRef ref="A1"/>
     </logger>
     <root level="debug">
-      <appender-ref ref="STDOUT"/>
+      <AppenderRef ref="STDOUT"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -204,7 +204,7 @@
 <!DOCTYPE log4j:configuration PUBLIC "-//APACHE//DTD LOG4J 1.2//EN" "log4j.dtd">
 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" configDebug="true">
   <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
-    <appender-ref ref="TEMP"/>
+    <AppenderRef ref="TEMP"/>
   </appender>
   <appender name="TEMP" class="org.apache.log4j.FileAppender">
     <param name="File" value="temp"/>
@@ -214,7 +214,7 @@
   </appender>
   <root>
     <priority value="debug"/>
-    <appender-ref ref="ASYNC"/>
+    <AppenderRef ref="ASYNC"/>
   </root>
 </log4j:configuration>]]></pre>
 
@@ -226,12 +226,12 @@
       <PatternLayout pattern="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
     </File>
     <Async name="ASYNC">
-      <appender-ref ref="TEMP"/>
+      <AppenderRef ref="TEMP"/>
     </Async>
   </appenders>
   <loggers>
     <root level="debug">
-      <appender-ref ref="ASYNC"/>
+      <AppenderRef ref="ASYNC"/>
     </root>
   </loggers>
 </configuration>]]></pre>
@@ -243,8 +243,8 @@
 <!DOCTYPE log4j:configuration PUBLIC "-//APACHE//DTD LOG4J 1.2//EN" "log4j.dtd">
 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" configDebug="true">
   <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
-    <appender-ref ref="TEMP"/>
-    <appender-ref ref="CONSOLE"/>
+    <AppenderRef ref="TEMP"/>
+    <AppenderRef ref="CONSOLE"/>
   </appender>
   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
     <layout class="org.apache.log4j.PatternLayout">
@@ -259,7 +259,7 @@
   </appender>
   <root>
     <priority value="debug"/>
-    <appender-ref ref="ASYNC"/>
+    <AppenderRef ref="ASYNC"/>
   </root>
 </log4j:configuration>]]></pre>
 
@@ -275,13 +275,13 @@
       <PatternLayout pattern="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
     </File>
     <Async name="ASYNC">
-      <appender-ref ref="TEMP"/>
-      <appender-ref ref="CONSOLE"/>
+      <AppenderRef ref="TEMP"/>
+      <AppenderRef ref="CONSOLE"/>
     </Async>
   </appenders>
   <loggers>
     <root level="debug">
-      <appender-ref ref="ASYNC"/>
+      <AppenderRef ref="ASYNC"/>
     </root>
   </loggers>
 </configuration>]]></pre>

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=1514021&r1=1514020&r2=1514021&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 Wed Aug 14 20:05:54 2013
@@ -24,15 +24,15 @@
 
   <loggers>
     <logger name="EventLogger" level="info" additivity="false">
-      <appender-ref ref="EventLogger"/>
+      <AppenderRef ref="EventLogger"/>
     </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>
 
     <logger name="IfEnabledTagTest" level="warn" />



Mime
View raw message