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:48 UTC
[2/8] git commit: Use constant for Converter plugin category.
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 {