You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2014/09/25 03:21:47 UTC
[1/8] git commit: Javadoc updates (StrLookup).
Repository: logging-log4j2
Updated Branches:
refs/heads/master 8977ccf72 -> c52b432cd
Javadoc updates (StrLookup).
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/6395f99c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6395f99c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6395f99c
Branch: refs/heads/master
Commit: 6395f99cb37f5324f50e2aa07cd7bc37b48914e3
Parents: bb9f7f3
Author: Matt Sicker <ma...@apache.org>
Authored: Wed Sep 24 09:04:07 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Wed Sep 24 20:21:24 2014 -0500
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/core/lookup/StrLookup.java | 6 ++++++
.../org/apache/logging/log4j/core/lookup/package-info.java | 3 +++
2 files changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6395f99c/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrLookup.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrLookup.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrLookup.java
index 07ee909..e29d280 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrLookup.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrLookup.java
@@ -35,6 +35,12 @@ import org.apache.logging.log4j.core.LogEvent;
* </p>
*/
public interface StrLookup {
+
+ /**
+ * Main plugin category for StrLookup plugins.
+ *
+ * @since 2.1
+ */
String CATEGORY = "Lookup";
/**
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6395f99c/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/package-info.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/package-info.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/package-info.java
index 80ad3f3..87010c4 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/package-info.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/package-info.java
@@ -16,5 +16,8 @@
*/
/**
* Log4j 2 Lookups. These are used in variable interpolation in various configuration attributes.
+ * {@link org.apache.logging.log4j.core.lookup.StrLookup} plugins should use the
+ * {@linkplain org.apache.logging.log4j.core.config.plugins.Plugin#category() plugin category}
+ * {@link org.apache.logging.log4j.core.lookup.StrLookup#CATEGORY Lookup}.
*/
package org.apache.logging.log4j.core.lookup;
[6/8] git commit: Extract constant for Layout elementType.
Posted by ma...@apache.org.
Extract constant for Layout elementType.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8b8a1cfd
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8b8a1cfd
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8b8a1cfd
Branch: refs/heads/master
Commit: 8b8a1cfd2c29ec09d4a5e7cc1285ea03fbe9ba44
Parents: ad44a0a
Author: Matt Sicker <ma...@apache.org>
Authored: Wed Sep 24 09:08:14 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Wed Sep 24 20:21:25 2014 -0500
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/core/Layout.java | 8 ++++++++
.../apache/logging/log4j/core/layout/GelfLayout.java | 14 ++++++++------
.../apache/logging/log4j/core/layout/HtmlLayout.java | 4 +++-
.../apache/logging/log4j/core/layout/JsonLayout.java | 6 ++++--
.../logging/log4j/core/layout/LoggerFields.java | 3 ++-
.../logging/log4j/core/layout/PatternLayout.java | 6 ++++--
.../logging/log4j/core/layout/Rfc5424Layout.java | 4 +++-
.../logging/log4j/core/layout/SerializedLayout.java | 5 ++++-
.../logging/log4j/core/layout/SyslogLayout.java | 4 +++-
.../apache/logging/log4j/core/layout/XmlLayout.java | 4 +++-
.../logging/log4j/core/layout/package-info.java | 6 +++++-
11 files changed, 47 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8b8a1cfd/log4j-core/src/main/java/org/apache/logging/log4j/core/Layout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/Layout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/Layout.java
index 78ad558..287dea9 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/Layout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/Layout.java
@@ -43,6 +43,14 @@ import java.util.Map;
* byte arrays as character streams.
*/
public interface Layout<T extends Serializable> {
+
+ /**
+ * Main plugin element type for Layout plugins.
+ *
+ * @since 2.1
+ */
+ String ELEMENT_TYPE = "layout";
+
/**
* Returns the format for the layout format.
* @return The footer.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8b8a1cfd/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java
index e99e34d..47ceba6 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java
@@ -28,7 +28,9 @@ import java.util.zip.DeflaterOutputStream;
import java.util.zip.GZIPOutputStream;
import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.config.Node;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
@@ -49,7 +51,7 @@ import com.fasterxml.jackson.core.io.JsonStringEncoder;
* <p>
* Configure as follows to send to a Graylog2 server:
* </p>
- *
+ *
* <pre>
* <Appenders>
* <Socket name="Graylog" protocol="udp" host="graylog.domain.com" port="12201">
@@ -64,7 +66,7 @@ import com.fasterxml.jackson.core.io.JsonStringEncoder;
* @see <a href="http://graylog2.org/gelf">GELF home page</a>
* @see <a href="http://graylog2.org/resources/gelf/specification">GELF specification</a>
*/
-@Plugin(name = "GelfLayout", category = "Core", elementType = "layout", printObject = true)
+@Plugin(name = "GelfLayout", category = Node.CATEGORY, elementType = Layout.ELEMENT_TYPE, printObject = true)
public final class GelfLayout extends AbstractStringLayout {
public static enum CompressionType {
@@ -101,13 +103,13 @@ public final class GelfLayout extends AbstractStringLayout {
private static final BigDecimal TIME_DIVISOR = new BigDecimal(1000);
@PluginFactory
- public static GelfLayout createLayout(
- //@formatter:off
+ public static GelfLayout createLayout(
+ //@formatter:off
@PluginAttribute("host") final String host,
@PluginElement("AdditionalField") final KeyValuePair[] additionalFields,
- @PluginAttribute(value = "compressionThreshold",
+ @PluginAttribute(value = "compressionThreshold",
defaultString = "GZIP") final CompressionType compressionType,
- @PluginAttribute(value = "compressionThreshold",
+ @PluginAttribute(value = "compressionThreshold",
defaultInt= COMPRESSION_THRESHOLD) final int compressionThreshold) {
// @formatter:on
return new GelfLayout(host, additionalFields, compressionType, compressionThreshold);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8b8a1cfd/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
index 199bfca..9346add 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
@@ -26,7 +26,9 @@ import java.lang.management.ManagementFactory;
import java.nio.charset.Charset;
import java.util.ArrayList;
import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.config.Node;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginBuilderAttribute;
@@ -42,7 +44,7 @@ import org.apache.logging.log4j.core.util.Transform;
* Appenders using this layout should have their encoding set to UTF-8 or UTF-16, otherwise events containing
* non ASCII characters could result in corrupted log files.
*/
-@Plugin(name = "HtmlLayout", category = "Core", elementType = "layout", printObject = true)
+@Plugin(name = "HtmlLayout", category = Node.CATEGORY, elementType = Layout.ELEMENT_TYPE, printObject = true)
public final class HtmlLayout extends AbstractStringLayout {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8b8a1cfd/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
index 8cae234..bda14ae 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
@@ -20,6 +20,8 @@ import java.nio.charset.Charset;
import java.util.HashMap;
import java.util.Map;
+import org.apache.logging.log4j.core.Layout;
+import org.apache.logging.log4j.core.config.Node;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
@@ -789,11 +791,11 @@ import org.apache.logging.log4j.core.util.Charsets;
* may contain, of course, escaped end-of-lines.
* </p>
*/
-@Plugin(name = "JsonLayout", category = "Core", elementType = "layout", printObject = true)
+@Plugin(name = "JsonLayout", category = Node.CATEGORY, elementType = Layout.ELEMENT_TYPE, printObject = true)
public final class JsonLayout extends AbstractJacksonLayout {
static final String CONTENT_TYPE = "application/json";
-
+
private static final long serialVersionUID = 1L;
protected JsonLayout(final boolean locationInfo, final boolean properties, final boolean complete, final boolean compact,
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8b8a1cfd/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/LoggerFields.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/LoggerFields.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/LoggerFields.java
index 5172296..65ed77a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/LoggerFields.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/LoggerFields.java
@@ -20,6 +20,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import org.apache.logging.log4j.core.config.Node;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
@@ -30,7 +31,7 @@ import org.apache.logging.log4j.message.StructuredDataId;
/**
* A LoggerFields container.
*/
-@Plugin(name = "LoggerFields", category = "Core", printObject = true)
+@Plugin(name = "LoggerFields", category = Node.CATEGORY, printObject = true)
public final class LoggerFields {
private final Map<String, String> map;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8b8a1cfd/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
index 7f2e9d3..b8c6e18 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
@@ -21,9 +21,11 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.DefaultConfiguration;
+import org.apache.logging.log4j.core.config.Node;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginBuilderAttribute;
@@ -49,9 +51,9 @@ import org.apache.logging.log4j.core.pattern.RegexReplacement;
*
* See the Log4j Manual for details on the supported pattern converters.
*/
-@Plugin(name = "PatternLayout", category = "Core", elementType = "layout", printObject = true)
+@Plugin(name = "PatternLayout", category = Node.CATEGORY, elementType = Layout.ELEMENT_TYPE, printObject = true)
public final class PatternLayout extends AbstractStringLayout {
-
+
private static final long serialVersionUID = 1L;
/**
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8b8a1cfd/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
index 7bd6b81..7df4672 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
@@ -30,9 +30,11 @@ import java.util.regex.Pattern;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LoggingException;
+import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.appender.TlsSyslogFrame;
import org.apache.logging.log4j.core.config.Configuration;
+import org.apache.logging.log4j.core.config.Node;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginConfiguration;
@@ -59,7 +61,7 @@ import org.apache.logging.log4j.util.Strings;
*
* @see <a href="https://tools.ietf.org/html/rfc5424">RFC 5424</a>
*/
-@Plugin(name = "Rfc5424Layout", category = "Core", elementType = "layout", printObject = true)
+@Plugin(name = "Rfc5424Layout", category = Node.CATEGORY, elementType = Layout.ELEMENT_TYPE, printObject = true)
public final class Rfc5424Layout extends AbstractStringLayout {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8b8a1cfd/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SerializedLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SerializedLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SerializedLayout.java
index e465339..e8fa142 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SerializedLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SerializedLayout.java
@@ -20,14 +20,17 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectOutputStream;
import java.io.OutputStream;
+
+import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.config.Node;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
/**
* Formats a {@link LogEvent} in its Java serialized form.
*/
-@Plugin(name = "SerializedLayout", category = "Core", elementType = "layout", printObject = true)
+@Plugin(name = "SerializedLayout", category = Node.CATEGORY, elementType = Layout.ELEMENT_TYPE, printObject = true)
public final class SerializedLayout extends AbstractLayout<LogEvent> {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8b8a1cfd/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
index 0f09845..4463c23 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
@@ -25,7 +25,9 @@ import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.config.Node;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
@@ -37,7 +39,7 @@ import org.apache.logging.log4j.core.util.NetUtils;
/**
* Formats a log event as a BSD Log record.
*/
-@Plugin(name = "SyslogLayout", category = "Core", elementType = "layout", printObject = true)
+@Plugin(name = "SyslogLayout", category = Node.CATEGORY, elementType = Layout.ELEMENT_TYPE, printObject = true)
public final class SyslogLayout extends AbstractStringLayout {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8b8a1cfd/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
index 402df6f..7f1a29e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
@@ -20,6 +20,8 @@ import java.nio.charset.Charset;
import java.util.HashMap;
import java.util.Map;
+import org.apache.logging.log4j.core.Layout;
+import org.apache.logging.log4j.core.config.Node;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
@@ -184,7 +186,7 @@ import org.apache.logging.log4j.core.util.Charsets;
* Message content may contain, of course, end-of-lines.
* </p>
*/
-@Plugin(name = "XmlLayout", category = "Core", elementType = "layout", printObject = true)
+@Plugin(name = "XmlLayout", category = Node.CATEGORY, elementType = Layout.ELEMENT_TYPE, printObject = true)
public final class XmlLayout extends AbstractJacksonLayout {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8b8a1cfd/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/package-info.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/package-info.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/package-info.java
index 0a22f9d..581c139 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/package-info.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/package-info.java
@@ -15,6 +15,10 @@
* limitations under the license.
*/
/**
- * Log4j 2 Layout support.
+ * Log4j 2 Layout support. {@link org.apache.logging.log4j.core.Layout} plugins should use the
+ * {@linkplain org.apache.logging.log4j.core.config.plugins.Plugin#category() plugin category}
+ * {@link org.apache.logging.log4j.core.config.Node#CATEGORY Core} and the
+ * {@linkplain org.apache.logging.log4j.core.config.plugins.Plugin#elementType() element type}
+ * {@link org.apache.logging.log4j.core.Layout#ELEMENT_TYPE layout}.
*/
package org.apache.logging.log4j.core.layout;
[7/8] git commit: Use Node.CATEGORY.
Posted by ma...@apache.org.
Use Node.CATEGORY.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ad44a0a9
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ad44a0a9
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ad44a0a9
Branch: refs/heads/master
Commit: ad44a0a9cbc680078c66636492c15a00fc22bb00
Parents: 2fa6962
Author: Matt Sicker <ma...@apache.org>
Authored: Wed Sep 24 09:07:59 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Wed Sep 24 20:21:25 2014 -0500
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/util/KeyValuePair.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ad44a0a9/log4j-core/src/main/java/org/apache/logging/log4j/core/util/KeyValuePair.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/KeyValuePair.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/KeyValuePair.java
index 665d2b5..6338f27 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/KeyValuePair.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/KeyValuePair.java
@@ -22,21 +22,22 @@ import java.io.ObjectInputStream;
import java.io.ObjectStreamException;
import java.io.Serializable;
+import org.apache.logging.log4j.core.config.Node;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginBuilderAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginBuilderFactory;
/**
* Key/Value pair configuration item.
- *
+ *
* @since 2.1 implements {@link Serializable}
- * @since 2.1 implements {@link #hashCode()} and {@link #equals(Object)}
+ * @since 2.1 implements {@link #hashCode()} and {@link #equals(Object)}
*/
-@Plugin(name = "KeyValuePair", category = "Core", printObject = true)
+@Plugin(name = "KeyValuePair", category = Node.CATEGORY, printObject = true)
public final class KeyValuePair implements Serializable {
private static final long serialVersionUID = 4331228262821046866L;
-
+
private final String key;
private final String value;
[2/8] git commit: Use constant for Converter plugin category.
Posted by ma...@apache.org.
Use constant for Converter plugin category.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/bb9f7f3f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/bb9f7f3f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/bb9f7f3f
Branch: refs/heads/master
Commit: bb9f7f3fecb78cca09f1ea8cda01e8bb377f73eb
Parents: 8977ccf
Author: Matt Sicker <ma...@apache.org>
Authored: Wed Sep 24 08:55:03 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Wed Sep 24 20:21:24 2014 -0500
----------------------------------------------------------------------
.../log4j/core/pattern/ClassNamePatternConverter.java | 2 +-
.../logging/log4j/core/pattern/DatePatternConverter.java | 10 +++++-----
.../log4j/core/pattern/EncodingPatternConverter.java | 2 +-
.../core/pattern/ExtendedThrowablePatternConverter.java | 2 +-
.../log4j/core/pattern/FileLocationPatternConverter.java | 2 +-
.../log4j/core/pattern/FullLocationPatternConverter.java | 2 +-
.../logging/log4j/core/pattern/HighlightConverter.java | 2 +-
.../logging/log4j/core/pattern/LevelPatternConverter.java | 2 +-
.../log4j/core/pattern/LineLocationPatternConverter.java | 2 +-
.../log4j/core/pattern/LineSeparatorPatternConverter.java | 4 ++--
.../log4j/core/pattern/LoggerPatternConverter.java | 2 +-
.../logging/log4j/core/pattern/MapPatternConverter.java | 2 +-
.../log4j/core/pattern/MarkerPatternConverter.java | 2 +-
.../logging/log4j/core/pattern/MdcPatternConverter.java | 2 +-
.../log4j/core/pattern/MessagePatternConverter.java | 2 +-
.../core/pattern/MethodLocationPatternConverter.java | 2 +-
.../logging/log4j/core/pattern/NdcPatternConverter.java | 2 +-
.../logging/log4j/core/pattern/PatternConverter.java | 8 ++++++++
.../log4j/core/pattern/RegexReplacementConverter.java | 2 +-
.../log4j/core/pattern/RelativeTimePatternConverter.java | 2 +-
.../log4j/core/pattern/RootThrowablePatternConverter.java | 2 +-
.../apache/logging/log4j/core/pattern/StyleConverter.java | 2 +-
.../log4j/core/pattern/ThreadPatternConverter.java | 2 +-
.../log4j/core/pattern/ThrowablePatternConverter.java | 2 +-
.../logging/log4j/core/pattern/UuidPatternConverter.java | 2 +-
25 files changed, 37 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bb9f7f3f/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ClassNamePatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ClassNamePatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ClassNamePatternConverter.java
index a3170e1..a2e0f2a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ClassNamePatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ClassNamePatternConverter.java
@@ -23,7 +23,7 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
/**
* Formats the class name of the site of the logging request.
*/
-@Plugin(name = "ClassNamePatternConverter", category = "Converter")
+@Plugin(name = "ClassNamePatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "C", "class" })
public final class ClassNamePatternConverter extends NamePatternConverter {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bb9f7f3f/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
index 9554a94..4e34d50 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
@@ -26,7 +26,7 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
/**
* Convert and format the event's date in a StringBuilder.
*/
-@Plugin(name = "DatePatternConverter", category = "Converter")
+@Plugin(name = "DatePatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "d", "date" })
public final class DatePatternConverter extends LogEventPatternConverter implements ArrayPatternConverter {
@@ -149,7 +149,7 @@ public final class DatePatternConverter extends LogEventPatternConverter impleme
/**
* Obtains an instance of pattern converter.
- *
+ *
* @param options
* options, may be null.
* @return instance of pattern converter.
@@ -169,7 +169,7 @@ public final class DatePatternConverter extends LogEventPatternConverter impleme
/**
* Private constructor.
- *
+ *
* @param options
* options, may be null.
*/
@@ -226,7 +226,7 @@ public final class DatePatternConverter extends LogEventPatternConverter impleme
/**
* Append formatted date to string buffer.
- *
+ *
* @param date
* date
* @param toAppendTo
@@ -277,7 +277,7 @@ public final class DatePatternConverter extends LogEventPatternConverter impleme
/**
* Gets the pattern string describing this date format.
- *
+ *
* @return the pattern string describing this date format.
*/
public String getPattern() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bb9f7f3f/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/EncodingPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/EncodingPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/EncodingPatternConverter.java
index a4cde28..b437309 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/EncodingPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/EncodingPatternConverter.java
@@ -26,7 +26,7 @@ import org.apache.logging.log4j.core.layout.PatternLayout;
/**
* Returns the event's rendered message in a StringBuilder.
*/
-@Plugin(name = "encode", category = "Converter")
+@Plugin(name = "encode", category = PatternConverter.CATEGORY)
@ConverterKeys({ "enc", "encode" })
public final class EncodingPatternConverter extends LogEventPatternConverter {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bb9f7f3f/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java
index 79415b5..cf6f764 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java
@@ -30,7 +30,7 @@ import org.apache.logging.log4j.core.util.Constants;
* The extended stack trace will also include the location of where the class was loaded from and the
* version of the jar if available.
*/
-@Plugin(name = "ExtendedThrowablePatternConverter", category = "Converter")
+@Plugin(name = "ExtendedThrowablePatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "xEx", "xThrowable", "xException" })
public final class ExtendedThrowablePatternConverter extends ThrowablePatternConverter {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bb9f7f3f/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/FileLocationPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/FileLocationPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/FileLocationPatternConverter.java
index fca0a1f..7fcd33d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/FileLocationPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/FileLocationPatternConverter.java
@@ -23,7 +23,7 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
/**
* Returns the event's line location information in a StringBuilder.
*/
-@Plugin(name = "FileLocationPatternConverter", category = "Converter")
+@Plugin(name = "FileLocationPatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "F", "file" })
public final class FileLocationPatternConverter extends LogEventPatternConverter {
/**
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bb9f7f3f/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/FullLocationPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/FullLocationPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/FullLocationPatternConverter.java
index 734bdd8..120a671 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/FullLocationPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/FullLocationPatternConverter.java
@@ -23,7 +23,7 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
/**
* Format the event's line location information.
*/
-@Plugin(name = "FullLocationPatternConverter", category = "Converter")
+@Plugin(name = "FullLocationPatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "l", "location" })
public final class FullLocationPatternConverter extends LogEventPatternConverter {
/**
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bb9f7f3f/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java
index f644a4f..9784622 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java
@@ -68,7 +68,7 @@ import org.apache.logging.log4j.util.Strings;
* normalized to upper-case internally.
* </p>
*/
-@Plugin(name = "highlight", category = "Converter")
+@Plugin(name = "highlight", category = PatternConverter.CATEGORY)
@ConverterKeys({ "highlight" })
public final class HighlightConverter extends LogEventPatternConverter implements AnsiConverter {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bb9f7f3f/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LevelPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LevelPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LevelPatternConverter.java
index 6099754..1975fcf 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LevelPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LevelPatternConverter.java
@@ -28,7 +28,7 @@ import org.apache.logging.log4j.core.util.Patterns;
/**
* Returns the event's level in a StringBuilder.
*/
-@Plugin(name = "LevelPatternConverter", category = "Converter")
+@Plugin(name = "LevelPatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "p", "level" })
public final class LevelPatternConverter extends LogEventPatternConverter {
private static final String OPTION_LENGTH = "length";
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bb9f7f3f/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LineLocationPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LineLocationPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LineLocationPatternConverter.java
index 6069e34..2b912d7 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LineLocationPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LineLocationPatternConverter.java
@@ -22,7 +22,7 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
/**
* Returns the event's line location information in a StringBuilder.
*/
-@Plugin(name = "LineLocationPatternConverter", category = "Converter")
+@Plugin(name = "LineLocationPatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "L", "line" })
public final class LineLocationPatternConverter extends LogEventPatternConverter {
/**
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bb9f7f3f/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LineSeparatorPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LineSeparatorPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LineSeparatorPatternConverter.java
index 2e6f348..6d41bf9 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LineSeparatorPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LineSeparatorPatternConverter.java
@@ -23,7 +23,7 @@ import org.apache.logging.log4j.core.util.Constants;
/**
* Formats a line separator.
*/
-@Plugin(name = "LineSeparatorPatternConverter", category = "Converter")
+@Plugin(name = "LineSeparatorPatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "n" })
public final class LineSeparatorPatternConverter extends LogEventPatternConverter {
@@ -47,7 +47,7 @@ public final class LineSeparatorPatternConverter extends LogEventPatternConverte
/**
* Obtains an instance of pattern converter.
- *
+ *
* @param options
* options, may be null.
* @return instance of pattern converter.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bb9f7f3f/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LoggerPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LoggerPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LoggerPatternConverter.java
index cfe4f0b..2b5651b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LoggerPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LoggerPatternConverter.java
@@ -23,7 +23,7 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
/**
* Formats a logger name.
*/
-@Plugin(name = "LoggerPatternConverter", category = "Converter")
+@Plugin(name = "LoggerPatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "c", "logger" })
public final class LoggerPatternConverter extends NamePatternConverter {
/**
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bb9f7f3f/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MapPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MapPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MapPatternConverter.java
index ca4a6b4..e75181b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MapPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MapPatternConverter.java
@@ -30,7 +30,7 @@ import org.apache.logging.log4j.message.MapMessage;
* java.util.Hashtable.toString(), or to output the value of a specific key
* within the Map.
*/
-@Plugin(name = "MapPatternConverter", category = "Converter")
+@Plugin(name = "MapPatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "K", "map", "MAP" })
public final class MapPatternConverter extends LogEventPatternConverter {
/**
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bb9f7f3f/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MarkerPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MarkerPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MarkerPatternConverter.java
index 8abbfb0..020f832 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MarkerPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MarkerPatternConverter.java
@@ -23,7 +23,7 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
/**
* Returns the event's rendered message in a StringBuilder.
*/
-@Plugin(name = "MarkerPatternConverter", category = "Converter")
+@Plugin(name = "MarkerPatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "marker" })
public final class MarkerPatternConverter extends LogEventPatternConverter {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bb9f7f3f/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MdcPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MdcPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MdcPatternConverter.java
index 6f707b9..665ce05 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MdcPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MdcPatternConverter.java
@@ -30,7 +30,7 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
* within the property bundle
* when this pattern converter has the option set.
*/
- @Plugin(name = "MdcPatternConverter", category = "Converter")
+ @Plugin(name = "MdcPatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "X", "mdc", "MDC" })
public final class MdcPatternConverter extends LogEventPatternConverter {
/**
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bb9f7f3f/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java
index 9057d73..d0adc7f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java
@@ -25,7 +25,7 @@ import org.apache.logging.log4j.message.MultiformatMessage;
/**
* Returns the event's rendered message in a StringBuilder.
*/
-@Plugin(name = "MessagePatternConverter", category = "Converter")
+@Plugin(name = "MessagePatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "m", "msg", "message" })
public final class MessagePatternConverter extends LogEventPatternConverter {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bb9f7f3f/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MethodLocationPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MethodLocationPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MethodLocationPatternConverter.java
index 6b98f12..457b7a6 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MethodLocationPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MethodLocationPatternConverter.java
@@ -23,7 +23,7 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
/**
* Returns the event's line location information in a StringBuilder.
*/
-@Plugin(name = "MethodLocationPatternConverter", category = "Converter")
+@Plugin(name = "MethodLocationPatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "M", "method" })
public final class MethodLocationPatternConverter extends LogEventPatternConverter {
/**
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bb9f7f3f/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/NdcPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/NdcPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/NdcPatternConverter.java
index 0d5485a..9a3b972 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/NdcPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/NdcPatternConverter.java
@@ -23,7 +23,7 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
/**
* Returns the event's NDC in a StringBuilder.
*/
-@Plugin(name = "NdcPatternConverter", category = "Converter")
+@Plugin(name = "NdcPatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "x", "NDC" })
public final class NdcPatternConverter extends LogEventPatternConverter {
/**
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bb9f7f3f/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternConverter.java
index 9656ca8..01fb227 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternConverter.java
@@ -20,6 +20,14 @@ package org.apache.logging.log4j.core.pattern;
* Interface that all PatternConverters must implement.
*/
public interface PatternConverter {
+
+ /**
+ * Main plugin category for PatternConverter plugins.
+ *
+ * @since 2.1
+ */
+ String CATEGORY = "Converter";
+
/**
* Formats an object into a string buffer.
*
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bb9f7f3f/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacementConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacementConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacementConverter.java
index 5d2e267..f7c4697 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacementConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacementConverter.java
@@ -27,7 +27,7 @@ import org.apache.logging.log4j.core.layout.PatternLayout;
/**
* Replacement pattern converter.
*/
-@Plugin(name = "replace", category = "Converter")
+@Plugin(name = "replace", category = PatternConverter.CATEGORY)
@ConverterKeys({ "replace" })
public final class RegexReplacementConverter extends LogEventPatternConverter {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bb9f7f3f/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RelativeTimePatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RelativeTimePatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RelativeTimePatternConverter.java
index c9eeca7..9767be1 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RelativeTimePatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RelativeTimePatternConverter.java
@@ -24,7 +24,7 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
/**
* Returns the relative time in milliseconds since JVM Startup.
*/
-@Plugin(name = "RelativeTimePatternConverter", category = "Converter")
+@Plugin(name = "RelativeTimePatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "r", "relative" })
public class RelativeTimePatternConverter extends LogEventPatternConverter {
/**
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bb9f7f3f/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java
index d2c69c0..e87d078 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java
@@ -30,7 +30,7 @@ import org.apache.logging.log4j.core.util.Constants;
* The extended stack trace will also include the location of where the class was loaded from and the
* version of the jar if available.
*/
-@Plugin(name = "RootThrowablePatternConverter", category = "Converter")
+@Plugin(name = "RootThrowablePatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "rEx", "rThrowable", "rException" })
public final class RootThrowablePatternConverter extends ThrowablePatternConverter {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bb9f7f3f/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/StyleConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/StyleConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/StyleConverter.java
index 3b6147e..583be29 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/StyleConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/StyleConverter.java
@@ -27,7 +27,7 @@ import org.apache.logging.log4j.core.util.Patterns;
/**
* Style pattern converter. Adds ANSI color styling to the result of the enclosed pattern.
*/
-@Plugin(name = "style", category = "Converter")
+@Plugin(name = "style", category = PatternConverter.CATEGORY)
@ConverterKeys({ "style" })
public final class StyleConverter extends LogEventPatternConverter implements AnsiConverter {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bb9f7f3f/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThreadPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThreadPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThreadPatternConverter.java
index 87bcddf..c763e51 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThreadPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThreadPatternConverter.java
@@ -22,7 +22,7 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
/**
* Formats the event thread name.
*/
-@Plugin(name = "ThreadPatternConverter", category = "Converter")
+@Plugin(name = "ThreadPatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "t", "thread" })
public final class ThreadPatternConverter extends LogEventPatternConverter {
/**
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bb9f7f3f/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java
index 974d206..b73d904 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java
@@ -31,7 +31,7 @@ import org.apache.logging.log4j.util.Strings;
* unless this converter's option is 'short', where it just outputs the first line of the trace, or if
* the number of lines to print is explicitly specified.
*/
-@Plugin(name = "ThrowablePatternConverter", category = "Converter")
+@Plugin(name = "ThrowablePatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "ex", "throwable", "exception" })
public class ThrowablePatternConverter extends LogEventPatternConverter {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bb9f7f3f/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/UuidPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/UuidPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/UuidPatternConverter.java
index 5145a09..439935b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/UuidPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/UuidPatternConverter.java
@@ -25,7 +25,7 @@ import org.apache.logging.log4j.core.util.UuidUtil;
/**
* Formats the event sequence number.
*/
-@Plugin(name = "UuidPatternConverter", category = "Converter")
+@Plugin(name = "UuidPatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "u", "uuid" })
public final class UuidPatternConverter extends LogEventPatternConverter {
[3/8] git commit: Use Core category constant.
Posted by ma...@apache.org.
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 <ma...@apache.org>
Authored: Wed Sep 24 09:20:30 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
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();
[8/8] git commit: Use ConfigurationFactory category constant.
Posted by ma...@apache.org.
Use ConfigurationFactory 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/d7876cf1
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d7876cf1
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d7876cf1
Branch: refs/heads/master
Commit: d7876cf1dd7856c5022c76b68a4c35470c9034ae
Parents: a3eee3e
Author: Matt Sicker <ma...@apache.org>
Authored: Wed Sep 24 09:19:15 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Wed Sep 24 20:21:25 2014 -0500
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/config/ConfigurationFactory.java | 2 ++
.../logging/log4j/core/config/json/JsonConfigurationFactory.java | 2 +-
.../logging/log4j/core/config/xml/XmlConfigurationFactory.java | 2 +-
.../logging/log4j/core/config/yaml/YamlConfigurationFactory.java | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d7876cf1/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
index 751d409..8c7e176 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
@@ -83,6 +83,8 @@ public abstract class ConfigurationFactory {
/**
* Plugin category used to inject a ConfigurationFactory {@link org.apache.logging.log4j.core.config.plugins.Plugin}
* class.
+ *
+ * @since 2.1
*/
public static final String CATEGORY = "ConfigurationFactory";
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d7876cf1/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfigurationFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfigurationFactory.java
index 8f09bbe..7b45cf9 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfigurationFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfigurationFactory.java
@@ -26,7 +26,7 @@ import org.apache.logging.log4j.core.util.Loader;
/**
*
*/
-@Plugin(name = "JsonConfigurationFactory", category = "ConfigurationFactory")
+@Plugin(name = "JsonConfigurationFactory", category = ConfigurationFactory.CATEGORY)
@Order(6)
public class JsonConfigurationFactory extends ConfigurationFactory {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d7876cf1/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfigurationFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfigurationFactory.java
index 3fa3c57..1c3e919 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfigurationFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfigurationFactory.java
@@ -25,7 +25,7 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
/**
* Factory to construct an XmlConfiguration.
*/
-@Plugin(name = "XmlConfigurationFactory", category = "ConfigurationFactory")
+@Plugin(name = "XmlConfigurationFactory", category = ConfigurationFactory.CATEGORY)
@Order(5)
public class XmlConfigurationFactory extends ConfigurationFactory {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d7876cf1/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YamlConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YamlConfigurationFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YamlConfigurationFactory.java
index 9cfe9d3..f3429bb 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YamlConfigurationFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YamlConfigurationFactory.java
@@ -23,7 +23,7 @@ import org.apache.logging.log4j.core.config.Order;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.util.Loader;
-@Plugin(name = "YamlConfigurationFactory", category = "ConfigurationFactory")
+@Plugin(name = "YamlConfigurationFactory", category = ConfigurationFactory.CATEGORY)
@Order(7)
public class YamlConfigurationFactory extends ConfigurationFactory {
[5/8] git commit: Extract element type for filters.
Posted by ma...@apache.org.
Extract element type for filters.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a3eee3eb
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a3eee3eb
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a3eee3eb
Branch: refs/heads/master
Commit: a3eee3eb2fd9fbe1e996f460680aae320ac995ac
Parents: 8b8a1cf
Author: Matt Sicker <ma...@apache.org>
Authored: Wed Sep 24 09:15:44 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Wed Sep 24 20:21:25 2014 -0500
----------------------------------------------------------------------
.../main/java/org/apache/logging/log4j/core/Filter.java | 8 ++++++++
.../org/apache/logging/log4j/core/filter/BurstFilter.java | 4 +++-
.../apache/logging/log4j/core/filter/CompositeFilter.java | 5 +++--
.../logging/log4j/core/filter/DynamicThresholdFilter.java | 6 ++++--
.../org/apache/logging/log4j/core/filter/MapFilter.java | 6 ++++--
.../apache/logging/log4j/core/filter/MarkerFilter.java | 4 +++-
.../org/apache/logging/log4j/core/filter/RegexFilter.java | 10 ++++++----
.../logging/log4j/core/filter/StructuredDataFilter.java | 4 +++-
.../logging/log4j/core/filter/ThreadContextMapFilter.java | 4 +++-
.../apache/logging/log4j/core/filter/ThresholdFilter.java | 4 +++-
.../org/apache/logging/log4j/core/filter/TimeFilter.java | 4 +++-
.../apache/logging/log4j/core/filter/package-info.java | 6 +++++-
12 files changed, 48 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a3eee3eb/log4j-core/src/main/java/org/apache/logging/log4j/core/Filter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/Filter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/Filter.java
index 42a0a99..af1dd68 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/Filter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/Filter.java
@@ -33,6 +33,14 @@ import org.apache.logging.log4j.util.EnglishEnums;
public interface Filter extends LifeCycle {
/**
+ * Main {@linkplain org.apache.logging.log4j.core.config.plugins.Plugin#elementType() plugin element type} for
+ * Filter plugins.
+ *
+ * @since 2.1
+ */
+ String ELEMENT_TYPE = "filter";
+
+ /**
* The result that can returned from a filter method call.
*/
enum Result {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a3eee3eb/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
index 9f4d7a9..3bec9c3 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
@@ -26,8 +26,10 @@ import java.util.concurrent.TimeUnit;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Marker;
+import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.Logger;
+import org.apache.logging.log4j.core.config.Node;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginBuilderAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginBuilderFactory;
@@ -53,7 +55,7 @@ import org.apache.logging.log4j.message.Message;
* </code><br>
*/
-@Plugin(name = "BurstFilter", category = "Core", elementType = "filter", printObject = true)
+@Plugin(name = "BurstFilter", category = Node.CATEGORY, elementType = Filter.ELEMENT_TYPE, printObject = true)
public final class BurstFilter extends AbstractFilter {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a3eee3eb/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java
index b473021..6ce5631 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java
@@ -28,6 +28,7 @@ import org.apache.logging.log4j.core.AbstractLifeCycle;
import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.Logger;
+import org.apache.logging.log4j.core.config.Node;
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;
@@ -36,7 +37,7 @@ import org.apache.logging.log4j.message.Message;
/**
* Composes and invokes one or more filters.
*/
-@Plugin(name = "filters", category = "Core", printObject = true)
+@Plugin(name = "filters", category = Node.CATEGORY, printObject = true)
public final class CompositeFilter extends AbstractLifeCycle implements Iterable<Filter>, Filter {
private static final long serialVersionUID = 1L;
@@ -86,7 +87,7 @@ public final class CompositeFilter extends AbstractLifeCycle implements Iterable
/**
* Returns whether this composite contains any filters.
- *
+ *
* @return whether this composite contains any filters.
*/
public boolean isEmpty() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a3eee3eb/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
index dd89796..2326466 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
@@ -22,8 +22,10 @@ import java.util.Map;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.ThreadContext;
+import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.Logger;
+import org.apache.logging.log4j.core.config.Node;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
@@ -34,9 +36,9 @@ import org.apache.logging.log4j.message.Message;
/**
* Compare against a log level that is associated with an MDC value.
*/
-@Plugin(name = "DynamicThresholdFilter", category = "Core", elementType = "filter", printObject = true)
+@Plugin(name = "DynamicThresholdFilter", category = Node.CATEGORY, elementType = Filter.ELEMENT_TYPE, printObject = true)
public final class DynamicThresholdFilter extends AbstractFilter {
-
+
private static final long serialVersionUID = 1L;
/**
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a3eee3eb/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java
index 7abf6b1..4ab60b4 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java
@@ -23,8 +23,10 @@ import java.util.Map;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Marker;
+import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.Logger;
+import org.apache.logging.log4j.core.config.Node;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
@@ -36,9 +38,9 @@ import org.apache.logging.log4j.message.Message;
/**
* A Filter that operates on a Map.
*/
-@Plugin(name = "MapFilter", category = "Core", elementType = "filter", printObject = true)
+@Plugin(name = "MapFilter", category = Node.CATEGORY, elementType = Filter.ELEMENT_TYPE, printObject = true)
public class MapFilter extends AbstractFilter {
-
+
private static final long serialVersionUID = 1L;
private final Map<String, List<String>> map;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a3eee3eb/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java
index cdac66e..55771e8 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java
@@ -18,8 +18,10 @@ package org.apache.logging.log4j.core.filter;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Marker;
+import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.Logger;
+import org.apache.logging.log4j.core.config.Node;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
@@ -30,7 +32,7 @@ import org.apache.logging.log4j.message.Message;
* configured marker as a parent.
*
*/
-@Plugin(name = "MarkerFilter", category = "Core", elementType = "filter", printObject = true)
+@Plugin(name = "MarkerFilter", category = Node.CATEGORY, elementType = Filter.ELEMENT_TYPE, printObject = true)
public final class MarkerFilter extends AbstractFilter {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a3eee3eb/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java
index ad28fb4..18034e4 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java
@@ -24,8 +24,10 @@ import java.util.regex.Pattern;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Marker;
+import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.Logger;
+import org.apache.logging.log4j.core.config.Node;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
@@ -39,7 +41,7 @@ import org.apache.logging.log4j.message.Message;
* calling Message.getMessageFormat (true) or Message.getFormattedMessage() (false). The default is false.
*
*/
-@Plugin(name = "RegexFilter", category = "Core", elementType = "filter", printObject = true)
+@Plugin(name = "RegexFilter", category = Node.CATEGORY, elementType = Filter.ELEMENT_TYPE, printObject = true)
public final class RegexFilter extends AbstractFilter {
private static final long serialVersionUID = 1L;
@@ -103,7 +105,7 @@ public final class RegexFilter extends AbstractFilter {
/**
* Create a Filter that matches a regular expression.
- *
+ *
* @param regex
* The regular expression to match.
* @param patternFlags
@@ -124,8 +126,8 @@ public final class RegexFilter extends AbstractFilter {
@PluginAttribute("regex") final String regex,
@PluginElement("PatternFlags") final String[] patternFlags,
@PluginAttribute("useRawMsg") final Boolean useRawMsg,
- @PluginAttribute("onMatch") final Result match,
- @PluginAttribute("onMismatch") final Result mismatch)
+ @PluginAttribute("onMatch") final Result match,
+ @PluginAttribute("onMismatch") final Result mismatch)
//@formatter:on
throws IllegalArgumentException, IllegalAccessException {
if (regex == null) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a3eee3eb/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/StructuredDataFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/StructuredDataFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/StructuredDataFilter.java
index c7ab199..9c57a8a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/StructuredDataFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/StructuredDataFilter.java
@@ -23,8 +23,10 @@ import java.util.Map;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Marker;
+import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.Logger;
+import org.apache.logging.log4j.core.config.Node;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
@@ -36,7 +38,7 @@ import org.apache.logging.log4j.message.StructuredDataMessage;
/**
* Filter based on data in a StructuredDataMessage.
*/
-@Plugin(name = "StructuredDataFilter", category = "Core", elementType = "filter", printObject = true)
+@Plugin(name = "StructuredDataFilter", category = Node.CATEGORY, elementType = Filter.ELEMENT_TYPE, printObject = true)
public final class StructuredDataFilter extends MapFilter {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a3eee3eb/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilter.java
index 454b3f5..9fba2b4 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilter.java
@@ -25,8 +25,10 @@ import java.util.Map;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.ThreadContext;
+import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.Logger;
+import org.apache.logging.log4j.core.config.Node;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
@@ -37,7 +39,7 @@ import org.apache.logging.log4j.message.Message;
/**
* Filter based on a value in the Thread Context Map (MDC).
*/
-@Plugin(name = "ThreadContextMapFilter", category = "Core", elementType = "filter", printObject = true)
+@Plugin(name = "ThreadContextMapFilter", category = Node.CATEGORY, elementType = Filter.ELEMENT_TYPE, printObject = true)
public class ThreadContextMapFilter extends MapFilter {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a3eee3eb/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java
index 27da4ac..34b0307 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java
@@ -18,8 +18,10 @@ package org.apache.logging.log4j.core.filter;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Marker;
+import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.Logger;
+import org.apache.logging.log4j.core.config.Node;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
@@ -33,7 +35,7 @@ import org.apache.logging.log4j.message.Message;
*
* The default Level is ERROR.
*/
-@Plugin(name = "ThresholdFilter", category = "Core", elementType = "filter", printObject = true)
+@Plugin(name = "ThresholdFilter", category = Node.CATEGORY, elementType = Filter.ELEMENT_TYPE, printObject = true)
public final class ThresholdFilter extends AbstractFilter {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a3eee3eb/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java
index a72d75c..159bc41 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java
@@ -21,7 +21,9 @@ import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.TimeZone;
+import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.config.Node;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
@@ -29,7 +31,7 @@ import org.apache.logging.log4j.core.config.plugins.PluginFactory;
/**
* Filters events that fall within a specified time period in each day.
*/
-@Plugin(name = "TimeFilter", category = "Core", elementType = "filter", printObject = true)
+@Plugin(name = "TimeFilter", category = Node.CATEGORY, elementType = Filter.ELEMENT_TYPE, printObject = true)
public final class TimeFilter extends AbstractFilter {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a3eee3eb/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/package-info.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/package-info.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/package-info.java
index b60d3d2..8c4d417 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/package-info.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/package-info.java
@@ -15,6 +15,10 @@
* limitations under the license.
*/
/**
- * Log4j 2 Filter support.
+ * Log4j 2 Filter support. {@link org.apache.logging.log4j.core.Filter} plugins should use the
+ * {@linkplain org.apache.logging.log4j.core.config.plugins.Plugin#category() plugin category}
+ * {@link org.apache.logging.log4j.core.config.Node#CATEGORY Core} and the
+ * {@linkplain org.apache.logging.log4j.core.config.plugins.Plugin#elementType() element type}
+ * {@link org.apache.logging.log4j.core.Filter#ELEMENT_TYPE filter}.
*/
package org.apache.logging.log4j.core.filter;
[4/8] git commit: Javadoc update (Node.CATEGORY).
Posted by ma...@apache.org.
Javadoc update (Node.CATEGORY).
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/2fa69621
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/2fa69621
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/2fa69621
Branch: refs/heads/master
Commit: 2fa69621f87f7f5eadf8fc6d9b6d7391417f9062
Parents: 6395f99
Author: Matt Sicker <ma...@apache.org>
Authored: Wed Sep 24 09:07:26 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Wed Sep 24 20:21:25 2014 -0500
----------------------------------------------------------------------
.../main/java/org/apache/logging/log4j/core/config/Node.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2fa69621/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Node.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Node.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Node.java
index 5af00b8..113123d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Node.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Node.java
@@ -28,7 +28,14 @@ import org.apache.logging.log4j.core.config.plugins.util.PluginType;
*/
public class Node {
+ /**
+ * Main plugin category for plugins which are represented as a configuration node. Such plugins tend to be
+ * available as XML elements in a configuration file.
+ *
+ * @since 2.1
+ */
public static final String CATEGORY = "Core";
+
private final Node parent;
private final String name;
private String value;