Repository: logging-log4j2 Updated Branches: refs/heads/LOG4J2-1390 3fac1c7e9 -> 39e283369
Use Appender.ELEMENT_TYPE instead of magic string. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/5aa0313d Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/5aa0313d Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/5aa0313d Branch: refs/heads/LOG4J2-1390 Commit: 5aa0313dbf4899c0f2c95bb86e3b9a0c8e2b14e6 Parents: e48898d Author: Gary Gregory <[email protected]> Authored: Wed Sep 28 11:22:53 2016 -0700 Committer: Gary Gregory <[email protected]> Committed: Wed Sep 28 11:22:53 2016 -0700 ---------------------------------------------------------------------- .../org/apache/logging/log4j/core/appender/AppenderSet.java | 2 +- .../apache/logging/log4j/core/appender/AsyncAppender.java | 2 +- .../apache/logging/log4j/core/appender/ConsoleAppender.java | 3 ++- .../logging/log4j/core/appender/CountingNoOpAppender.java | 3 ++- .../logging/log4j/core/appender/FailoverAppender.java | 2 +- .../apache/logging/log4j/core/appender/FileAppender.java | 3 ++- .../log4j/core/appender/MemoryMappedFileAppender.java | 3 ++- .../apache/logging/log4j/core/appender/NullAppender.java | 3 ++- .../logging/log4j/core/appender/OutputStreamAppender.java | 3 ++- .../log4j/core/appender/RandomAccessFileAppender.java | 3 ++- .../logging/log4j/core/appender/RollingFileAppender.java | 3 ++- .../core/appender/RollingRandomAccessFileAppender.java | 3 ++- .../logging/log4j/core/appender/ScriptAppenderSelector.java | 2 +- .../apache/logging/log4j/core/appender/SmtpAppender.java | 3 ++- .../apache/logging/log4j/core/appender/SocketAppender.java | 3 ++- .../apache/logging/log4j/core/appender/SyslogAppender.java | 3 ++- .../apache/logging/log4j/core/appender/WriterAppender.java | 3 ++- .../logging/log4j/core/appender/db/jdbc/JdbcAppender.java | 3 ++- .../logging/log4j/core/appender/db/jpa/JpaAppender.java | 3 ++- .../log4j/core/appender/rewrite/RewriteAppender.java | 2 +- .../log4j/core/appender/routing/RoutingAppender.java | 4 ++-- .../config/properties/PropertiesConfigurationBuilder.java | 3 ++- .../apache/logging/log4j/core/appender/HangingAppender.java | 9 +++++---- .../logging/log4j/test/appender/AlwaysFailAppender.java | 3 ++- .../logging/log4j/test/appender/BlockingAppender.java | 3 ++- .../logging/log4j/test/appender/DeadlockAppender.java | 3 ++- .../logging/log4j/test/appender/FailOnceAppender.java | 3 ++- .../apache/logging/log4j/test/appender/ListAppender.java | 3 ++- .../logging/log4j/test/appender/UsesLoggingAppender.java | 3 ++- .../apache/logging/log4j/flume/appender/FlumeAppender.java | 3 ++- .../apache/logging/log4j/nosql/appender/NoSqlAppender.java | 3 ++- 31 files changed, 60 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5aa0313d/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java index 4eed071..0aa6e35 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java @@ -120,7 +120,7 @@ public class AppenderSet { return null; } node.getAttributes().put("name", actualName); - if (node.getType().getElementName().equals("appender")) { + if (node.getType().getElementName().equals(Appender.ELEMENT_TYPE)) { final Node appNode = new Node(node); configuration.createConfiguration(appNode, null); if (appNode.getObject() instanceof Appender) { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5aa0313d/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java index e6f7039..436664c 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java @@ -54,7 +54,7 @@ import org.apache.logging.log4j.core.util.Log4jThread; * Appender to append to if the queue is full. The AsyncAppender does not allow a filter to be specified on the Appender * references. */ -@Plugin(name = "Async", category = "Core", elementType = "appender", printObject = true) +@Plugin(name = "Async", category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true) public final class AsyncAppender extends AbstractAppender { private static final int DEFAULT_QUEUE_SIZE = 128; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5aa0313d/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java index e3f3c31..fec5997 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java @@ -27,6 +27,7 @@ import java.lang.reflect.Constructor; import java.nio.charset.Charset; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.Filter; import org.apache.logging.log4j.core.Layout; import org.apache.logging.log4j.core.config.plugins.Plugin; @@ -47,7 +48,7 @@ import org.apache.logging.log4j.util.PropertiesUtil; * encoding. (RG) Encoding is handled within the Layout. Typically, a Layout will generate a String and then call * getBytes which may use a configured encoding or the system default. OTOH, a Writer cannot print byte streams. */ -@Plugin(name = ConsoleAppender.PLUGIN_NAME, category = "Core", elementType = "appender", printObject = true) +@Plugin(name = ConsoleAppender.PLUGIN_NAME, category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true) public final class ConsoleAppender extends AbstractOutputStreamAppender<OutputStreamManager> { public static final String PLUGIN_NAME = "Console"; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5aa0313d/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/CountingNoOpAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/CountingNoOpAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/CountingNoOpAppender.java index 38775eb..89ff670 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/CountingNoOpAppender.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/CountingNoOpAppender.java @@ -19,6 +19,7 @@ package org.apache.logging.log4j.core.appender; import java.util.Objects; import java.util.concurrent.atomic.AtomicLong; +import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.Layout; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.config.plugins.Plugin; @@ -28,7 +29,7 @@ import org.apache.logging.log4j.core.config.plugins.PluginFactory; /** * No-Operation Appender that counts events. */ -@Plugin(name = "CountingNoOp", category = "Core", elementType = "appender", printObject = true) +@Plugin(name = "CountingNoOp", category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true) public class CountingNoOpAppender extends AbstractAppender { private final AtomicLong total = new AtomicLong(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5aa0313d/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java index b467d15..6fc0adb 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java @@ -41,7 +41,7 @@ import org.apache.logging.log4j.core.util.Constants; * to a different appender. Hopefully it is obvious that the Appenders must be configured * to not suppress exceptions for the FailoverAppender to work. */ -@Plugin(name = "Failover", category = "Core", elementType = "appender", printObject = true) +@Plugin(name = "Failover", category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true) public final class FailoverAppender extends AbstractAppender { private static final int DEFAULT_INTERVAL_SECONDS = 60; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5aa0313d/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java index 860f4e5..1c76ffb 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java @@ -21,6 +21,7 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; +import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.Filter; import org.apache.logging.log4j.core.Layout; import org.apache.logging.log4j.core.config.Configuration; @@ -36,7 +37,7 @@ import org.apache.logging.log4j.core.util.Integers; /** * File Appender. */ -@Plugin(name = FileAppender.PLUGIN_NAME, category = "Core", elementType = "appender", printObject = true) +@Plugin(name = FileAppender.PLUGIN_NAME, category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true) public final class FileAppender extends AbstractOutputStreamAppender<FileManager> { public static final String PLUGIN_NAME = "File"; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5aa0313d/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppender.java index c1f1aa6..f12e8b2 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppender.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppender.java @@ -21,6 +21,7 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; +import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.Filter; import org.apache.logging.log4j.core.Layout; import org.apache.logging.log4j.core.LogEvent; @@ -40,7 +41,7 @@ import org.apache.logging.log4j.core.util.Integers; * * @since 2.1 */ -@Plugin(name = "MemoryMappedFile", category = "Core", elementType = "appender", printObject = true) +@Plugin(name = "MemoryMappedFile", category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true) public final class MemoryMappedFileAppender extends AbstractOutputStreamAppender<MemoryMappedFileManager> { private static final int BIT_POSITION_1GB = 30; // 2^30 ~= 1GB http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5aa0313d/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/NullAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/NullAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/NullAppender.java index 47c2389..07a6250 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/NullAppender.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/NullAppender.java @@ -16,6 +16,7 @@ */ package org.apache.logging.log4j.core.appender; +import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.config.plugins.Plugin; import org.apache.logging.log4j.core.config.plugins.PluginAttribute; @@ -24,7 +25,7 @@ import org.apache.logging.log4j.core.config.plugins.PluginFactory; /** * An Appender that ignores log events. Use for compatibility with version 1.2. */ -@Plugin(name = NullAppender.PLUGIN_NAME, category = "Core", elementType = "appender", printObject = true) +@Plugin(name = NullAppender.PLUGIN_NAME, category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true) public class NullAppender extends AbstractAppender { public static final String PLUGIN_NAME = "Null"; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5aa0313d/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java index 53881bd..f9a2e66 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java @@ -19,6 +19,7 @@ package org.apache.logging.log4j.core.appender; import java.io.OutputStream; import java.io.Serializable; +import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.Filter; import org.apache.logging.log4j.core.Layout; import org.apache.logging.log4j.core.config.plugins.Plugin; @@ -33,7 +34,7 @@ import org.apache.logging.log4j.core.util.CloseShieldOutputStream; * Character encoding is handled within the Layout. * </p> */ -@Plugin(name = "OutputStream", category = "Core", elementType = "appender", printObject = true) +@Plugin(name = "OutputStream", category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true) public final class OutputStreamAppender extends AbstractOutputStreamAppender<OutputStreamManager> { /** http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5aa0313d/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java index d852e51..0d9328d 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java @@ -21,6 +21,7 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; +import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.Filter; import org.apache.logging.log4j.core.Layout; import org.apache.logging.log4j.core.LogEvent; @@ -38,7 +39,7 @@ import org.apache.logging.log4j.core.util.Integers; /** * File Appender. */ -@Plugin(name = "RandomAccessFile", category = "Core", elementType = "appender", printObject = true) +@Plugin(name = "RandomAccessFile", category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true) public final class RandomAccessFileAppender extends AbstractOutputStreamAppender<RandomAccessFileManager> { private final String fileName; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5aa0313d/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java index f317b6b..93e8e2c 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java @@ -22,6 +22,7 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.zip.Deflater; +import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.Filter; import org.apache.logging.log4j.core.Layout; import org.apache.logging.log4j.core.LogEvent; @@ -43,7 +44,7 @@ import org.apache.logging.log4j.core.util.Integers; /** * An appender that writes to files and can roll over at intervals. */ -@Plugin(name = RollingFileAppender.PLUGIN_NAME, category = "Core", elementType = "appender", printObject = true) +@Plugin(name = RollingFileAppender.PLUGIN_NAME, category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true) public final class RollingFileAppender extends AbstractOutputStreamAppender<RollingFileManager> { public static final String PLUGIN_NAME = "RollingFile"; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5aa0313d/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java index dae6efd..931ed4e 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java @@ -22,6 +22,7 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.zip.Deflater; +import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.Filter; import org.apache.logging.log4j.core.Layout; import org.apache.logging.log4j.core.LogEvent; @@ -44,7 +45,7 @@ import org.apache.logging.log4j.core.util.Integers; * An appender that writes to random access files and can roll over at * intervals. */ -@Plugin(name = "RollingRandomAccessFile", category = "Core", elementType = "appender", printObject = true) +@Plugin(name = "RollingRandomAccessFile", category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true) public final class RollingRandomAccessFileAppender extends AbstractOutputStreamAppender<RollingRandomAccessFileManager> { private final String fileName; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5aa0313d/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ScriptAppenderSelector.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ScriptAppenderSelector.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ScriptAppenderSelector.java index 7782b96..0bfd514 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ScriptAppenderSelector.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ScriptAppenderSelector.java @@ -35,7 +35,7 @@ import org.apache.logging.log4j.core.config.plugins.validation.constraints.Requi import org.apache.logging.log4j.core.script.AbstractScript; import org.apache.logging.log4j.core.script.ScriptManager; -@Plugin(name = "ScriptAppenderSelector", category = "Core", elementType = "appender", printObject = true) +@Plugin(name = "ScriptAppenderSelector", category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true) public class ScriptAppenderSelector extends AbstractAppender { /** http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5aa0313d/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SmtpAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SmtpAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SmtpAppender.java index aed1153..87225de 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SmtpAppender.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SmtpAppender.java @@ -19,6 +19,7 @@ package org.apache.logging.log4j.core.appender; import java.io.Serializable; +import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.Filter; import org.apache.logging.log4j.core.Layout; import org.apache.logging.log4j.core.LogEvent; @@ -52,7 +53,7 @@ import org.apache.logging.log4j.core.util.Booleans; * message is appended. This can be modified by setting a filter for the * appender. */ -@Plugin(name = "SMTP", category = "Core", elementType = "appender", printObject = true) +@Plugin(name = "SMTP", category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true) public final class SmtpAppender extends AbstractAppender { private static final int DEFAULT_BUFFER_SIZE = 512; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5aa0313d/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java index 744def0..c9d9c2f 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java @@ -21,6 +21,7 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; +import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.Filter; import org.apache.logging.log4j.core.Layout; import org.apache.logging.log4j.core.LogEvent; @@ -46,7 +47,7 @@ import org.apache.logging.log4j.core.util.Constants; /** * An Appender that delivers events over socket connections. Supports both TCP and UDP. */ -@Plugin(name = "Socket", category = "Core", elementType = "appender", printObject = true) +@Plugin(name = "Socket", category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true) public class SocketAppender extends AbstractOutputStreamAppender<AbstractSocketManager> { /** http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5aa0313d/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java index 0894a3e..5dca691 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java @@ -19,6 +19,7 @@ package org.apache.logging.log4j.core.appender; import java.io.Serializable; import java.nio.charset.Charset; +import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.Filter; import org.apache.logging.log4j.core.Layout; import org.apache.logging.log4j.core.config.Configuration; @@ -42,7 +43,7 @@ import org.apache.logging.log4j.util.EnglishEnums; /** * The Syslog Appender. */ -@Plugin(name = "Syslog", category = "Core", elementType = "appender", printObject = true) +@Plugin(name = "Syslog", category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true) public class SyslogAppender extends SocketAppender { protected static final String RFC5424 = "RFC5424"; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5aa0313d/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterAppender.java index b6e363a..e6a3b9d 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterAppender.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterAppender.java @@ -18,6 +18,7 @@ package org.apache.logging.log4j.core.appender; import java.io.Writer; +import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.Filter; import org.apache.logging.log4j.core.StringLayout; import org.apache.logging.log4j.core.config.plugins.Plugin; @@ -29,7 +30,7 @@ import org.apache.logging.log4j.core.util.CloseShieldWriter; /** * Appends log events to a {@link Writer}. */ -@Plugin(name = "Writer", category = "Core", elementType = "appender", printObject = true) +@Plugin(name = "Writer", category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true) public final class WriterAppender extends AbstractWriterAppender<WriterManager> { /** http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5aa0313d/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppender.java index 0359117..4846615 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppender.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppender.java @@ -16,6 +16,7 @@ */ package org.apache.logging.log4j.core.appender.db.jdbc; +import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.Filter; import org.apache.logging.log4j.core.appender.AbstractAppender; import org.apache.logging.log4j.core.appender.db.AbstractDatabaseAppender; @@ -34,7 +35,7 @@ import org.apache.logging.log4j.core.util.Booleans; * @see ColumnConfig * @see ConnectionSource */ -@Plugin(name = "JDBC", category = "Core", elementType = "appender", printObject = true) +@Plugin(name = "JDBC", category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true) public final class JdbcAppender extends AbstractDatabaseAppender<JdbcDatabaseManager> { private final String description; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5aa0313d/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaAppender.java index fa6a35f..0f1053f 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaAppender.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaAppender.java @@ -18,6 +18,7 @@ package org.apache.logging.log4j.core.appender.db.jpa; import java.lang.reflect.Constructor; +import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.Filter; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.appender.AbstractAppender; @@ -37,7 +38,7 @@ import org.apache.logging.log4j.util.Strings; * * @see AbstractLogEventWrapperEntity */ -@Plugin(name = "JPA", category = "Core", elementType = "appender", printObject = true) +@Plugin(name = "JPA", category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true) public final class JpaAppender extends AbstractDatabaseAppender<JpaDatabaseManager> { private final String description; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5aa0313d/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java index 728939a..befc6b4 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java @@ -36,7 +36,7 @@ import org.apache.logging.log4j.core.util.Booleans; /** * This Appender allows the logging event to be manipulated before it is processed by other Appenders. */ -@Plugin(name = "Rewrite", category = "Core", elementType = "appender", printObject = true) +@Plugin(name = "Rewrite", category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true) public final class RewriteAppender extends AbstractAppender { private final Configuration config; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5aa0313d/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java index 8183d26..adc1543 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java @@ -50,7 +50,7 @@ import org.apache.logging.log4j.core.util.Booleans; * the form "$${[key:]token}". The pattern will be resolved each time the Appender is called using * the built in StrSubstitutor and the StrLookup plugin that matches the specified key. */ -@Plugin(name = "Routing", category = "Core", elementType = "appender", printObject = true) +@Plugin(name = "Routing", category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true) public final class RoutingAppender extends AbstractAppender { public static final String STATIC_VARIABLES_KEY = "staticVariables"; @@ -278,7 +278,7 @@ public final class RoutingAppender extends AbstractAppender { private Appender createAppender(final Route route, final LogEvent event) { final Node routeNode = route.getNode(); for (final Node node : routeNode.getChildren()) { - if (node.getType().getElementName().equals("appender")) { + if (node.getType().getElementName().equals(Appender.ELEMENT_TYPE)) { final Node appNode = new Node(node); configuration.createConfiguration(appNode, event); if (appNode.getObject() instanceof Appender) { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5aa0313d/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java index 63b093f..a4362b7 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java @@ -21,6 +21,7 @@ import java.util.Map; import java.util.Properties; import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.ConfigurationException; import org.apache.logging.log4j.core.config.ConfigurationSource; @@ -148,7 +149,7 @@ public class PropertiesConfigurationBuilder extends ConfigurationBuilderFactory } } else { final Map<String, Properties> appenders = PropertiesUtil - .partitionOnCommonPrefixes(PropertiesUtil.extractSubset(rootProperties, "appender")); + .partitionOnCommonPrefixes(PropertiesUtil.extractSubset(rootProperties, Appender.ELEMENT_TYPE)); for (final Map.Entry<String, Properties> entry : appenders.entrySet()) { builder.add(createAppender(entry.getKey().trim(), entry.getValue())); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5aa0313d/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HangingAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HangingAppender.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HangingAppender.java index 44f44c0..31891d3 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HangingAppender.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HangingAppender.java @@ -16,6 +16,10 @@ */ package org.apache.logging.log4j.core.appender; +import java.io.Serializable; +import java.util.concurrent.TimeUnit; + +import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.Filter; import org.apache.logging.log4j.core.Layout; import org.apache.logging.log4j.core.LogEvent; @@ -25,10 +29,7 @@ import org.apache.logging.log4j.core.config.plugins.PluginElement; import org.apache.logging.log4j.core.config.plugins.PluginFactory; import org.apache.logging.log4j.core.config.plugins.validation.constraints.Required; -import java.io.Serializable; -import java.util.concurrent.TimeUnit; - -@Plugin(name = "Hanging", category = "Core", elementType = "appender", printObject = true) +@Plugin(name = "Hanging", category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true) public class HangingAppender extends AbstractAppender { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5aa0313d/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java index 6d5fb11..666fca4 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java @@ -17,6 +17,7 @@ package org.apache.logging.log4j.test.appender; import org.apache.logging.log4j.LoggingException; +import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.appender.AbstractAppender; import org.apache.logging.log4j.core.config.plugins.Plugin; @@ -27,7 +28,7 @@ import org.apache.logging.log4j.core.config.plugins.validation.constraints.Requi /** * */ -@Plugin(name="AlwaysFail", category ="Core", elementType="appender", printObject=true) +@Plugin(name="AlwaysFail", category ="Core", elementType=Appender.ELEMENT_TYPE, printObject=true) public class AlwaysFailAppender extends AbstractAppender { private AlwaysFailAppender(final String name) { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5aa0313d/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/BlockingAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/BlockingAppender.java b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/BlockingAppender.java index c863382..7c73ed0 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/BlockingAppender.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/BlockingAppender.java @@ -18,6 +18,7 @@ package org.apache.logging.log4j.test.appender; import java.util.concurrent.TimeUnit; +import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.appender.AbstractAppender; import org.apache.logging.log4j.core.config.plugins.Plugin; @@ -28,7 +29,7 @@ import org.apache.logging.log4j.core.config.plugins.validation.constraints.Requi /** * */ -@Plugin(name="Block", category ="Core", elementType="appender", printObject=true) +@Plugin(name="Block", category ="Core", elementType=Appender.ELEMENT_TYPE, printObject=true) public class BlockingAppender extends AbstractAppender { public volatile boolean running = true; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5aa0313d/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/DeadlockAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/DeadlockAppender.java b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/DeadlockAppender.java index 57dc4d8..700ee8b 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/DeadlockAppender.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/DeadlockAppender.java @@ -21,6 +21,7 @@ import java.util.concurrent.TimeUnit; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LoggingException; +import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.appender.AbstractAppender; import org.apache.logging.log4j.core.config.plugins.Plugin; @@ -31,7 +32,7 @@ import org.apache.logging.log4j.core.config.plugins.validation.constraints.Requi /** * */ -@Plugin(name="Deadlock", category ="Core", elementType="appender", printObject=true) +@Plugin(name="Deadlock", category ="Core", elementType=Appender.ELEMENT_TYPE, printObject=true) public class DeadlockAppender extends AbstractAppender { private WorkerThread thread = null; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5aa0313d/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/FailOnceAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/FailOnceAppender.java b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/FailOnceAppender.java index ebe1617..95157b5 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/FailOnceAppender.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/FailOnceAppender.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.apache.logging.log4j.LoggingException; +import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.appender.AbstractAppender; import org.apache.logging.log4j.core.config.plugins.Plugin; @@ -30,7 +31,7 @@ import org.apache.logging.log4j.core.config.plugins.validation.constraints.Requi /** * */ -@Plugin(name="FailOnce", category ="Core", elementType="appender", printObject=true) +@Plugin(name="FailOnce", category ="Core", elementType=Appender.ELEMENT_TYPE, printObject=true) public class FailOnceAppender extends AbstractAppender { boolean fail = true; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5aa0313d/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java index 64ed6af..05aa46e 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java @@ -23,6 +23,7 @@ import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.Filter; import org.apache.logging.log4j.core.Layout; import org.apache.logging.log4j.core.LogEvent; @@ -46,7 +47,7 @@ import org.apache.logging.log4j.core.layout.SerializedLayout; * * @see org.apache.logging.log4j.junit.LoggerContextRule#getListAppender(String) ILC.getListAppender */ -@Plugin(name = "List", category = "Core", elementType = "appender", printObject = true) +@Plugin(name = "List", category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true) public class ListAppender extends AbstractAppender { // Use CopyOnWriteArrayList? http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5aa0313d/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/UsesLoggingAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/UsesLoggingAppender.java b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/UsesLoggingAppender.java index 12b406b..44a264c 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/UsesLoggingAppender.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/UsesLoggingAppender.java @@ -16,6 +16,7 @@ */ package org.apache.logging.log4j.test.appender; +import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.Filter; import org.apache.logging.log4j.core.Layout; import org.apache.logging.log4j.core.LogEvent; @@ -30,7 +31,7 @@ import org.apache.logging.log4j.test.SomethingThatUsesLogging; /** * */ -@Plugin(name = "UsesLoggingAppender", category = "Core", elementType = "appender", printObject = true) +@Plugin(name = "UsesLoggingAppender", category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true) public final class UsesLoggingAppender extends AbstractAppender { private final SomethingThatUsesLogging thing; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5aa0313d/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java ---------------------------------------------------------------------- diff --git a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java index a29df92..4524a26 100644 --- a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java +++ b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java @@ -20,6 +20,7 @@ import java.io.Serializable; import java.util.Locale; import java.util.concurrent.TimeUnit; +import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.Filter; import org.apache.logging.log4j.core.Layout; import org.apache.logging.log4j.core.LogEvent; @@ -38,7 +39,7 @@ import org.apache.logging.log4j.core.util.Integers; /** * An Appender that uses the Avro protocol to route events to Flume. */ -@Plugin(name = "Flume", category = "Core", elementType = "appender", printObject = true) +@Plugin(name = "Flume", category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true) public final class FlumeAppender extends AbstractAppender implements FlumeEventFactory { private static final String[] EXCLUDED_PACKAGES = {"org.apache.flume", "org.apache.avro"}; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5aa0313d/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/NoSqlAppender.java ---------------------------------------------------------------------- diff --git a/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/NoSqlAppender.java b/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/NoSqlAppender.java index bd2deb3..f562bbc 100644 --- a/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/NoSqlAppender.java +++ b/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/NoSqlAppender.java @@ -16,6 +16,7 @@ */ package org.apache.logging.log4j.nosql.appender; +import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.Filter; import org.apache.logging.log4j.core.appender.AbstractAppender; import org.apache.logging.log4j.core.appender.db.AbstractDatabaseAppender; @@ -48,7 +49,7 @@ import org.apache.logging.log4j.core.util.Booleans; * @see NoSqlConnection * @see NoSqlProvider */ -@Plugin(name = "NoSql", category = "Core", elementType = "appender", printObject = true) +@Plugin(name = "NoSql", category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true) public final class NoSqlAppender extends AbstractDatabaseAppender<NoSqlDatabaseManager<?>> { private final String description;
