logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgo...@apache.org
Subject svn commit: r1479232 [2/2] - in /logging/log4j/log4j2/trunk: core/src/main/java/org/apache/logging/log4j/core/appender/ core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/ core/src/main/java/org/apache/logging/log4j/core/appender/rolling...
Date Sun, 05 May 2013 03:08:41 GMT
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
Sun May  5 03:08:39 2013
@@ -27,7 +27,7 @@ import java.util.TimeZone;
 /**
  * Convert and format the event's date in a StringBuffer.
  */
-@Plugin(name = "DatePatternConverter", type = "Converter")
+@Plugin(name = "DatePatternConverter", category = "Converter")
 @ConverterKeys({"d", "date" })
 public final class DatePatternConverter extends LogEventPatternConverter implements ArrayPatternConverter
{
 

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java
Sun May  5 03:08:39 2013
@@ -29,7 +29,7 @@ import org.apache.logging.log4j.core.imp
  * 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", type = "Converter")
+@Plugin(name = "ExtendedThrowablePatternConverter", category = "Converter")
 @ConverterKeys({"xEx", "xThrowable", "xException" })
 public final class ExtendedThrowablePatternConverter extends ThrowablePatternConverter {
 

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/FileDatePatternConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/FileDatePatternConverter.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/FileDatePatternConverter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/FileDatePatternConverter.java
Sun May  5 03:08:39 2013
@@ -23,7 +23,7 @@ import org.apache.logging.log4j.core.con
  * date pattern for a %d specifier in a file name is different than
  * the %d pattern in pattern layout.
  */
-@Plugin(name = "FileDatePatternConverter", type = "FileConverter")
+@Plugin(name = "FileDatePatternConverter", category = "FileConverter")
 @ConverterKeys({"d", "date" })
 public final class FileDatePatternConverter {
     /**

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/FileLocationPatternConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/FileLocationPatternConverter.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/FileLocationPatternConverter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/FileLocationPatternConverter.java
Sun May  5 03:08:39 2013
@@ -23,7 +23,7 @@ import org.apache.logging.log4j.core.con
 /**
  * Returns the event's line location information in a StringBuffer.
  */
-@Plugin(name = "FileLocationPatternConverter", type = "Converter")
+@Plugin(name = "FileLocationPatternConverter", category = "Converter")
 @ConverterKeys({"F", "file" })
 public final class FileLocationPatternConverter extends LogEventPatternConverter {
     /**

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/FullLocationPatternConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/FullLocationPatternConverter.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/FullLocationPatternConverter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/FullLocationPatternConverter.java
Sun May  5 03:08:39 2013
@@ -23,7 +23,7 @@ import org.apache.logging.log4j.core.con
 /**
  * Format the event's line location information.
  */
-@Plugin(name = "FullLocationPatternConverter", type = "Converter")
+@Plugin(name = "FullLocationPatternConverter", category = "Converter")
 @ConverterKeys({"l", "location" })
 public final class FullLocationPatternConverter extends LogEventPatternConverter {
     /**

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java
Sun May  5 03:08:39 2013
@@ -68,7 +68,7 @@ import org.apache.logging.log4j.core.lay
  * normalized to upper-case internally.
  * </p>
  */
-@Plugin(name = "highlight", type = "Converter")
+@Plugin(name = "highlight", category = "Converter")
 @ConverterKeys({ "highlight" })
 public final class HighlightConverter extends LogEventPatternConverter {
 

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/IntegerPatternConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/IntegerPatternConverter.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/IntegerPatternConverter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/IntegerPatternConverter.java
Sun May  5 03:08:39 2013
@@ -24,7 +24,7 @@ import java.util.Date;
 /**
  * Formats an integer.
  */
-@Plugin(name = "IntegerPatternConverter", type = "FileConverter")
+@Plugin(name = "IntegerPatternConverter", category = "FileConverter")
 @ConverterKeys({"i", "index" })
 public final class IntegerPatternConverter extends AbstractPatternConverter implements ArrayPatternConverter
{
     /**

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LevelPatternConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LevelPatternConverter.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LevelPatternConverter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LevelPatternConverter.java
Sun May  5 03:08:39 2013
@@ -25,7 +25,7 @@ import java.util.EnumMap;
 /**
  * Returns the event's level in a StringBuffer.
  */
-@Plugin(name = "LevelPatternConverter", type = "Converter")
+@Plugin(name = "LevelPatternConverter", category = "Converter")
 @ConverterKeys({"p", "level" })
 public final class LevelPatternConverter extends LogEventPatternConverter {
     /**

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LineLocationPatternConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LineLocationPatternConverter.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LineLocationPatternConverter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LineLocationPatternConverter.java
Sun May  5 03:08:39 2013
@@ -22,7 +22,7 @@ import org.apache.logging.log4j.core.con
 /**
  * Returns the event's line location information in a StringBuffer.
  */
-@Plugin(name = "LineLocationPatternConverter", type = "Converter")
+@Plugin(name = "LineLocationPatternConverter", category = "Converter")
 @ConverterKeys({"L", "line" })
 public final class LineLocationPatternConverter extends LogEventPatternConverter {
     /**

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LineSeparatorPatternConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LineSeparatorPatternConverter.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LineSeparatorPatternConverter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LineSeparatorPatternConverter.java
Sun May  5 03:08:39 2013
@@ -23,7 +23,7 @@ import org.apache.logging.log4j.core.hel
 /**
  * Formats a line separator.
  */
-@Plugin(name = "LineSeparatorPatternConverter", type = "Converter")
+@Plugin(name = "LineSeparatorPatternConverter", category = "Converter")
 @ConverterKeys({"n" })
 public final class LineSeparatorPatternConverter extends LogEventPatternConverter {
 

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LoggerPatternConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LoggerPatternConverter.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LoggerPatternConverter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LoggerPatternConverter.java
Sun May  5 03:08:39 2013
@@ -23,7 +23,7 @@ import org.apache.logging.log4j.core.con
 /**
  * Formats a logger name.
  */
-@Plugin(name = "LoggerPatternConverter", type = "Converter")
+@Plugin(name = "LoggerPatternConverter", category = "Converter")
 @ConverterKeys({"c", "logger" })
 public final class LoggerPatternConverter extends NamePatternConverter {
     /**

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MDCPatternConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MDCPatternConverter.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MDCPatternConverter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MDCPatternConverter.java
Sun May  5 03:08:39 2013
@@ -30,7 +30,7 @@ import java.util.TreeSet;
  * within the property bundle
  * when this pattern converter has the option set.
  */
- @Plugin(name = "MDCPatternConverter", type = "Converter")
+ @Plugin(name = "MDCPatternConverter", category = "Converter")
 @ConverterKeys({"X", "mdc", "MDC" })
 public final class MDCPatternConverter extends LogEventPatternConverter {
     /**

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MapPatternConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MapPatternConverter.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MapPatternConverter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MapPatternConverter.java
Sun May  5 03:08:39 2013
@@ -30,7 +30,7 @@ import java.util.TreeSet;
  * java.util.Hashtable.toString(), or to output the value of a specific key
  * within the Map.
  */
-@Plugin(name = "MapPatternConverter", type = "Converter")
+@Plugin(name = "MapPatternConverter", category = "Converter")
 @ConverterKeys({"K", "map", "MAP" })
 public final class MapPatternConverter extends LogEventPatternConverter {
     /**

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MarkerPatternConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MarkerPatternConverter.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MarkerPatternConverter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MarkerPatternConverter.java
Sun May  5 03:08:39 2013
@@ -23,7 +23,7 @@ import org.apache.logging.log4j.core.con
 /**
  * Returns the event's rendered message in a StringBuffer.
  */
-@Plugin(name = "MarkerPatternConverter", type = "Converter")
+@Plugin(name = "MarkerPatternConverter", category = "Converter")
 @ConverterKeys({"marker" })
 public final class MarkerPatternConverter extends LogEventPatternConverter {
 

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java
Sun May  5 03:08:39 2013
@@ -25,7 +25,7 @@ import org.apache.logging.log4j.message.
 /**
  * Returns the event's rendered message in a StringBuffer.
  */
-@Plugin(name = "MessagePatternConverter", type = "Converter")
+@Plugin(name = "MessagePatternConverter", category = "Converter")
 @ConverterKeys({"m", "msg", "message" })
 public final class MessagePatternConverter extends LogEventPatternConverter {
 

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MethodLocationPatternConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MethodLocationPatternConverter.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MethodLocationPatternConverter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MethodLocationPatternConverter.java
Sun May  5 03:08:39 2013
@@ -23,7 +23,7 @@ import org.apache.logging.log4j.core.con
 /**
  * Returns the event's line location information in a StringBuffer.
  */
-@Plugin(name = "MethodLocationPatternConverter", type = "Converter")
+@Plugin(name = "MethodLocationPatternConverter", category = "Converter")
 @ConverterKeys({"M", "method" })
 public final class MethodLocationPatternConverter extends LogEventPatternConverter {
     /**

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/NDCPatternConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/NDCPatternConverter.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/NDCPatternConverter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/NDCPatternConverter.java
Sun May  5 03:08:39 2013
@@ -23,7 +23,7 @@ import org.apache.logging.log4j.core.con
 /**
  * Returns the event's NDC in a StringBuffer.
  */
-@Plugin(name = "NDCPatternConverter", type = "Converter")
+@Plugin(name = "NDCPatternConverter", category = "Converter")
 @ConverterKeys({"x", "NDC" })
 public final class NDCPatternConverter extends LogEventPatternConverter {
   /**

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacement.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacement.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacement.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacement.java
Sun May  5 03:08:39 2013
@@ -27,7 +27,7 @@ import java.util.regex.Pattern;
 /**
  * Replace tokens in the LogEvent message.
  */
-@Plugin(name = "replace", type = "Core", printObject = true)
+@Plugin(name = "replace", category = "Core", printObject = true)
 public final class RegexReplacement {
 
