You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2013/08/14 22:25:44 UTC
svn commit: r1514027 - 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/db/jdbc/
core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/ core/...
Author: ggregory
Date: Wed Aug 14 20:25:42 2013
New Revision: 1514027
URL: http://svn.apache.org/r1514027
Log:
[LOG4J2-353] Use consistent conventions in configuration files: @PluginElement call sites now follow the CamelCase convention.
Modified:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSQueueAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSTopicAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JDBCAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JPAAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/Routes.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderRef.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/AppendersPlugin.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/LoggersPlugin.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PropertiesPlugin.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/StructuredDataFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java
logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java?rev=1514027&r1=1514026&r2=1514027&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java Wed Aug 14 20:25:42 2013
@@ -81,8 +81,8 @@ public final class ConsoleAppender<T ext
* @return The ConsoleAppender.
*/
@PluginFactory
- public static <S extends Serializable> ConsoleAppender<S> createAppender(@PluginElement("layout") Layout<S> layout,
- @PluginElement("filters") final Filter filter,
+ public static <S extends Serializable> ConsoleAppender<S> createAppender(@PluginElement("Layout") Layout<S> layout,
+ @PluginElement("Filters") final Filter filter,
@PluginAttr("target") final String t,
@PluginAttr("name") final String name,
@PluginAttr("follow") final String follow,
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java?rev=1514027&r1=1514026&r2=1514027&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java Wed Aug 14 20:25:42 2013
@@ -189,10 +189,10 @@ public final class FailoverAppender<T ex
@PluginFactory
public static <S extends Serializable> FailoverAppender<S> createAppender(@PluginAttr("name") final String name,
@PluginAttr("primary") final String primary,
- @PluginElement("failovers") final String[] failovers,
+ @PluginElement("Failovers") final String[] failovers,
@PluginAttr("retryInterval") final String retryIntervalString,
@PluginConfiguration final Configuration config,
- @PluginElement("filters") final Filter filter,
+ @PluginElement("Filters") final Filter filter,
@PluginAttr("ignoreExceptions") final String ignore) {
if (name == null) {
LOGGER.error("A name for the Appender must be specified");
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java?rev=1514027&r1=1514026&r2=1514027&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java Wed Aug 14 20:25:42 2013
@@ -104,8 +104,8 @@ public final class FileAppender<T extend
@PluginAttr("immediateFlush") final String immediateFlush,
@PluginAttr("ignoreExceptions") final String ignore,
@PluginAttr("bufferedIO") final String bufferedIO,
- @PluginElement("layout") Layout<S> layout,
- @PluginElement("filters") final Filter filter,
+ @PluginElement("Layout") Layout<S> layout,
+ @PluginElement("Filters") final Filter filter,
@PluginAttr("advertise") final String advertise,
@PluginAttr("advertiseURI") final String advertiseURI,
@PluginConfiguration final Configuration config) {
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSQueueAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSQueueAppender.java?rev=1514027&r1=1514026&r2=1514027&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSQueueAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSQueueAppender.java Wed Aug 14 20:25:42 2013
@@ -91,8 +91,8 @@ public final class JMSQueueAppender<T ex
@PluginAttr("queueBindingName") final String queueBindingName,
@PluginAttr("userName") final String userName,
@PluginAttr("password") final String password,
- @PluginElement("layout") Layout<S> layout,
- @PluginElement("filter") final Filter filter,
+ @PluginElement("Layout") Layout<S> layout,
+ @PluginElement("Filter") final Filter filter,
@PluginAttr("ignoreExceptions") final String ignore) {
if (name == null) {
LOGGER.error("No name provided for JMSQueueAppender");
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSTopicAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSTopicAppender.java?rev=1514027&r1=1514026&r2=1514027&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSTopicAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSTopicAppender.java Wed Aug 14 20:25:42 2013
@@ -91,8 +91,8 @@ public final class JMSTopicAppender<T ex
@PluginAttr("topicBindingName") final String topicBindingName,
@PluginAttr("userName") final String userName,
@PluginAttr("password") final String password,
- @PluginElement("layout") Layout<S> layout,
- @PluginElement("filters") final Filter filter,
+ @PluginElement("Layout") Layout<S> layout,
+ @PluginElement("Filters") final Filter filter,
@PluginAttr("ignoreExceptions") final String ignore) {
if (name == null) {
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java?rev=1514027&r1=1514026&r2=1514027&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java Wed Aug 14 20:25:42 2013
@@ -127,8 +127,8 @@ public final class RandomAccessFileAppen
@PluginAttr("name") final String name,
@PluginAttr("immediateFlush") final String immediateFlush,
@PluginAttr("ignoreExceptions") final String ignore,
- @PluginElement("layout") Layout<S> layout,
- @PluginElement("filters") final Filter filter,
+ @PluginElement("Layout") Layout<S> layout,
+ @PluginElement("Filters") final Filter filter,
@PluginAttr("advertise") final String advertise,
@PluginAttr("advertiseURI") final String advertiseURI,
@PluginConfiguration final Configuration config) {
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java?rev=1514027&r1=1514026&r2=1514027&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java Wed Aug 14 20:25:42 2013
@@ -131,10 +131,10 @@ public final class RollingFileAppender<T
@PluginAttr("name") final String name,
@PluginAttr("bufferedIO") final String bufferedIO,
@PluginAttr("immediateFlush") final String immediateFlush,
- @PluginElement("policy") final TriggeringPolicy policy,
- @PluginElement("strategy") RolloverStrategy strategy,
- @PluginElement("layout") Layout<S> layout,
- @PluginElement("filter") final Filter filter,
+ @PluginElement("Policy") final TriggeringPolicy policy,
+ @PluginElement("Strategy") RolloverStrategy strategy,
+ @PluginElement("Layout") Layout<S> layout,
+ @PluginElement("Filter") final Filter filter,
@PluginAttr("ignoreExceptions") final String ignore,
@PluginAttr("advertise") final String advertise,
@PluginAttr("advertiseURI") final String advertiseURI,
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java?rev=1514027&r1=1514026&r2=1514027&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java Wed Aug 14 20:25:42 2013
@@ -149,10 +149,10 @@ public final class RollingRandomAccessFi
@PluginAttr("append") final String append,
@PluginAttr("name") final String name,
@PluginAttr("immediateFlush") final String immediateFlush,
- @PluginElement("policy") final TriggeringPolicy policy,
- @PluginElement("strategy") RolloverStrategy strategy,
- @PluginElement("layout") Layout<S> layout,
- @PluginElement("filter") final Filter filter,
+ @PluginElement("Policy") final TriggeringPolicy policy,
+ @PluginElement("Strategy") RolloverStrategy strategy,
+ @PluginElement("Layout") Layout<S> layout,
+ @PluginElement("Filter") final Filter filter,
@PluginAttr("ignoreExceptions") final String ignore,
@PluginAttr("advertise") final String advertise,
@PluginAttr("advertiseURI") final String advertiseURI,
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java?rev=1514027&r1=1514026&r2=1514027&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java Wed Aug 14 20:25:42 2013
@@ -120,8 +120,8 @@ public final class SMTPAppender<T extend
@PluginAttr("smtpPassword") final String smtpPassword,
@PluginAttr("smtpDebug") final String smtpDebug,
@PluginAttr("bufferSize") final String bufferSizeNum,
- @PluginElement("layout") Layout<S> layout,
- @PluginElement("filter") Filter filter,
+ @PluginElement("Layout") Layout<S> layout,
+ @PluginElement("Filter") Filter filter,
@PluginAttr("ignoreExceptions") final String ignore) {
if (name == null) {
LOGGER.error("No name provided for SMTPAppender");
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java?rev=1514027&r1=1514026&r2=1514027&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java Wed Aug 14 20:25:42 2013
@@ -96,8 +96,8 @@ public class SocketAppender<T extends Se
@PluginAttr("name") final String name,
@PluginAttr("immediateFlush") final String immediateFlush,
@PluginAttr("ignoreExceptions") final String ignore,
- @PluginElement("layout") Layout<S> layout,
- @PluginElement("filters") final Filter filter,
+ @PluginElement("Layout") Layout<S> layout,
+ @PluginElement("Filters") final Filter filter,
@PluginAttr("advertise") final String advertise,
@PluginConfiguration final Configuration config) {
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java?rev=1514027&r1=1514026&r2=1514027&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java Wed Aug 14 20:25:42 2013
@@ -113,7 +113,7 @@ public class SyslogAppender<T extends Se
@PluginAttr("mdcIncludes") final String includes,
@PluginAttr("mdcRequired") final String required,
@PluginAttr("format") final String format,
- @PluginElement("filters") final Filter filter,
+ @PluginElement("Filters") final Filter filter,
@PluginConfiguration final Configuration config,
@PluginAttr("charset") final String charsetName,
@PluginAttr("exceptionPattern") final String exceptionPattern,
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JDBCAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JDBCAppender.java?rev=1514027&r1=1514026&r2=1514027&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JDBCAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JDBCAppender.java Wed Aug 14 20:25:42 2013
@@ -67,12 +67,12 @@ public final class JDBCAppender extends
@PluginFactory
public static JDBCAppender createAppender(@PluginAttr("name") final String name,
@PluginAttr("ignoreExceptions") final String ignore,
- @PluginElement("filter") final Filter filter,
- @PluginElement("connectionSource") final ConnectionSource
+ @PluginElement("Filter") final Filter filter,
+ @PluginElement("ConnectionSource") final ConnectionSource
connectionSource,
@PluginAttr("bufferSize") final String bufferSize,
@PluginAttr("tableName") final String tableName,
- @PluginElement("columnConfigs") final ColumnConfig[] columnConfigs) {
+ @PluginElement("ColumnConfigs") final ColumnConfig[] columnConfigs) {
final int bufferSizeInt = AbstractAppender.parseInt(bufferSize, 0);
final boolean ignoreExceptions = Booleans.parseBoolean(ignore, true);
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JPAAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JPAAppender.java?rev=1514027&r1=1514026&r2=1514027&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JPAAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JPAAppender.java Wed Aug 14 20:25:42 2013
@@ -68,7 +68,7 @@ public final class JPAAppender extends A
@PluginFactory
public static JPAAppender createAppender(@PluginAttr("name") final String name,
@PluginAttr("ignoreExceptions") final String ignore,
- @PluginElement("filter") final Filter filter,
+ @PluginElement("Filter") final Filter filter,
@PluginAttr("bufferSize") final String bufferSize,
@PluginAttr("entityClassName") final String entityClassName,
@PluginAttr("persistenceUnitName") final String persistenceUnitName) {
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLAppender.java?rev=1514027&r1=1514026&r2=1514027&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLAppender.java Wed Aug 14 20:25:42 2013
@@ -67,9 +67,9 @@ public final class NoSQLAppender extends
@PluginFactory
public static NoSQLAppender createAppender(@PluginAttr("name") final String name,
@PluginAttr("ignoreExceptions") final String ignore,
- @PluginElement("filter") final Filter filter,
+ @PluginElement("Filter") final Filter filter,
@PluginAttr("bufferSize") final String bufferSize,
- @PluginElement("noSqlProvider") final NoSQLProvider<?> provider) {
+ @PluginElement("NoSqlProvider") final NoSQLProvider<?> provider) {
if (provider == null) {
LOGGER.error("NoSQL provider not specified for appender [{}].", name);
return null;
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java?rev=1514027&r1=1514026&r2=1514027&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java Wed Aug 14 20:25:42 2013
@@ -100,7 +100,7 @@ public final class PropertiesRewritePoli
*/
@PluginFactory
public static PropertiesRewritePolicy createPolicy(@PluginConfiguration final Configuration config,
- @PluginElement("properties") final Property[] props) {
+ @PluginElement("Properties") final Property[] props) {
if (props == null || props.length == 0) {
LOGGER.error("Properties must be specified for the PropertiesRewritePolicy");
return null;
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java?rev=1514027&r1=1514026&r2=1514027&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java Wed Aug 14 20:25:42 2013
@@ -108,10 +108,10 @@ public final class RewriteAppender<T ext
@PluginFactory
public static <S extends Serializable> RewriteAppender<S> createAppender(@PluginAttr("name") final String name,
@PluginAttr("ignoreExceptions") final String ignore,
- @PluginElement("appenderRef") final AppenderRef[] appenderRefs,
+ @PluginElement("AppenderRef") final AppenderRef[] appenderRefs,
@PluginConfiguration final Configuration config,
- @PluginElement("rewritePolicy") final RewritePolicy rewritePolicy,
- @PluginElement("filter") final Filter filter) {
+ @PluginElement("RewritePolicy") final RewritePolicy rewritePolicy,
+ @PluginElement("Filter") final Filter filter) {
final boolean ignoreExceptions = Booleans.parseBoolean(ignore, true);
if (name == null) {
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java?rev=1514027&r1=1514026&r2=1514027&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java Wed Aug 14 20:25:42 2013
@@ -81,7 +81,7 @@ public final class CompositeTriggeringPo
*/
@PluginFactory
public static CompositeTriggeringPolicy createPolicy(
- @PluginElement("policies") final TriggeringPolicy... policies) {
+ @PluginElement("Policies") final TriggeringPolicy... policies) {
return new CompositeTriggeringPolicy(policies);
}
}
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/Routes.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/Routes.java?rev=1514027&r1=1514026&r2=1514027&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/Routes.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/Routes.java Wed Aug 14 20:25:42 2013
@@ -79,7 +79,7 @@ public final class Routes {
*/
@PluginFactory
public static Routes createRoutes(@PluginAttr("pattern") final String pattern,
- @PluginElement("routes") final Route... routes) {
+ @PluginElement("Routes") final Route... routes) {
if (pattern == null) {
LOGGER.error("A pattern is required");
return null;
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java?rev=1514027&r1=1514026&r2=1514027&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java Wed Aug 14 20:25:42 2013
@@ -184,10 +184,10 @@ public final class RoutingAppender<T ext
@PluginFactory
public static <S extends Serializable> RoutingAppender<S> createAppender(@PluginAttr("name") final String name,
@PluginAttr("ignoreExceptions") final String ignore,
- @PluginElement("routes") final Routes routes,
+ @PluginElement("Routes") final Routes routes,
@PluginConfiguration final Configuration config,
- @PluginElement("rewritePolicy") final RewritePolicy rewritePolicy,
- @PluginElement("filters") final Filter filter) {
+ @PluginElement("RewritePolicy") final RewritePolicy rewritePolicy,
+ @PluginElement("Filters") final Filter filter) {
final boolean ignoreExceptions = Booleans.parseBoolean(ignore, true);
if (name == null) {
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java?rev=1514027&r1=1514026&r2=1514027&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java Wed Aug 14 20:25:42 2013
@@ -153,9 +153,9 @@ public class AsyncLoggerConfig extends L
@PluginAttr("name") final String loggerName,
@PluginAttr("includeLocation") final String includeLocation,
@PluginElement("AppenderRef") final AppenderRef[] refs,
- @PluginElement("properties") final Property[] properties,
+ @PluginElement("Properties") final Property[] properties,
@PluginConfiguration final Configuration config,
- @PluginElement("filters") final Filter filter) {
+ @PluginElement("Filters") final Filter filter) {
if (loggerName == null) {
LOGGER.error("Loggers cannot be configured without a name");
return null;
@@ -195,9 +195,9 @@ public class AsyncLoggerConfig extends L
@PluginAttr("level") final String levelName,
@PluginAttr("includeLocation") final String includeLocation,
@PluginElement("AppenderRef") final AppenderRef[] refs,
- @PluginElement("properties") final Property[] properties,
+ @PluginElement("Properties") final Property[] properties,
@PluginConfiguration final Configuration config,
- @PluginElement("filters") final Filter filter) {
+ @PluginElement("Filters") final Filter filter) {
final List<AppenderRef> appenderRefs = Arrays.asList(refs);
Level level;
try {
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderRef.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderRef.java?rev=1514027&r1=1514026&r2=1514027&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderRef.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderRef.java Wed Aug 14 20:25:42 2013
@@ -64,7 +64,7 @@ public final class AppenderRef {
@PluginFactory
public static AppenderRef createAppenderRef(@PluginAttr("ref") final String ref,
@PluginAttr("level") final String levelName,
- @PluginElement("filters") final Filter filter) {
+ @PluginElement("Filters") final Filter filter) {
if (ref == null) {
LOGGER.error("Appender references must contain a reference");
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java?rev=1514027&r1=1514026&r2=1514027&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java Wed Aug 14 20:25:42 2013
@@ -453,9 +453,9 @@ public class LoggerConfig extends Abstra
@PluginAttr("name") final String loggerName,
@PluginAttr("includeLocation") final String includeLocation,
@PluginElement("AppenderRef") final AppenderRef[] refs,
- @PluginElement("properties") final Property[] properties,
+ @PluginElement("Properties") final Property[] properties,
@PluginConfiguration final Configuration config,
- @PluginElement("filters") final Filter filter) {
+ @PluginElement("Filters") final Filter filter) {
if (loggerName == null) {
LOGGER.error("Loggers cannot be configured without a name");
return null;
@@ -501,9 +501,9 @@ public class LoggerConfig extends Abstra
@PluginAttr("level") final String levelName,
@PluginAttr("includeLocation") final String includeLocation,
@PluginElement("AppenderRef") final AppenderRef[] refs,
- @PluginElement("properties") final Property[] properties,
+ @PluginElement("Properties") final Property[] properties,
@PluginConfiguration final Configuration config,
- @PluginElement("filters") final Filter filter) {
+ @PluginElement("Filters") final Filter filter) {
final List<AppenderRef> appenderRefs = Arrays.asList(refs);
Level level;
try {
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/AppendersPlugin.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/AppendersPlugin.java?rev=1514027&r1=1514026&r2=1514027&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/AppendersPlugin.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/AppendersPlugin.java Wed Aug 14 20:25:42 2013
@@ -38,7 +38,7 @@ public final class AppendersPlugin {
*/
@PluginFactory
public static ConcurrentMap<String, Appender<? extends Serializable>> createAppenders(
- @PluginElement("appenders") final Appender<?>[] appenders) {
+ @PluginElement("Appenders") final Appender<?>[] appenders) {
final ConcurrentMap<String, Appender<? extends Serializable>> map =
new ConcurrentHashMap<String, Appender<? extends Serializable>>();
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/LoggersPlugin.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/LoggersPlugin.java?rev=1514027&r1=1514026&r2=1514027&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/LoggersPlugin.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/LoggersPlugin.java Wed Aug 14 20:25:42 2013
@@ -37,7 +37,7 @@ public final class LoggersPlugin {
* @return A Loggers object.
*/
@PluginFactory
- public static Loggers createLoggers(@PluginElement("loggers") final LoggerConfig[] loggers) {
+ public static Loggers createLoggers(@PluginElement("Loggers") final LoggerConfig[] loggers) {
final ConcurrentMap<String, LoggerConfig> loggerMap = new ConcurrentHashMap<String, LoggerConfig>();
LoggerConfig root = null;
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PropertiesPlugin.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PropertiesPlugin.java?rev=1514027&r1=1514026&r2=1514027&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PropertiesPlugin.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PropertiesPlugin.java Wed Aug 14 20:25:42 2013
@@ -41,7 +41,7 @@ public final class PropertiesPlugin {
* @return An Interpolator that includes the configuration properties.
*/
@PluginFactory
- public static StrLookup configureSubstitutor(@PluginElement("properties") final Property[] properties,
+ public static StrLookup configureSubstitutor(@PluginElement("Properties") final Property[] properties,
@PluginConfiguration final Configuration config) {
if (properties == null) {
return new Interpolator(null);
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java?rev=1514027&r1=1514026&r2=1514027&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java Wed Aug 14 20:25:42 2013
@@ -261,7 +261,7 @@ public final class CompositeFilter imple
* @return The CompositeFilter.
*/
@PluginFactory
- public static CompositeFilter createFilters(@PluginElement("filters") final Filter[] filters) {
+ public static CompositeFilter createFilters(@PluginElement("Filters") final Filter[] filters) {
final List<Filter> f = filters == null || filters.length == 0 ?
new ArrayList<Filter>() : Arrays.asList(filters);
return new CompositeFilter(f);
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java?rev=1514027&r1=1514026&r2=1514027&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java Wed Aug 14 20:25:42 2013
@@ -126,7 +126,7 @@ public final class DynamicThresholdFilte
*/
@PluginFactory
public static DynamicThresholdFilter createFilter(@PluginAttr("key") final String key,
- @PluginElement("pairs") final KeyValuePair[] pairs,
+ @PluginElement("Pairs") final KeyValuePair[] pairs,
@PluginAttr("defaultThreshold") final String levelName,
@PluginAttr("onmatch") final String match,
@PluginAttr("onmismatch") final String mismatch) {
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java?rev=1514027&r1=1514026&r2=1514027&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java Wed Aug 14 20:25:42 2013
@@ -116,7 +116,7 @@ public class MapFilter extends AbstractF
}
@PluginFactory
- public static MapFilter createFilter(@PluginElement("pairs") final KeyValuePair[] pairs,
+ public static MapFilter createFilter(@PluginElement("Pairs") final KeyValuePair[] pairs,
@PluginAttr("operator") final String oper,
@PluginAttr("onmatch") final String match,
@PluginAttr("onmismatch") final String mismatch) {
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/StructuredDataFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/StructuredDataFilter.java?rev=1514027&r1=1514026&r2=1514027&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/StructuredDataFilter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/StructuredDataFilter.java Wed Aug 14 20:25:42 2013
@@ -101,7 +101,7 @@ public final class StructuredDataFilter
* @return The StructuredDataFilter.
*/
@PluginFactory
- public static StructuredDataFilter createFilter(@PluginElement("pairs") final KeyValuePair[] pairs,
+ public static StructuredDataFilter createFilter(@PluginElement("Pairs") final KeyValuePair[] pairs,
@PluginAttr("operator") final String oper,
@PluginAttr("onmatch") final String match,
@PluginAttr("onmismatch") final String mismatch) {
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilter.java?rev=1514027&r1=1514026&r2=1514027&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilter.java Wed Aug 14 20:25:42 2013
@@ -111,7 +111,7 @@ public class ThreadContextMapFilter exte
}
@PluginFactory
- public static ThreadContextMapFilter createFilter(@PluginElement("pairs") final KeyValuePair[] pairs,
+ public static ThreadContextMapFilter createFilter(@PluginElement("Pairs") final KeyValuePair[] pairs,
@PluginAttr("operator") final String oper,
@PluginAttr("onmatch") final String match,
@PluginAttr("onmismatch") final String mismatch) {
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java?rev=1514027&r1=1514026&r2=1514027&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java Wed Aug 14 20:25:42 2013
@@ -210,7 +210,7 @@ public final class PatternLayout extends
@PluginFactory
public static PatternLayout createLayout(@PluginAttr("pattern") final String pattern,
@PluginConfiguration final Configuration config,
- @PluginElement("replace") final RegexReplacement replace,
+ @PluginElement("Replace") final RegexReplacement replace,
@PluginAttr("charset") final String charsetName,
@PluginAttr("alwaysWriteExceptions") final String always) {
final Charset charset = Charsets.getSupportedCharset(charsetName);
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java?rev=1514027&r1=1514026&r2=1514027&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java Wed Aug 14 20:25:42 2013
@@ -546,7 +546,7 @@ public final class RFC5424Layout extends
@PluginAttr("mdcIncludes") String includes,
@PluginAttr("mdcRequired") final String required,
@PluginAttr("exceptionPattern") final String exceptionPattern,
- @PluginElement("loggerFields") final LoggerFields loggerFields,
+ @PluginElement("LoggerFields") final LoggerFields loggerFields,
@PluginConfiguration final Configuration config) {
final Charset charset = Charsets.UTF_8;
if (includes != null && excludes != null) {
Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java?rev=1514027&r1=1514026&r2=1514027&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java Wed Aug 14 20:25:42 2013
@@ -157,8 +157,8 @@ public class ListAppender<T extends Seri
public static <S extends Serializable> ListAppender<S> createAppender(@PluginAttr("name") final String name,
@PluginAttr("entryPerNewLine") final String newLine,
@PluginAttr("raw") final String raw,
- @PluginElement("layout") final Layout<S> layout,
- @PluginElement("filters") final Filter filter) {
+ @PluginElement("Layout") final Layout<S> layout,
+ @PluginElement("Filters") final Filter filter) {
if (name == null) {
LOGGER.error("No name provided for ListAppender");
Modified: logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java?rev=1514027&r1=1514026&r2=1514027&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java (original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java Wed Aug 14 20:25:42 2013
@@ -158,8 +158,8 @@ public final class FlumeAppender<T exten
* @return A Flume Avro Appender.
*/
@PluginFactory
- public static <S extends Serializable> FlumeAppender<S> createAppender(@PluginElement("agents") Agent[] agents,
- @PluginElement("properties") final Property[] properties,
+ public static <S extends Serializable> FlumeAppender<S> createAppender(@PluginElement("Agents") Agent[] agents,
+ @PluginElement("Properties") final Property[] properties,
@PluginAttr("embedded") final String embedded,
@PluginAttr("type") final String type,
@PluginAttr("dataDir") final String dataDir,