logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgo...@apache.org
Subject svn commit: r1479232 [1/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
Author: rgoers
Date: Sun May  5 03:08:39 2013
New Revision: 1479232

URL: http://svn.apache.org/r1479232
Log:
LOG4J2-201 - Rename Plugin attribute 'type' to 'category'

Modified:
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoversPlugin.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FastFileAppender.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FastRollingFileAppender.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSQueueAppender.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSTopicAppender.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/SizeBasedTriggeringPolicy.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/Route.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/Routes.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderRef.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/DefaultAdvertiser.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/JSONConfigurationFactory.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Property.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/XMLConfigurationFactory.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/AppendersPlugin.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/LoggersPlugin.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/Plugin.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginManager.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PropertiesPlugin.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/StructuredDataFilter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/KeyValuePair.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/SerializedLayout.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/ContextMapLookup.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/DateLookup.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/EnvironmentLookup.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/MapLookup.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/StructuredDataLookup.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/SystemPropertiesLookup.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/MulticastDNSAdvertiser.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/AbstractStyleNameConverter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/ClassNamePatternConverter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/FileDatePatternConverter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/FileLocationPatternConverter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/FullLocationPatternConverter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/IntegerPatternConverter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LevelPatternConverter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LineLocationPatternConverter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LineSeparatorPatternConverter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LoggerPatternConverter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MDCPatternConverter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MapPatternConverter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MarkerPatternConverter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MethodLocationPatternConverter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/NDCPatternConverter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacement.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacementConverter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RelativeTimePatternConverter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/SequenceNumberPatternConverter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/StyleConverter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/ThreadPatternConverter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/UUIDPatternConverter.java
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/TestRewritePolicy.java
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/config/InMemoryAdvertiser.java
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/FailOnceAppender.java
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/layout/BasicLayout.java
    logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/Agent.java
    logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
    logging/log4j/log4j2/trunk/flume-ng/src/test/java/org/apache/logging/log4j/flume/test/FlumeKeyProvider.java
    logging/log4j/log4j2/trunk/src/site/xdoc/manual/extending.xml
    logging/log4j/log4j2/trunk/src/site/xdoc/manual/plugins.xml

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java Sun May  5 03:08:39 2013
@@ -46,7 +46,7 @@ import java.util.concurrent.BlockingQueu
  *
  * @param <T> The {@link Layout}'s {@link Serializable} type.
  */
-@Plugin(name = "Async", type = "Core", elementType = "appender", printObject = true)
+@Plugin(name = "Async", category = "Core", elementType = "appender", printObject = true)
 public final class AsyncAppender<T extends Serializable> extends AbstractAppender<T> {
 
     private static final int DEFAULT_QUEUE_SIZE = 128;

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java Sun May  5 03:08:39 2013
@@ -42,7 +42,7 @@ import java.lang.reflect.Constructor;
  * and then call getBytes which may use a configured encoding or the system
  * default. OTOH, a Writer cannot print byte streams.
  */
-@Plugin(name = "Console", type = "Core", elementType = "appender", printObject = true)
+@Plugin(name = "Console", category = "Core", elementType = "appender", printObject = true)
 public final class ConsoleAppender<T extends Serializable> extends AbstractOutputStreamAppender<T> {
 
     private static ConsoleManagerFactory factory = new ConsoleManagerFactory();

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java Sun May  5 03:08:39 2013
@@ -39,7 +39,7 @@ import java.util.Map;
  * to a different appender. Hopefully it is obvious that the Appenders must be configured
  * to not suppress exceptions for the FailoverAppender to work.
  */
-@Plugin(name = "Failover", type = "Core", elementType = "appender", printObject = true)
+@Plugin(name = "Failover", category = "Core", elementType = "appender", printObject = true)
 public final class FailoverAppender<T extends Serializable> extends AbstractAppender<T> {
 
     private static final int DEFAULT_INTERVAL = 60 * Constants.MILLIS_IN_SECONDS;

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoversPlugin.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoversPlugin.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoversPlugin.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoversPlugin.java Sun May  5 03:08:39 2013
@@ -26,7 +26,7 @@ import org.apache.logging.log4j.status.S
 /**
  * The array of failover Appenders.
  */
-@Plugin(name = "failovers", type = "Core")
+@Plugin(name = "failovers", category = "Core")
 public final class FailoversPlugin {
 
     private static final Logger LOGGER = StatusLogger.getLogger();

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FastFileAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FastFileAppender.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FastFileAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FastFileAppender.java Sun May  5 03:08:39 2013
@@ -35,7 +35,7 @@ import java.util.Map;
 /**
  * File Appender.
  */
-@Plugin(name = "FastFile", type = "Core", elementType = "appender", printObject = true)
+@Plugin(name = "FastFile", category = "Core", elementType = "appender", printObject = true)
 public final class FastFileAppender<T extends Serializable> extends AbstractOutputStreamAppender<T> {
 
     private final String fileName;
@@ -68,7 +68,7 @@ public final class FastFileAppender<T ex
 
     /**
      * Write the log entry rolling over the file when required.
-     * 
+     *
      * @param event The LogEvent.
      */
     @Override
@@ -86,7 +86,7 @@ public final class FastFileAppender<T ex
 
     /**
      * Returns the file name this appender is associated with.
-     * 
+     *
      * @return The File name.
      */
     public String getFileName() {
@@ -97,7 +97,7 @@ public final class FastFileAppender<T ex
     // locking is not supported and buffering cannot be switched off
     /**
      * Create a File Appender.
-     * 
+     *
      * @param fileName The name and path of the file.
      * @param append "True" if the file should be appended to, "false" if it
      *            should be overwritten. The default is "true".

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FastRollingFileAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FastRollingFileAppender.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FastRollingFileAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FastRollingFileAppender.java Sun May  5 03:08:39 2013
@@ -41,7 +41,7 @@ import java.util.Map;
  * An appender that writes to random access files and can roll over at
  * intervals.
  */
-@Plugin(name = "FastRollingFile", type = "Core", elementType = "appender", printObject = true)
+@Plugin(name = "FastRollingFile", category = "Core", elementType = "appender", printObject = true)
 public final class FastRollingFileAppender<T extends Serializable> extends AbstractOutputStreamAppender<T> {
 
     private final String fileName;
@@ -76,7 +76,7 @@ public final class FastRollingFileAppend
 
     /**
      * Write the log entry rolling over the file when required.
-     * 
+     *
      * @param event The LogEvent.
      */
     @Override
@@ -96,7 +96,7 @@ public final class FastRollingFileAppend
 
     /**
      * Returns the File name for the Appender.
-     * 
+     *
      * @return The file name.
      */
     public String getFileName() {
@@ -105,7 +105,7 @@ public final class FastRollingFileAppend
 
     /**
      * Returns the file pattern used when rolling over.
-     * 
+     *
      * @return The file pattern.
      */
     public String getFilePattern() {
@@ -114,7 +114,7 @@ public final class FastRollingFileAppend
 
     /**
      * Create a FastRollingFileAppender.
-     * 
+     *
      * @param fileName The name of the file that is actively written to.
      *            (required).
      * @param filePattern The pattern of the file name to use on rollover.

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java Sun May  5 03:08:39 2013
@@ -34,7 +34,7 @@ import java.util.Map;
 /**
  * File Appender.
  */
-@Plugin(name = "File", type = "Core", elementType = "appender", printObject = true)
+@Plugin(name = "File", category = "Core", elementType = "appender", printObject = true)
 public final class FileAppender<T extends Serializable> extends AbstractOutputStreamAppender<T> {
 
     private final String fileName;
@@ -90,7 +90,7 @@ public final class FileAppender<T extend
      * @param filter The filter, if any, to use.
      * @param advertise "true" if the appender configuration should be advertised, "false" otherwise.
      * @param advertiseURI The advertised URI which can be used to retrieve the file contents.
-     * @param config The Configuration               
+     * @param config The Configuration
      * @return The FileAppender.
      */
     @PluginFactory

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSQueueAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSQueueAppender.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSQueueAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSQueueAppender.java Sun May  5 03:08:39 2013
@@ -31,7 +31,7 @@ import java.io.Serializable;
 /**
  * Appender to write to a JMS Queue.
  */
-@Plugin(name = "JMSQueue", type = "Core", elementType = "appender", printObject = true)
+@Plugin(name = "JMSQueue", category = "Core", elementType = "appender", printObject = true)
 public final class JMSQueueAppender<T extends Serializable> extends AbstractAppender<T> {
 
     private final JMSQueueManager manager;

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSTopicAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSTopicAppender.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSTopicAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSTopicAppender.java Sun May  5 03:08:39 2013
@@ -31,7 +31,7 @@ import java.io.Serializable;
 /**
  * Appender to write to a JMS Topic.
  */
-@Plugin(name = "JMSTopic", type = "Core", elementType = "appender", printObject = true)
+@Plugin(name = "JMSTopic", category = "Core", elementType = "appender", printObject = true)
 public final class JMSTopicAppender<T extends Serializable> extends AbstractAppender<T> {
 
     private final JMSTopicManager manager;

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java Sun May  5 03:08:39 2013
@@ -39,7 +39,7 @@ import java.util.Map;
 /**
  * An appender that writes to files and can roll over at intervals.
  */
-@Plugin(name = "RollingFile", type = "Core", elementType = "appender", printObject = true)
+@Plugin(name = "RollingFile", category = "Core", elementType = "appender", printObject = true)
 public final class RollingFileAppender<T extends Serializable> extends AbstractOutputStreamAppender<T> {
 
     private final String fileName;

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java Sun May  5 03:08:39 2013
@@ -48,7 +48,7 @@ import java.io.Serializable;
  * message is appended. This can be modified by setting a filter for the
  * appender.
  */
-@Plugin(name = "SMTP", type = "Core", elementType = "appender", printObject = true)
+@Plugin(name = "SMTP", category = "Core", elementType = "appender", printObject = true)
 public final class SMTPAppender<T extends Serializable> extends AbstractAppender<T> {
 
     private static final int DEFAULT_BUFFER_SIZE = 512;

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java Sun May  5 03:08:39 2013
@@ -39,7 +39,7 @@ import java.util.Map;
 /**
  * An Appender that delivers events over socket connections. Supports both TCP and UDP.
  */
-@Plugin(name = "Socket", type = "Core", elementType = "appender", printObject = true)
+@Plugin(name = "Socket", category = "Core", elementType = "appender", printObject = true)
 public class SocketAppender<T extends Serializable> extends AbstractOutputStreamAppender<T> {
     private Object advertisement;
     private final Advertiser advertiser;

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

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java Sun May  5 03:08:39 2013
@@ -34,7 +34,7 @@ import java.util.Map;
 /**
  * This policy modifies events by replacing or possibly adding keys and values to the MapMessage.
  */
-@Plugin(name = "MapRewritePolicy", type = "Core", elementType = "rewritePolicy", printObject = true)
+@Plugin(name = "MapRewritePolicy", category = "Core", elementType = "rewritePolicy", printObject = true)
 public final class MapRewritePolicy implements RewritePolicy {
     /**
      * Allow subclasses access to the status logger without creating another instance.

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java Sun May  5 03:08:39 2013
@@ -35,7 +35,7 @@ import java.util.Map;
 /**
  * This policy modifies events by replacing or possibly adding keys and values to the MapMessage.
  */
-@Plugin(name = "PropertiesRewritePolicy", type = "Core", elementType = "rewritePolicy", printObject = true)
+@Plugin(name = "PropertiesRewritePolicy", category = "Core", elementType = "rewritePolicy", printObject = true)
 public final class PropertiesRewritePolicy implements RewritePolicy {
     /**
      * Allow subclasses access to the status logger without creating another instance.

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java Sun May  5 03:08:39 2013
@@ -37,7 +37,7 @@ import java.util.concurrent.ConcurrentMa
 /**
  * This Appender allows the logging event to be manipulated before it is processed by other Appenders.
  */
-@Plugin(name = "Rewrite", type = "Core", elementType = "appender", printObject = true)
+@Plugin(name = "Rewrite", category = "Core", elementType = "appender", printObject = true)
 public final class RewriteAppender<T extends Serializable> extends AbstractAppender<T> {
     private final Configuration config;
     private final ConcurrentMap<String, AppenderControl> appenders = new ConcurrentHashMap<String, AppenderControl>();

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java Sun May  5 03:08:39 2013
@@ -24,7 +24,7 @@ import org.apache.logging.log4j.core.con
 /**
  * Triggering policy that wraps other policies.
  */
-@Plugin(name = "Policies", type = "Core", printObject = true)
+@Plugin(name = "Policies", category = "Core", printObject = true)
 public final class CompositeTriggeringPolicy implements TriggeringPolicy {
 
     private final TriggeringPolicy[] policies;

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java Sun May  5 03:08:39 2013
@@ -63,7 +63,7 @@ import java.util.List;
  * <p>Given that this rollover algorithm requires as many file renaming
  * operations as the window size, large window sizes are discouraged.
  */
-@Plugin(name = "DefaultRolloverStrategy", type = "Core", printObject = true)
+@Plugin(name = "DefaultRolloverStrategy", category = "Core", printObject = true)
 public class DefaultRolloverStrategy implements RolloverStrategy {
     /**
      * Allow subclasses access to the status logger without creating another instance.

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java Sun May  5 03:08:39 2013
@@ -28,7 +28,7 @@ import java.lang.management.ManagementFa
  * always return false.
  */
 
-@Plugin(name = "OnStartupTriggeringPolicy", type = "Core", printObject = true)
+@Plugin(name = "OnStartupTriggeringPolicy", category = "Core", printObject = true)
 public class OnStartupTriggeringPolicy implements TriggeringPolicy {
     private static final long JVM_START_TIME = ManagementFactory.getRuntimeMXBean().getStartTime();
 

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/SizeBasedTriggeringPolicy.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/SizeBasedTriggeringPolicy.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/SizeBasedTriggeringPolicy.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/SizeBasedTriggeringPolicy.java Sun May  5 03:08:39 2013
@@ -32,7 +32,7 @@ import java.util.regex.Pattern;
 /**
  *
  */
-@Plugin(name = "SizeBasedTriggeringPolicy", type = "Core", printObject = true)
+@Plugin(name = "SizeBasedTriggeringPolicy", category = "Core", printObject = true)
 public class SizeBasedTriggeringPolicy implements TriggeringPolicy {
     /**
      * Allow subclasses access to the status logger without creating another instance.

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java Sun May  5 03:08:39 2013
@@ -24,7 +24,7 @@ import org.apache.logging.log4j.core.con
 /**
  * Triggering Policy that causes a rollover based on time.
  */
-@Plugin(name = "TimeBasedTriggeringPolicy", type = "Core", printObject = true)
+@Plugin(name = "TimeBasedTriggeringPolicy", category = "Core", printObject = true)
 public final class TimeBasedTriggeringPolicy implements TriggeringPolicy {
 
     private long nextRollover;

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/Route.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/Route.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/Route.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/Route.java Sun May  5 03:08:39 2013
@@ -27,7 +27,7 @@ import org.apache.logging.log4j.status.S
 /**
  * A Route to an appender.
  */
-@Plugin(name = "Route", type = "Core", printObject = true, deferChildren = true)
+@Plugin(name = "Route", category = "Core", printObject = true, deferChildren = true)
 public final class Route {
     private static final Logger LOGGER = StatusLogger.getLogger();
 

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/Routes.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/Routes.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/Routes.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/Routes.java Sun May  5 03:08:39 2013
@@ -26,7 +26,7 @@ import org.apache.logging.log4j.status.S
 /**
  * Used to contain the individual Route elements.
  */
-@Plugin(name = "Routes", type = "Core", printObject = true)
+@Plugin(name = "Routes", category = "Core", printObject = true)
 public final class Routes {
 
     private static final Logger LOGGER = StatusLogger.getLogger();

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java Sun May  5 03:08:39 2013
@@ -43,7 +43,7 @@ import java.util.concurrent.ConcurrentMa
  * the form "$${[key:]token}". The pattern will be resolved each time the Appender is called using
  * the built in StrSubstitutor and the StrLookup plugin that matches the specified key.
  */
-@Plugin(name = "Routing", type = "Core", elementType = "appender", printObject = true)
+@Plugin(name = "Routing", category = "Core", elementType = "appender", printObject = true)
 public final class RoutingAppender<T extends Serializable> extends AbstractAppender<T> {
     private static final String DEFAULT_KEY = "ROUTING_APPENDER_DEFAULT";
     private final Routes routes;

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java Sun May  5 03:08:39 2013
@@ -63,7 +63,7 @@ import org.apache.logging.log4j.status.S
  * 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", type = "Core", printObject = true)
+@Plugin(name = "asyncLogger", category = "Core", printObject = true)
 public class AsyncLoggerConfig extends LoggerConfig {
 
     private static final Logger LOGGER = StatusLogger.getLogger();
@@ -193,7 +193,7 @@ public class AsyncLoggerConfig extends L
     /**
      * An asynchronous root Logger.
      */
-    @Plugin(name = "asyncRoot", type = "Core", printObject = true)
+    @Plugin(name = "asyncRoot", category = "Core", printObject = true)
     public static class RootLogger extends LoggerConfig {
 
         @PluginFactory

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderRef.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderRef.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderRef.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderRef.java Sun May  5 03:08:39 2013
@@ -28,7 +28,7 @@ import org.apache.logging.log4j.status.S
 /**
  * An Appender reference.
  */
-@Plugin(name = "appender-ref", type = "Core", printObject = true)
+@Plugin(name = "appender-ref", category = "Core", printObject = true)
 public final class AppenderRef {
     private static final Logger LOGGER = StatusLogger.getLogger();
 

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/DefaultAdvertiser.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/DefaultAdvertiser.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/DefaultAdvertiser.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/DefaultAdvertiser.java Sun May  5 03:08:39 2013
@@ -24,11 +24,11 @@ import java.util.Map;
 /**
  * The default advertiser does not do anything.
  */
-@Plugin(name = "default", type = "Core", elementType = "advertiser", printObject = false)
+@Plugin(name = "default", category = "Core", elementType = "advertiser", printObject = false)
 public class DefaultAdvertiser implements Advertiser {
     /**
      * Does nothing.
-     * 
+     *
      * @return null
      */
     public Object advertise(Map<String, String> properties) {

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/JSONConfigurationFactory.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/JSONConfigurationFactory.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/JSONConfigurationFactory.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/JSONConfigurationFactory.java Sun May  5 03:08:39 2013
@@ -22,7 +22,7 @@ import java.io.File;
 /**
  *
  */
-@Plugin(name = "JSONConfigurationFactory", type = "ConfigurationFactory")
+@Plugin(name = "JSONConfigurationFactory", category = "ConfigurationFactory")
 @Order(6)
 public class JSONConfigurationFactory extends ConfigurationFactory {
 

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java Sun May  5 03:08:39 2013
@@ -53,7 +53,7 @@ import java.util.concurrent.atomic.Atomi
 /**
  * Logger object that is created via configuration.
  */
-@Plugin(name = "logger", type = "Core", printObject = true)
+@Plugin(name = "logger", category = "Core", printObject = true)
 public class LoggerConfig extends AbstractFilterable implements LogEventFactory {
 
     private static final Logger LOGGER = StatusLogger.getLogger();
@@ -86,7 +86,7 @@ public class LoggerConfig extends Abstra
 
     /**
      * Constructor that sets the name, level and additive values.
-     * 
+     *
      * @param name The Logger name.
      * @param level The Level.
      * @param additive true if the Logger is additive, false otherwise.
@@ -132,7 +132,7 @@ public class LoggerConfig extends Abstra
 
     /**
      * Returns the name of the LoggerConfig.
-     * 
+     *
      * @return the name of the LoggerConfig.
      */
     public String getName() {
@@ -141,7 +141,7 @@ public class LoggerConfig extends Abstra
 
     /**
      * Sets the parent of this LoggerConfig.
-     * 
+     *
      * @param parent the parent LoggerConfig.
      */
     public void setParent(final LoggerConfig parent) {
@@ -150,7 +150,7 @@ public class LoggerConfig extends Abstra
 
     /**
      * Returns the parent of this LoggerConfig.
-     * 
+     *
      * @return the LoggerConfig that is the parent of this one.
      */
     public LoggerConfig getParent() {
@@ -159,7 +159,7 @@ public class LoggerConfig extends Abstra
 
     /**
      * Adds an Appender to the LoggerConfig.
-     * 
+     *
      * @param appender The Appender to add.
      * @param level The Level to use.
      * @param filter A Filter for the Appender reference.
@@ -172,7 +172,7 @@ public class LoggerConfig extends Abstra
 
     /**
      * Removes the Appender with the specific name.
-     * 
+     *
      * @param name The name of the Appender.
      */
     public void removeAppender(final String name) {
@@ -184,7 +184,7 @@ public class LoggerConfig extends Abstra
 
     /**
      * Returns all Appenders as a Map.
-     * 
+     *
      * @return a Map with the Appender name as the key and the Appender as the
      *         value.
      */
@@ -223,7 +223,7 @@ public class LoggerConfig extends Abstra
 
     /**
      * Returns the Appender references.
-     * 
+     *
      * @return a List of all the Appender names attached to this LoggerConfig.
      */
     public List<AppenderRef> getAppenderRefs() {
@@ -232,7 +232,7 @@ public class LoggerConfig extends Abstra
 
     /**
      * Sets the logging Level.
-     * 
+     *
      * @param level The logging Level.
      */
     public void setLevel(final Level level) {
@@ -241,7 +241,7 @@ public class LoggerConfig extends Abstra
 
     /**
      * Returns the logging Level.
-     * 
+     *
      * @return the logging Level.
      */
     public Level getLevel() {
@@ -250,7 +250,7 @@ public class LoggerConfig extends Abstra
 
     /**
      * Returns the LogEventFactory.
-     * 
+     *
      * @return the LogEventFactory.
      */
     public LogEventFactory getLogEventFactory() {
@@ -260,7 +260,7 @@ public class LoggerConfig extends Abstra
     /**
      * Sets the LogEventFactory. Usually the LogEventFactory will be this
      * LoggerConfig.
-     * 
+     *
      * @param logEventFactory the LogEventFactory.
      */
     public void setLogEventFactory(final LogEventFactory logEventFactory) {
@@ -269,7 +269,7 @@ public class LoggerConfig extends Abstra
 
     /**
      * Returns the valid of the additive flag.
-     * 
+     *
      * @return true if the LoggerConfig is additive, false otherwise.
      */
     public boolean isAdditive() {
@@ -278,7 +278,7 @@ public class LoggerConfig extends Abstra
 
     /**
      * Sets the additive setting.
-     * 
+     *
      * @param additive true if the LoggerConfig should be additive, false
      *            otherwise.
      */
@@ -290,7 +290,7 @@ public class LoggerConfig extends Abstra
      * Returns the value of logger configuration attribute {@code includeLocation},
      * or, if no such attribute was configured, {@code true} if logging is
      * synchronous or {@code false} if logging is asynchronous.
-     * 
+     *
      * @return whether location should be passed downstream
      */
     public boolean isIncludeLocation() {
@@ -304,7 +304,7 @@ public class LoggerConfig extends Abstra
      * <p>
      * For each {@code Property} key in the map, the value is {@code true} if
      * the property value has a variable that needs to be substituted.
-     * 
+     *
      * @return an unmodifiable map with the configuration properties, or
      *         {@code null}
      * @see Configuration#getSubst()
@@ -318,7 +318,7 @@ public class LoggerConfig extends Abstra
 
     /**
      * Logs an event.
-     * 
+     *
      * @param loggerName The name of the Logger.
      * @param marker A Marker or null if none is present.
      * @param fqcn The fully qualified class name of the caller.
@@ -369,7 +369,7 @@ public class LoggerConfig extends Abstra
 
     /**
      * Logs an event.
-     * 
+     *
      * @param event The log event.
      */
     public void log(final LogEvent event) {
@@ -407,7 +407,7 @@ public class LoggerConfig extends Abstra
 
     /**
      * Creates a log event.
-     * 
+     *
      * @param loggerName The name of the Logger.
      * @param marker An optional Marker.
      * @param fqcn The fully qualified class name of the caller.
@@ -431,7 +431,7 @@ public class LoggerConfig extends Abstra
 
     /**
      * Factory method to create a LoggerConfig.
-     * 
+     *
      * @param additivity True if additive, false otherwise.
      * @param levelName The Level to be associated with the Logger.
      * @param loggerName The name of the Logger.
@@ -474,7 +474,7 @@ public class LoggerConfig extends Abstra
         return new LoggerConfig(name, appenderRefs, filter, level, additive,
                 properties, config, includeLocation(includeLocation));
     }
-    
+
     // Note: for asynchronous loggers, includeLocation default is FALSE,
     // for synchronous loggers, includeLocation default is TRUE.
     private static boolean includeLocation(String includeLocationConfigValue) {
@@ -489,7 +489,7 @@ public class LoggerConfig extends Abstra
     /**
      * The root Logger.
      */
-    @Plugin(name = "root", type = "Core", printObject = true)
+    @Plugin(name = "root", category = "Core", printObject = true)
     public static class RootLogger extends LoggerConfig {
 
         @PluginFactory

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Property.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Property.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Property.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Property.java Sun May  5 03:08:39 2013
@@ -26,7 +26,7 @@ import org.apache.logging.log4j.status.S
 /**
  * Represents a key/value pair in the configuration.
  */
-@Plugin(name = "property", type = "Core", printObject = true)
+@Plugin(name = "property", category = "Core", printObject = true)
 public final class Property {
 
     private static final Logger LOGGER = StatusLogger.getLogger();

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/XMLConfigurationFactory.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/XMLConfigurationFactory.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/XMLConfigurationFactory.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/XMLConfigurationFactory.java Sun May  5 03:08:39 2013
@@ -21,7 +21,7 @@ import org.apache.logging.log4j.core.con
 /**
  * Factory to construct an XMLConfiguration.
  */
-@Plugin(name = "XMLConfigurationFactory", type = "ConfigurationFactory")
+@Plugin(name = "XMLConfigurationFactory", category = "ConfigurationFactory")
 @Order(5)
 public class XMLConfigurationFactory extends ConfigurationFactory {
 

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/AppendersPlugin.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/AppendersPlugin.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/AppendersPlugin.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/AppendersPlugin.java Sun May  5 03:08:39 2013
@@ -25,7 +25,7 @@ import org.apache.logging.log4j.core.App
 /**
  * An Appender container.
  */
-@Plugin(name = "appenders", type = "Core")
+@Plugin(name = "appenders", category = "Core")
 public final class AppendersPlugin {
 
     private AppendersPlugin() {

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/LoggersPlugin.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/LoggersPlugin.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/LoggersPlugin.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/LoggersPlugin.java Sun May  5 03:08:39 2013
@@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentMa
 /**
  * Container of Logger objects.
  */
-@Plugin(name = "loggers", type = "Core")
+@Plugin(name = "loggers", category = "Core")
 public final class LoggersPlugin {
 
     private LoggersPlugin() {

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/Plugin.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/Plugin.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/Plugin.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/Plugin.java Sun May  5 03:08:39 2013
@@ -33,7 +33,7 @@ public @interface Plugin {
     String EMPTY = "";
 
     String name();
-    String type();
+    String category();
     String elementType() default EMPTY;
     boolean printObject() default false;
     boolean deferChildren() default false;

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginManager.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginManager.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginManager.java Sun May  5 03:08:39 2013
@@ -174,7 +174,7 @@ public class PluginManager {
         }
         for (final Class<?> clazz : resolver.getClasses()) {
             final Plugin plugin = clazz.getAnnotation(Plugin.class);
-            final String pluginType = plugin.type();
+            final String pluginType = plugin.category();
             if (!pluginTypeMap.containsKey(pluginType)) {
                 pluginTypeMap.putIfAbsent(pluginType, new ConcurrentHashMap<String, PluginType>());
             }

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PropertiesPlugin.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PropertiesPlugin.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PropertiesPlugin.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PropertiesPlugin.java Sun May  5 03:08:39 2013
@@ -28,7 +28,7 @@ import java.util.Map;
 /**
  * Handles properties defined in the configuration.
  */
-@Plugin(name = "properties", type = "Core", printObject = true)
+@Plugin(name = "properties", category = "Core", printObject = true)
 public final class PropertiesPlugin {
 
     private PropertiesPlugin() {

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java Sun May  5 03:08:39 2013
@@ -52,7 +52,7 @@ import java.util.concurrent.TimeUnit;
  * </code><br>
  */
 
-@Plugin(name = "BurstFilter", type = "Core", elementType = "filter", printObject = true)
+@Plugin(name = "BurstFilter", category = "Core", elementType = "filter", printObject = true)
 public final class BurstFilter extends AbstractFilter {
 
     private static final long NANOS_IN_SECONDS =  1000000000;

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java Sun May  5 03:08:39 2013
@@ -36,7 +36,7 @@ import java.util.List;
 /**
  * Composes and invokes one or more filters.
  */
-@Plugin(name = "filters", type = "Core", printObject = true)
+@Plugin(name = "filters", category = "Core", printObject = true)
 public final class CompositeFilter implements Iterable<Filter>, Filter, LifeCycle {
 
     private final List<Filter> filters;

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java Sun May  5 03:08:39 2013
@@ -34,7 +34,7 @@ import java.util.Map;
 /**
  * Compare against a log level that is associated with an MDC value.
  */
-@Plugin(name = "DynamicThresholdFilter", type = "Core", elementType = "filter", printObject = true)
+@Plugin(name = "DynamicThresholdFilter", category = "Core", elementType = "filter", printObject = true)
 public final class DynamicThresholdFilter extends AbstractFilter {
     private Map<String, Level> levelMap = new HashMap<String, Level>();
     private Level defaultThreshold = Level.ERROR;

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java Sun May  5 03:08:39 2013
@@ -36,7 +36,7 @@ import java.util.Map;
 /**
  * A Filter that operates on a Map.
  */
-@Plugin(name = "MapFilter", type = "Core", elementType = "filter", printObject = true)
+@Plugin(name = "MapFilter", category = "Core", elementType = "filter", printObject = true)
 public class MapFilter extends AbstractFilter {
     private final Map<String, List<String>> map;
 

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java Sun May  5 03:08:39 2013
@@ -30,7 +30,7 @@ import org.apache.logging.log4j.message.
  * configured marker as a parent.
  *
  */
-@Plugin(name = "MarkerFilter", type = "Core", elementType = "filter", printObject = true)
+@Plugin(name = "MarkerFilter", category = "Core", elementType = "filter", printObject = true)
 public final class MarkerFilter extends AbstractFilter {
 
     private final String name;

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java Sun May  5 03:08:39 2013
@@ -36,7 +36,7 @@ import java.util.regex.Pattern;
  * (false). The default is false.
  *
  */
-@Plugin(name = "RegexFilter", type = "Core", elementType = "filter", printObject = true)
+@Plugin(name = "RegexFilter", category = "Core", elementType = "filter", printObject = true)
 public final class RegexFilter extends AbstractFilter {
 
     private final Pattern pattern;

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/StructuredDataFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/StructuredDataFilter.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/StructuredDataFilter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/StructuredDataFilter.java Sun May  5 03:08:39 2013
@@ -36,7 +36,7 @@ import java.util.Map;
 /**
  * Filter based on data in a StructuredDataMessage.
  */
-@Plugin(name = "StructuredDataFilter", type = "Core", elementType = "filter", printObject = true)
+@Plugin(name = "StructuredDataFilter", category = "Core", elementType = "filter", printObject = true)
 public final class StructuredDataFilter extends MapFilter {
 
     private StructuredDataFilter(final Map<String, List<String>> map, final boolean oper, final Result onMatch,

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilter.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilter.java Sun May  5 03:08:39 2013
@@ -37,7 +37,7 @@ import java.util.Map;
 /**
  * Filter based on a value in the Thread Context Map (MDC).
  */
-@Plugin(name = "ThreadContextMapFilter", type = "Core", elementType = "filter", printObject = true)
+@Plugin(name = "ThreadContextMapFilter", category = "Core", elementType = "filter", printObject = true)
 public class ThreadContextMapFilter extends MapFilter {
 
     private final String key;

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java Sun May  5 03:08:39 2013
@@ -33,7 +33,7 @@ import org.apache.logging.log4j.message.
  *
  * The default Level is ERROR.
  */
-@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;

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java Sun May  5 03:08:39 2013
@@ -29,7 +29,7 @@ import java.util.TimeZone;
 /**
  * Filters events that fall within a specified time period in each day.
  */
-@Plugin(name = "TimeFilter", type = "Core", elementType = "filter", printObject = true)
+@Plugin(name = "TimeFilter", category = "Core", elementType = "filter", printObject = true)
 public final class TimeFilter extends AbstractFilter {
     /**
      * Length of hour in milliseconds.

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/KeyValuePair.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/KeyValuePair.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/KeyValuePair.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/KeyValuePair.java Sun May  5 03:08:39 2013
@@ -23,7 +23,7 @@ import org.apache.logging.log4j.core.con
 /**
  * Key/Value pair configuration item.
  */
-@Plugin(name = "KeyValuePair", type = "Core", printObject = true)
+@Plugin(name = "KeyValuePair", category = "Core", printObject = true)
 public class KeyValuePair {
 
     private final String key;

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java Sun May  5 03:08:39 2013
@@ -43,7 +43,7 @@ import java.util.ArrayList;
  * 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", type = "Core", elementType = "layout", printObject = true)
+@Plugin(name = "HTMLLayout", category = "Core", elementType = "layout", printObject = true)
 public final class HTMLLayout extends AbstractStringLayout {
 
     private static final int BUF_SIZE = 256;
@@ -193,7 +193,7 @@ public final class HTMLLayout extends Ab
     }
 
     /**
-     * HTMLLayout's format is sufficiently specified via the content type.  The format could be defined via a DTD, 
+     * HTMLLayout's format is sufficiently specified via the content type.  The format could be defined via a DTD,
      * but isn't at this time - returning empty Map/unspecified.
      * @return empty Map
      */

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java Sun May  5 03:08:39 2013
@@ -48,7 +48,7 @@ import java.util.List;
  *
  * See the Log4j Manual for details on the supported pattern converters.
  */
-@Plugin(name = "PatternLayout", type = "Core", elementType = "layout", printObject = true)
+@Plugin(name = "PatternLayout", category = "Core", elementType = "layout", printObject = true)
 public final class PatternLayout extends AbstractStringLayout {
     /**
      * Default pattern string for log output. Currently set to the

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java Sun May  5 03:08:39 2013
@@ -51,7 +51,7 @@ import java.util.regex.Pattern;
 /**
  * Formats a log event in accordance with RFC 5424.
  */
-@Plugin(name = "RFC5424Layout", type = "Core", elementType = "layout", printObject = true)
+@Plugin(name = "RFC5424Layout", category = "Core", elementType = "layout", printObject = true)
 public final class RFC5424Layout extends AbstractStringLayout {
 
     /**
@@ -415,8 +415,8 @@ public final class RFC5424Layout extends
                 if (prefix != null) {
                     sb.append(prefix);
                 }
-                sb.append(escapeNewlines(escapeSDParams(entry.getKey()),escapeNewLine)).append("=\"")
-                  .append(escapeNewlines(escapeSDParams(entry.getValue()),escapeNewLine)).append("\"");
+                sb.append(escapeNewlines(escapeSDParams(entry.getKey()), escapeNewLine)).append("=\"")
+                  .append(escapeNewlines(escapeSDParams(entry.getValue()), escapeNewLine)).append("\"");
             }
         }
     }

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/SerializedLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/SerializedLayout.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/SerializedLayout.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/SerializedLayout.java Sun May  5 03:08:39 2013
@@ -30,7 +30,7 @@ import java.io.OutputStream;
 /**
  * Format a LogEvent in its serialized form.
  */
-@Plugin(name = "SerializedLayout", type = "Core", elementType = "layout", printObject = true)
+@Plugin(name = "SerializedLayout", category = "Core", elementType = "layout", printObject = true)
 public final class SerializedLayout extends AbstractLayout<LogEvent> {
 
     private static byte[] header;
@@ -101,7 +101,7 @@ public final class SerializedLayout exte
      * @return empty Map
      */
     public Map<String, String> getContentFormat() {
-        return new HashMap<String, String>();    
+        return new HashMap<String, String>();
     }
 
     /**

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java Sun May  5 03:08:39 2013
@@ -39,7 +39,7 @@ import java.util.regex.Pattern;
 /**
  * Formats a log event as a BSD Log record.
  */
-@Plugin(name = "SyslogLayout", type = "Core", elementType = "layout", printObject = true)
+@Plugin(name = "SyslogLayout", category = "Core", elementType = "layout", printObject = true)
 public class SyslogLayout extends AbstractStringLayout {
     /**
      * Match newlines in a platform-independent manner.

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java Sun May  5 03:08:39 2013
@@ -72,7 +72,7 @@ import org.apache.logging.log4j.message.
  * non ASCII characters could result in corrupted
  * log files.
  */
-@Plugin(name = "XMLLayout", type = "Core", elementType = "layout", printObject = true)
+@Plugin(name = "XMLLayout", category = "Core", elementType = "layout", printObject = true)
 public class XMLLayout extends AbstractStringLayout {
 
     private static final int DEFAULT_SIZE = 256;

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/ContextMapLookup.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/ContextMapLookup.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/ContextMapLookup.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/ContextMapLookup.java Sun May  5 03:08:39 2013
@@ -23,7 +23,7 @@ import org.apache.logging.log4j.core.con
 /**
  * Looks up keys from system properties.
  */
-@Plugin(name = "ctx", type = "Lookup")
+@Plugin(name = "ctx", category = "Lookup")
 public class ContextMapLookup implements StrLookup {
 
     /**

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/DateLookup.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/DateLookup.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/DateLookup.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/DateLookup.java Sun May  5 03:08:39 2013
@@ -28,7 +28,7 @@ import java.util.Date;
 /**
  * Formats the current date or the date in the LogEvent. The "key" is used as the format String.
  */
-@Plugin(name = "date", type = "Lookup")
+@Plugin(name = "date", category = "Lookup")
 public class DateLookup implements StrLookup {
 
     private static final Logger LOGGER = StatusLogger.getLogger();

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/EnvironmentLookup.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/EnvironmentLookup.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/EnvironmentLookup.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/EnvironmentLookup.java Sun May  5 03:08:39 2013
@@ -22,7 +22,7 @@ import org.apache.logging.log4j.core.con
 /**
  * Looks up keys from environment variables.
  */
-@Plugin(name = "env", type = "Lookup")
+@Plugin(name = "env", category = "Lookup")
 public class EnvironmentLookup implements StrLookup {
 
     /**

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/MapLookup.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/MapLookup.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/MapLookup.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/MapLookup.java Sun May  5 03:08:39 2013
@@ -25,7 +25,7 @@ import java.util.Map;
 /**
  * The basis for a lookup based on a Map.
  */
-@Plugin(name = "map", type = "Lookup")
+@Plugin(name = "map", category = "Lookup")
 public class MapLookup implements StrLookup {
     /**
      * Map keys are variable names and value.

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/StructuredDataLookup.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/StructuredDataLookup.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/StructuredDataLookup.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/StructuredDataLookup.java Sun May  5 03:08:39 2013
@@ -23,7 +23,7 @@ import org.apache.logging.log4j.message.
 /**
  * Looks up keys from system properties.
  */
-@Plugin(name = "sd", type = "Lookup")
+@Plugin(name = "sd", category = "Lookup")
 public class StructuredDataLookup implements StrLookup {
 
     /**

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/SystemPropertiesLookup.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/SystemPropertiesLookup.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/SystemPropertiesLookup.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/SystemPropertiesLookup.java Sun May  5 03:08:39 2013
@@ -22,7 +22,7 @@ import org.apache.logging.log4j.core.con
 /**
  * Looks up keys from system properties.
  */
-@Plugin(name = "sys", type = "Lookup")
+@Plugin(name = "sys", category = "Lookup")
 public class SystemPropertiesLookup implements StrLookup {
 
     /**

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/MulticastDNSAdvertiser.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/MulticastDNSAdvertiser.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/MulticastDNSAdvertiser.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/MulticastDNSAdvertiser.java Sun May  5 03:08:39 2013
@@ -29,7 +29,7 @@ import org.apache.logging.log4j.status.S
  * Advertise an entity via ZeroConf/MulticastDNS and the JmDNS library.
  *
  */
-@Plugin(name = "multicastdns", type = "Core", elementType = "advertiser", printObject = false)
+@Plugin(name = "multicastdns", category = "Core", elementType = "advertiser", printObject = false)
 public class MulticastDNSAdvertiser implements Advertiser {
     protected static final Logger LOGGER = StatusLogger.getLogger();
     private static Object jmDNS = initializeJMDNS();
@@ -39,15 +39,15 @@ public class MulticastDNSAdvertiser impl
 
     public MulticastDNSAdvertiser()
     {
-        //no arg constructor for reflection 
+        //no arg constructor for reflection
     }
 
     /**
      * Advertise the provided entity.
-     * 
-     * Properties map provided in advertise method must include a "name" entry 
+     *
+     * Properties map provided in advertise method must include a "name" entry
      * but may also provide "protocol" (tcp/udp) as well as a "port" entry
-     * 
+     *
      * @param properties the properties representing the entity to advertise
      * @return the object which can be used to unadvertise, or null if advertisement was unsuccessful
      */

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/AbstractStyleNameConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/AbstractStyleNameConverter.java?rev=1479232&r1=1479231&r2=1479232&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/AbstractStyleNameConverter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/AbstractStyleNameConverter.java Sun May  5 03:08:39 2013
@@ -50,7 +50,7 @@ public abstract class AbstractStyleNameC
     /**
      * Black style pattern converter. Adds ANSI color styling to the result of the enclosed pattern.
      */
-    @Plugin(name = Black.NAME, type = "Converter")
+    @Plugin(name = Black.NAME, category = "Converter")
     @ConverterKeys(Black.NAME)
     public static final class Black extends AbstractStyleNameConverter {
 
@@ -83,7 +83,7 @@ public abstract class AbstractStyleNameC
     /**
      * Blue style pattern converter. Adds ANSI color styling to the result of the enclosed pattern.
      */
-    @Plugin(name = Blue.NAME, type = "Converter")
+    @Plugin(name = Blue.NAME, category = "Converter")
     @ConverterKeys(Blue.NAME)
     public static final class Blue extends AbstractStyleNameConverter {
 
@@ -116,7 +116,7 @@ public abstract class AbstractStyleNameC
     /**
      * Cyan style pattern converter. Adds ANSI color styling to the result of the enclosed pattern.
      */
-    @Plugin(name = Cyan.NAME, type = "Converter")
+    @Plugin(name = Cyan.NAME, category = "Converter")
     @ConverterKeys(Cyan.NAME)
     public static final class Cyan extends AbstractStyleNameConverter {
 
@@ -149,7 +149,7 @@ public abstract class AbstractStyleNameC
     /**
      * Green style pattern converter. Adds ANSI color styling to the result of the enclosed pattern.
      */
-    @Plugin(name = Green.NAME, type = "Converter")
+    @Plugin(name = Green.NAME, category = "Converter")
     @ConverterKeys(Green.NAME)
     public static final class Green extends AbstractStyleNameConverter {
 
@@ -182,7 +182,7 @@ public abstract class AbstractStyleNameC
     /**
      * Magenta style pattern converter. Adds ANSI color styling to the result of the enclosed pattern.
      */
-    @Plugin(name = Magenta.NAME, type = "Converter")
+    @Plugin(name = Magenta.NAME, category = "Converter")
     @ConverterKeys(Magenta.NAME)
     public static final class Magenta extends AbstractStyleNameConverter {
 
@@ -215,7 +215,7 @@ public abstract class AbstractStyleNameC
     /**
      * Red style pattern converter. Adds ANSI color styling to the result of the enclosed pattern.
      */
-    @Plugin(name = Red.NAME, type = "Converter")
+    @Plugin(name = Red.NAME, category = "Converter")
     @ConverterKeys(Red.NAME)
     public static final class Red extends AbstractStyleNameConverter {
 
@@ -248,7 +248,7 @@ public abstract class AbstractStyleNameC
     /**
      * White style pattern converter. Adds ANSI color styling to the result of the enclosed pattern.
      */
-    @Plugin(name = White.NAME, type = "Converter")
+    @Plugin(name = White.NAME, category = "Converter")
     @ConverterKeys(White.NAME)
     public static final class White extends AbstractStyleNameConverter {
 
@@ -281,7 +281,7 @@ public abstract class AbstractStyleNameC
     /**
      * Yellow style pattern converter. Adds ANSI color styling to the result of the enclosed pattern.
      */
-    @Plugin(name = Yellow.NAME, type = "Converter")
+    @Plugin(name = Yellow.NAME, category = "Converter")
     @ConverterKeys(Yellow.NAME)
     public static final class Yellow extends AbstractStyleNameConverter {
 

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



Mime
View raw message