Use Core category constant.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c52b432c Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c52b432c Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c52b432c Branch: refs/heads/master Commit: c52b432cdea10bfaae93758f5b0dfc1932f2aa67 Parents: d7876cf Author: Matt Sicker <[email protected]> Authored: Wed Sep 24 09:20:30 2014 -0500 Committer: Matt Sicker <[email protected]> Committed: Wed Sep 24 20:21:25 2014 -0500 ---------------------------------------------------------------------- .../apache/logging/log4j/core/async/AsyncLoggerConfig.java | 7 ++++--- .../org/apache/logging/log4j/core/config/AppenderRef.java | 2 +- .../apache/logging/log4j/core/config/DefaultAdvertiser.java | 2 +- .../org/apache/logging/log4j/core/config/LoggerConfig.java | 2 +- .../org/apache/logging/log4j/core/config/LoggersPlugin.java | 4 +--- .../apache/logging/log4j/core/config/PropertiesPlugin.java | 8 ++++---- .../java/org/apache/logging/log4j/core/config/Property.java | 2 +- 7 files changed, 13 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c52b432c/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java index 844c8c0..9e1cd9a 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java @@ -26,6 +26,7 @@ import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.config.AppenderRef; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.LoggerConfig; +import org.apache.logging.log4j.core.config.Node; import org.apache.logging.log4j.core.config.Property; import org.apache.logging.log4j.core.config.plugins.Plugin; import org.apache.logging.log4j.core.config.plugins.PluginAttribute; @@ -64,7 +65,7 @@ import org.apache.logging.log4j.util.Strings; * with immediateFlush=false, there will never be any items left in the buffer; * all log events will all be written to disk in a very efficient manner. */ -@Plugin(name = "asyncLogger", category = "Core", printObject = true) +@Plugin(name = "asyncLogger", category = Node.CATEGORY, printObject = true) public class AsyncLoggerConfig extends LoggerConfig { private static final long serialVersionUID = 1L; @@ -119,7 +120,7 @@ public class AsyncLoggerConfig extends LoggerConfig { void asyncCallAppenders(final LogEvent event) { super.callAppenders(event); } - + private String displayName() { return LogManager.ROOT_LOGGER_NAME.equals(getName()) ? "root" : getName(); } @@ -147,7 +148,7 @@ public class AsyncLoggerConfig extends LoggerConfig { /** * Creates and returns a new {@code RingBufferAdmin} that instruments the * ringbuffer of this {@code AsyncLoggerConfig}. - * + * * @param contextName name of the {@code LoggerContext} */ public RingBufferAdmin createRingBufferAdmin(final String contextName) { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c52b432c/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderRef.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderRef.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderRef.java index 33b09a5..e0ee77a 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderRef.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderRef.java @@ -29,7 +29,7 @@ import org.apache.logging.log4j.status.StatusLogger; /** * An Appender reference. */ -@Plugin(name = "AppenderRef", category = "Core", printObject = true) +@Plugin(name = "AppenderRef", category = Node.CATEGORY, printObject = true) @PluginAliases("appender-ref") public final class AppenderRef { private static final Logger LOGGER = StatusLogger.getLogger(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c52b432c/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultAdvertiser.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultAdvertiser.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultAdvertiser.java index 3f60def..ac42576 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultAdvertiser.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultAdvertiser.java @@ -25,7 +25,7 @@ import org.apache.logging.log4j.core.net.Advertiser; /** * The default advertiser does not do anything. */ -@Plugin(name = "default", category = "Core", elementType = "advertiser", printObject = false) +@Plugin(name = "default", category = Node.CATEGORY, elementType = "advertiser", printObject = false) public class DefaultAdvertiser implements Advertiser, Serializable { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c52b432c/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java index 7406ec0..1726d1d 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java @@ -58,7 +58,7 @@ import org.apache.logging.log4j.util.Strings; /** * Logger object that is created via configuration. */ -@Plugin(name = "logger", category = "Core", printObject = true) +@Plugin(name = "logger", category = Node.CATEGORY, printObject = true) public class LoggerConfig extends AbstractFilterable { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c52b432c/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggersPlugin.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggersPlugin.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggersPlugin.java index 8875631..7517c53 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggersPlugin.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggersPlugin.java @@ -19,8 +19,6 @@ package org.apache.logging.log4j.core.config; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.apache.logging.log4j.core.config.LoggerConfig; -import org.apache.logging.log4j.core.config.Loggers; import org.apache.logging.log4j.core.config.plugins.Plugin; import org.apache.logging.log4j.core.config.plugins.PluginElement; import org.apache.logging.log4j.core.config.plugins.PluginFactory; @@ -28,7 +26,7 @@ import org.apache.logging.log4j.core.config.plugins.PluginFactory; /** * Container of Logger objects. */ -@Plugin(name = "loggers", category = "Core") +@Plugin(name = "loggers", category = Node.CATEGORY) public final class LoggersPlugin { private LoggersPlugin() { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c52b432c/log4j-core/src/main/java/org/apache/logging/log4j/core/config/PropertiesPlugin.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/PropertiesPlugin.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/PropertiesPlugin.java index 6b2226d..a854687 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/PropertiesPlugin.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/PropertiesPlugin.java @@ -16,6 +16,9 @@ */ package org.apache.logging.log4j.core.config; +import java.util.HashMap; +import java.util.Map; + import org.apache.logging.log4j.core.config.plugins.Plugin; import org.apache.logging.log4j.core.config.plugins.PluginConfiguration; import org.apache.logging.log4j.core.config.plugins.PluginElement; @@ -24,13 +27,10 @@ import org.apache.logging.log4j.core.lookup.Interpolator; import org.apache.logging.log4j.core.lookup.MapLookup; import org.apache.logging.log4j.core.lookup.StrLookup; -import java.util.HashMap; -import java.util.Map; - /** * Handles properties defined in the configuration. */ -@Plugin(name = "properties", category = "Core", printObject = true) +@Plugin(name = "properties", category = Node.CATEGORY, printObject = true) public final class PropertiesPlugin { private PropertiesPlugin() { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c52b432c/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Property.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Property.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Property.java index 31d117c..c4dba14 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Property.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Property.java @@ -26,7 +26,7 @@ import org.apache.logging.log4j.status.StatusLogger; /** * Represents a key/value pair in the configuration. */ -@Plugin(name = "property", category = "Core", printObject = true) +@Plugin(name = "property", category = Node.CATEGORY, printObject = true) public final class Property { private static final Logger LOGGER = StatusLogger.getLogger();