     private static final Logger LOGGER = StatusLogger.getLogger();

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacementConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacementConverter.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacementConverter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacementConverter.java
Sun May  5 03:08:39 2013
@@ -27,7 +27,7 @@ import java.util.regex.Pattern;
 /**
  * Replacement pattern converter.
  */
-@Plugin(name = "replace", type = "Converter")
+@Plugin(name = "replace", category = "Converter")
 @ConverterKeys({"replace" })
 public final class RegexReplacementConverter extends LogEventPatternConverter {
 

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RelativeTimePatternConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RelativeTimePatternConverter.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RelativeTimePatternConverter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RelativeTimePatternConverter.java
Sun May  5 03:08:39 2013
@@ -24,7 +24,7 @@ import java.lang.management.ManagementFa
 /**
  * Returns the relative time in milliseconds since JVM Startup.
  */
-@Plugin(name = "RelativeTimePatternConverter", type = "Converter")
+@Plugin(name = "RelativeTimePatternConverter", category = "Converter")
 @ConverterKeys({"r", "relative" })
 public class RelativeTimePatternConverter extends LogEventPatternConverter {
     /**

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java
Sun May  5 03:08:39 2013
@@ -29,7 +29,7 @@ import org.apache.logging.log4j.core.imp
  * 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", type = "Converter")
+@Plugin(name = "RootThrowablePatternConverter", category = "Converter")
 @ConverterKeys({"rEx", "rThrowable", "rException" })
 public final class RootThrowablePatternConverter extends ThrowablePatternConverter {
 

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/SequenceNumberPatternConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/SequenceNumberPatternConverter.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/SequenceNumberPatternConverter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/SequenceNumberPatternConverter.java
Sun May  5 03:08:39 2013
@@ -25,7 +25,7 @@ import java.util.concurrent.atomic.Atomi
 /**
  * Formats the event sequence number.
  */
-@Plugin(name = "SequenceNumberPatternConverter", type = "Converter")
+@Plugin(name = "SequenceNumberPatternConverter", category = "Converter")
 @ConverterKeys({"sn", "sequenceNumber" })
 public final class SequenceNumberPatternConverter extends LogEventPatternConverter {
 

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/StyleConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/StyleConverter.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/StyleConverter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/StyleConverter.java
Sun May  5 03:08:39 2013
@@ -26,7 +26,7 @@ import java.util.List;
 /**
  * Style pattern converter. Adds ANSI color styling to the result of the enclosed pattern.
  */
-@Plugin(name = "style", type = "Converter")
+@Plugin(name = "style", category = "Converter")
 @ConverterKeys({"style" })
 public final class StyleConverter extends LogEventPatternConverter {
 

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/ThreadPatternConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/ThreadPatternConverter.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/ThreadPatternConverter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/ThreadPatternConverter.java
Sun May  5 03:08:39 2013
@@ -22,7 +22,7 @@ import org.apache.logging.log4j.core.con
 /**
  * Formats the event thread name.
  */
-@Plugin(name = "ThreadPatternConverter", type = "Converter")
+@Plugin(name = "ThreadPatternConverter", category = "Converter")
 @ConverterKeys({"t", "thread" })
 public final class ThreadPatternConverter extends LogEventPatternConverter {
     /**

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java
Sun May  5 03:08:39 2013
@@ -30,7 +30,7 @@ import java.io.StringWriter;
  * 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", type = "Converter")
+@Plugin(name = "ThrowablePatternConverter", category = "Converter")
 @ConverterKeys({"ex", "throwable", "exception" })
 public class ThrowablePatternConverter extends LogEventPatternConverter {
 

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/UUIDPatternConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/UUIDPatternConverter.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/UUIDPatternConverter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/UUIDPatternConverter.java
Sun May  5 03:08:39 2013
@@ -25,7 +25,7 @@ import java.util.UUID;
 /**
  * Formats the event sequence number.
  */
-@Plugin(name = "UUIDPatternConverter", type = "Converter")
+@Plugin(name = "UUIDPatternConverter", category = "Converter")
 @ConverterKeys({"u", "uuid" })
 public final class UUIDPatternConverter extends LogEventPatternConverter {
 

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/TestRewritePolicy.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/TestRewritePolicy.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/TestRewritePolicy.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/TestRewritePolicy.java
Sun May  5 03:08:39 2013
@@ -24,7 +24,7 @@ import org.apache.logging.log4j.core.imp
 /**
  *
  */
-@Plugin(name = "TestRewritePolicy", type = "Core", elementType = "rewritePolicy", printObject
= true)
+@Plugin(name = "TestRewritePolicy", category = "Core", elementType = "rewritePolicy", printObject
= true)
 public class TestRewritePolicy implements RewritePolicy {
 
