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:30:07 UTC
svn commit: r1514031 - in /logging/log4j/log4j2/trunk:
flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
src/site/xdoc/manual/extending.xml
Author: ggregory
Date: Wed Aug 14 20:30:07 2013
New Revision: 1514031
URL: http://svn.apache.org/r1514031
Log:
[LOG4J2-353] Use consistent conventions in configuration files: @PluginElement call sites now follow the CamelCase convention.
Modified:
logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
logging/log4j/log4j2/trunk/src/site/xdoc/manual/extending.xml
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=1514031&r1=1514030&r2=1514031&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:30:07 2013
@@ -176,9 +176,9 @@ public final class FlumeAppender<T exten
@PluginAttr("eventPrefix") final String eventPrefix,
@PluginAttr("compress") final String compressBody,
@PluginAttr("batchSize") final String batchSize,
- @PluginElement("flumeEventFactory") final FlumeEventFactory factory,
- @PluginElement("layout") Layout<S> layout,
- @PluginElement("filters") final Filter filter) {
+ @PluginElement("FlumeEventFactory") final FlumeEventFactory factory,
+ @PluginElement("Layout") Layout<S> layout,
+ @PluginElement("Filters") final Filter filter) {
final boolean embed = embedded != null ? Boolean.parseBoolean(embedded) :
(agents == null || agents.length == 0) && properties != null && properties.length > 0;
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=1514031&r1=1514030&r2=1514031&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:30:07 2013
@@ -144,7 +144,7 @@ public static class RootLogger extends L
public static LoggerConfig createLogger(@PluginAttr("additivity") String additivity,
@PluginAttr("level") String loggerLevel,
@PluginElement("AppenderRef") AppenderRef[] refs,
- @PluginElement("filters") Filter filter) {
+ @PluginElement("Filters") Filter filter) {
List<AppenderRef> appenderRefs = Arrays.asList(refs);
Level level;
try {
@@ -302,8 +302,8 @@ public final class StubAppender extends
@PluginFactory
public static StubAppender createAppender(@PluginAttr("name") String name,
@PluginAttr("ignoreExceptions") String ignore,
- @PluginElement("layout") Layout layout,
- @PluginElement("filters") Filter filter) {
+ @PluginElement("Layout") Layout layout,
+ @PluginElement("Filters") Filter filter) {
boolean ignoreExceptions = Boolean.parseBoolean(ignore);