     @Override

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/config/InMemoryAdvertiser.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/config/InMemoryAdvertiser.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/config/InMemoryAdvertiser.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/config/InMemoryAdvertiser.java
Sun May  5 03:08:39 2013
@@ -22,17 +22,17 @@ import org.apache.logging.log4j.core.net
 import java.util.HashMap;
 import java.util.Map;
 
-@Plugin(name = "memory", type = "Core", elementType = "advertiser", printObject = false)
+@Plugin(name = "memory", category = "Core", elementType = "advertiser", printObject = false)
 public class InMemoryAdvertiser implements Advertiser {
     private static Map<Object, Map<String, String>> properties = new HashMap<Object,
Map<String, String>>();
-    
+
     public static Map<Object, Map<String, String>> getAdvertisedEntries()
     {
         Map<Object, Map<String, String>> result = new HashMap<Object, Map<String,
String>>();
         result.putAll(properties);
         return result;
     }
-    
+
     public Object advertise(Map<String, String> newEntry) {
         Object object = new Object();
         properties.put(object, new HashMap<String, String>(newEntry));

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java
Sun May  5 03:08:39 2013
@@ -28,7 +28,7 @@ import java.io.Serializable;
 /**
  *
  */
-@Plugin(name="AlwaysFail",type="Core",elementType="appender",printObject=true)
+@Plugin(name="AlwaysFail", category ="Core",elementType="appender",printObject=true)
 public class AlwaysFailAppender<T extends Serializable> extends AbstractAppender<T>
{
 
     private AlwaysFailAppender(final String name) {

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/FailOnceAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/FailOnceAppender.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/FailOnceAppender.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/FailOnceAppender.java
Sun May  5 03:08:39 2013
@@ -30,7 +30,7 @@ import java.util.List;
 /**
  *
  */
-@Plugin(name="FailOnce",type="Core",elementType="appender",printObject=true)
+@Plugin(name="FailOnce", category ="Core",elementType="appender",printObject=true)
 public class FailOnceAppender<T extends Serializable> extends AbstractAppender<T>
{
 
     boolean fail = true;

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java
Sun May  5 03:08:39 2013
@@ -35,7 +35,7 @@ import java.util.List;
  * This appender is primarily used for testing. Use in a real environment is discouraged
as the
  * List could eventually grow to cause an OutOfMemoryError.
  */
-@Plugin(name = "List", type = "Core", elementType = "appender", printObject = true)
+@Plugin(name = "List", category = "Core", elementType = "appender", printObject = true)
 public class ListAppender<T extends Serializable> extends AbstractAppender<T>
{
 
     private final List<LogEvent> events = new ArrayList<LogEvent>();

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/layout/BasicLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/layout/BasicLayout.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/layout/BasicLayout.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/layout/BasicLayout.java
Sun May  5 03:08:39 2013
@@ -30,7 +30,7 @@ import java.util.Map;
 /**
  *
  */
-@Plugin(name = "BasicLayout", type = "Core", elementType = "layout", printObject = true)
+@Plugin(name = "BasicLayout", category = "Core", elementType = "layout", printObject = true)
 public class BasicLayout extends AbstractStringLayout {
 
     private static final String HEADER = "Header" + Constants.LINE_SEP;

Modified: logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/Agent.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/Agent.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/Agent.java
(original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/Agent.java
Sun May  5 03:08:39 2013
@@ -25,7 +25,7 @@ import org.apache.logging.log4j.status.S
 /**
  * Agent Specification for FlumeAvroAppender.
  */
-@Plugin(name = "Agent", type = "Core", printObject = true)
+@Plugin(name = "Agent", category = "Core", printObject = true)
 public final class Agent {
 
     private static final String DEFAULT_HOST = "localhost";

Modified: logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
(original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
Sun May  5 03:08:39 2013
@@ -33,7 +33,7 @@ import java.util.Locale;
 /**
  * An Appender that uses the Avro protocol to route events to Flume.
  */
-@Plugin(name = "Flume", type = "Core", elementType = "appender", printObject = true)
+@Plugin(name = "Flume", category = "Core", elementType = "appender", printObject = true)
 public final class FlumeAppender<T extends Serializable> extends AbstractAppender<T>
implements FlumeEventFactory {
 
     private final AbstractFlumeManager manager;

Modified: logging/log4j/log4j2/trunk/flume-ng/src/test/java/org/apache/logging/log4j/flume/test/FlumeKeyProvider.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/test/java/org/apache/logging/log4j/flume/test/FlumeKeyProvider.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/test/java/org/apache/logging/log4j/flume/test/FlumeKeyProvider.java
(original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/test/java/org/apache/logging/log4j/flume/test/FlumeKeyProvider.java
Sun May  5 03:08:39 2013
@@ -25,7 +25,7 @@ import javax.crypto.spec.SecretKeySpec;
 /**
  *
  */
-@Plugin(name = "FlumeKeyProvider", type = "KeyProvider", elementType = "SecretKeyProvider",
printObject = true)
+@Plugin(name = "FlumeKeyProvider", category = "KeyProvider", elementType = "SecretKeyProvider",
printObject = true)
 public class FlumeKeyProvider implements SecretKeyProvider {
 
     private static final byte[] key = new byte[] {-7, -21, -118, -25, -79, 73, 72, -64, 0,
127, -93, -13, -38,

Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/extending.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/extending.xml?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/extending.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/extending.xml Sun May  5 03:08:39 2013
@@ -97,7 +97,7 @@
               passed the Node tree and instantiate the configuration objects from that.
             </p>
             <pre class="prettyprint linenums">
-@Plugin(name = "XMLConfigurationFactory", type = "ConfigurationFactory")
+@Plugin(name = "XMLConfigurationFactory", category = "ConfigurationFactory")
 @Order(5)
 public class XMLConfigurationFactory extends ConfigurationFactory {
 
@@ -137,7 +137,7 @@ public class XMLConfigurationFactory ext
               The following example shows how the root LoggerConfig simply extends a generic
LoggerConfig.
             </p>
             <pre class="prettyprint linenums"><![CDATA[
-@Plugin(name = "root", type = "Core", printObject = true)
+@Plugin(name = "root", category = "Core", printObject = true)
 public static class RootLogger extends LoggerConfig {
 
     @PluginFactory
@@ -173,7 +173,7 @@ public static class RootLogger extends L
               The example below shows a Lookup that will return the value of a System Property.
             </p>
             <pre class="prettyprint linenums">
-@Plugin(name = "sys", type = "Lookup")
+@Plugin(name = "sys", category = "Lookup")
 public class SystemPropertiesLookup implements StrLookup {
 
     /**
@@ -211,7 +211,7 @@ public class SystemPropertiesLookup impl
               typical pattern where all the filter methods resolve to a single filter method.
             </p>
             <pre class="prettyprint linenums">
-@Plugin(name = "ThresholdFilter", type = "Core", elementType = "filter", printObject = true)
+@Plugin(name = "ThresholdFilter", category = "Core", elementType = "filter", printObject
= true)
 public final class ThresholdFilter extends AbstractFilter {
 
     private final Level level;
@@ -287,7 +287,7 @@ public final class ThresholdFilter exten
               requiring that logging pause while the reconfiguration takes place.
             </p>
             <pre class="prettyprint linenums">
-@Plugin(name = "Stub", type = "Core", elementType = "appender", printObject = true)
+@Plugin(name = "Stub", category = "Core", elementType = "appender", printObject = true)
 public final class StubAppender extends OutputStreamAppender {
 
     private StubAppender(String name, Layout layout, Filter filter, StubManager manager,
@@ -334,7 +334,7 @@ public final class StubAppender extends 
               methods parameters annotated with PluginAttr or PluginElement as appropriate.
             </p>
             <pre class="prettyprint linenums">
-@Plugin(name = "SampleLayout", type = "Core", elementType = "layout", printObject = true)
+@Plugin(name = "SampleLayout", category = "Core", elementType = "layout", printObject = true)
 public class SampleLayout extends AbstractStringLayout {
 
     protected SampleLayout(boolean locationInfo, boolean properties, boolean complete,
@@ -386,7 +386,7 @@ public class SampleLayout extends Abstra
               The following shows the skeleton of a Converter plugin.
             </p>
             <pre class="prettyprint linenums">
-@Plugin(name = "query", type = "Converter")
+@Plugin(name = "query", category = "Converter")
 @ConverterKeys({"q", "query"})
 public final class QueryConverter extends LogEventPatternConverter {
 

Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/plugins.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/plugins.xml?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/plugins.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/plugins.xml Sun May  5 03:08:39 2013
@@ -37,7 +37,7 @@
             initialization the Configuration will invoke the PluginManager to locate all
the Log4j plugins
             that are located in the declared <a href="./configuration.html#ConfigurationSyntax">packages</a>.
             As the configuration is processed the appropriate plugins will be automatically
configured and
-            initialized.  Log4j 2 utilizes a few different types of plugins which are described
in the follownig
+            initialized.  Log4j 2 utilizes a few different categories of plugins which are
described in the following
             sections.
           </p>
         </subsection>



Mime
View raw message