logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggreg...@apache.org
Subject svn commit: r1481052 [1/2] - in /logging/log4j/log4j2/trunk: core/src/main/java/org/apache/logging/log4j/core/ core/src/main/java/org/apache/logging/log4j/core/appender/ core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/ core/src/main/j...
Date Fri, 10 May 2013 15:20:37 GMT
Author: ggregory
Date: Fri May 10 15:20:35 2013
New Revision: 1481052

URL: http://svn.apache.org/r1481052
Log:
Add missing '@Override' annotations
Add missing '@Override' annotations to implementations of interface methods
Add missing '@Deprecated' annotations

Modified:
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/DefaultErrorHandler.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FastFileManager.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.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/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/FastRollingFileManager.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/RollingFileManager.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RolloverDescriptionImpl.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/rolling/helper/AbstractAction.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerContextSelector.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEventTranslator.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.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/DefaultConfigurationMonitor.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/FileConfigurationMonitor.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/JSONConfiguration.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/XMLConfiguration.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/filter/AbstractFilter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.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/helpers/CachedClock.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/CoarseCachedClock.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Loader.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.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/AbstractJMSReceiver.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/JMSQueueManager.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/JMSTopicManager.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/net/SMTPManager.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/SocketServer.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/TCPSocketManager.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/AbstractPatternConverter.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/IntegerPatternConverter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LiteralPatternConverter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LogEventPatternConverter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/selector/BasicContextSelector.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/selector/ClassLoaderContextSelector.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/selector/JNDIContextSelector.java
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/ThreadedPerfTest.java
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/ThreadedTest.java
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/perftest/MTPerfTest.java
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.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/core/lookup/DateLookupTest.java
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/net/UDPSocketServer.java
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/AbsoluteDateAndTimeFilter.java
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/AbsoluteTimeFilter.java
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/ControlFilter.java
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/ISO8601Filter.java
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/JunitTestRunnerFilter.java
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/LineNumberFilter.java
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/MDCOrderFilter.java
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/RelativeTimeFilter.java
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/SunReflectFilter.java
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/layout/BasicLayout.java
    logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/Category.java
    logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/LogManager.java
    logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/helpers/NullEnumeration.java

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java Fri May 10 15:20:35 2013
@@ -139,6 +139,7 @@ public class LoggerContext implements or
         }
     }
 
+    @Override
     public void start() {
         if (configLock.tryLock()) {
             try {
@@ -184,6 +185,7 @@ public class LoggerContext implements or
         setConfiguration(config);
     }
 
+    @Override
     public void stop() {
         configLock.lock();
         try {
@@ -219,6 +221,7 @@ public class LoggerContext implements or
         return status;
     }
 
+    @Override
     public boolean isStarted() {
         return status == Status.STARTED;
     }
@@ -235,6 +238,7 @@ public class LoggerContext implements or
      * Returns the external context.
      * @return The external context.
      */
+    @Override
     public Object getExternalContext() {
         return this.externalContext;
     }
@@ -244,6 +248,7 @@ public class LoggerContext implements or
      * @param name The name of the Logger to return.
      * @return The Logger.
      */
+    @Override
     public Logger getLogger(final String name) {
         return getLogger(name, null);
     }
@@ -256,6 +261,7 @@ public class LoggerContext implements or
      *            a warning if mismatched.
      * @return The Logger.
      */
+    @Override
     public Logger getLogger(final String name, final MessageFactory messageFactory) {
         Logger logger = loggers.get(name);
         if (logger != null) {
@@ -273,6 +279,7 @@ public class LoggerContext implements or
      * @param name The Logger name to search for.
      * @return True if the Logger exists, false otherwise.
      */
+    @Override
     public boolean hasLogger(final String name) {
         return loggers.containsKey(name);
     }
@@ -389,6 +396,7 @@ public class LoggerContext implements or
      *
      * @param reconfigurable The Configuration that can be reconfigured.
      */
+    @Override
     public synchronized void onChange(final Reconfigurable reconfigurable) {
         LOGGER.debug("Reconfiguration started for context " + name);
         final Configuration config = reconfigurable.reconfigure();
@@ -413,6 +421,7 @@ public class LoggerContext implements or
             this.context = context;
         }
 
+        @Override
         public void run() {
             context.shutdownThread = null;
             context.stop();

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/DefaultErrorHandler.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/DefaultErrorHandler.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/DefaultErrorHandler.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/DefaultErrorHandler.java Fri May 10 15:20:35 2013
@@ -48,6 +48,7 @@ public class DefaultErrorHandler impleme
      * Handle an error with a message.
      * @param msg The message.
      */
+    @Override
     public void error(final String msg) {
         final long current = System.currentTimeMillis();
         if (lastException + EXCEPTION_INTERVAL < current || exceptionCount++ < MAX_EXCEPTIONS) {
@@ -61,6 +62,7 @@ public class DefaultErrorHandler impleme
      * @param msg The message.
      * @param t The Throwable.
      */
+    @Override
     public void error(final String msg, final Throwable t) {
         final long current = System.currentTimeMillis();
         if (lastException + EXCEPTION_INTERVAL < current || exceptionCount++ < MAX_EXCEPTIONS) {
@@ -78,6 +80,7 @@ public class DefaultErrorHandler impleme
      * @param event The LogEvent.
      * @param t The Throwable.
      */
+    @Override
     public void error(final String msg, final LogEvent event, final Throwable t) {
         final long current = System.currentTimeMillis();
         if (lastException + EXCEPTION_INTERVAL < current || exceptionCount++ < MAX_EXCEPTIONS) {

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FastFileManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FastFileManager.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FastFileManager.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FastFileManager.java Fri May 10 15:20:35 2013
@@ -140,6 +140,7 @@ public class FastFileManager extends Out
      * 
      * @return Map of content format keys supporting FileManager
      */
+    @Override
     public Map<String, String> getContentFormat() {
         Map<String, String> result = new HashMap<String, String>(
                 super.getContentFormat());
@@ -181,6 +182,7 @@ public class FastFileManager extends Out
          * @param data The FactoryData
          * @return The FastFileManager for the File.
          */
+        @Override
         public FastFileManager createManager(String name, FactoryData data) {
             File file = new File(name);
             final File parent = file.getParentFile();

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java Fri May 10 15:20:35 2013
@@ -121,6 +121,7 @@ public class FileManager extends OutputS
      * Key: "fileURI" Value: provided "advertiseURI" param
      * @return Map of content format keys supporting FileManager
      */
+    @Override
     public Map<String, String> getContentFormat()
     {
         Map<String, String> result = new HashMap<String, String>(super.getContentFormat());
@@ -163,6 +164,7 @@ public class FileManager extends OutputS
          * @param data The FactoryData
          * @return The FileManager for the File.
          */
+        @Override
         public FileManager createManager(final String name, final FactoryData data) {
             final File file = new File(name);
             final File parent = file.getParentFile();

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=1481052&r1=1481051&r2=1481052&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 Fri May 10 15:20:35 2013
@@ -56,6 +56,7 @@ public final class MapRewritePolicy impl
      * used to create a new logging event.
      * @return The LogEvent after rewriting.
      */
+    @Override
     public LogEvent rewrite(final LogEvent source) {
         final Message msg = source.getMessage();
         if (msg == null || !(msg instanceof MapMessage)) {

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=1481052&r1=1481051&r2=1481052&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 Fri May 10 15:20:35 2013
@@ -61,6 +61,7 @@ public final class PropertiesRewritePoli
      * used to create a new logging event.
      * @return The LogEvent after rewriting.
      */
+    @Override
     public LogEvent rewrite(final LogEvent source) {
         final Map<String, String> props = new HashMap<String, String>(source.getContextMap());
         for (final Map.Entry<Property, Boolean> entry : properties.entrySet()) {

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=1481052&r1=1481051&r2=1481052&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 Fri May 10 15:20:35 2013
@@ -37,6 +37,7 @@ public final class CompositeTriggeringPo
      * Initializes the policy.
      * @param manager The RollingFileManager.
      */
+    @Override
     public void initialize(final RollingFileManager manager) {
         for (final TriggeringPolicy policy : policies) {
             policy.initialize(manager);
@@ -48,6 +49,7 @@ public final class CompositeTriggeringPo
      * @param event A reference to the currently event.
      * @return true if a rollover should occur, false otherwise.
      */
+    @Override
     public boolean isTriggeringEvent(final LogEvent event) {
         for (final TriggeringPolicy policy : policies) {
             if (policy.isTriggeringEvent(event)) {

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=1481052&r1=1481051&r2=1481052&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 Fri May 10 15:20:35 2013
@@ -105,6 +105,7 @@ public class DefaultRolloverStrategy imp
      * @return A RolloverDescription.
      * @throws SecurityException if an error occurs.
      */
+    @Override
     public RolloverDescription rollover(final RollingFileManager manager) throws SecurityException {
         if (maxIndex >= 0) {
             int fileIndex;

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/FastRollingFileManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/FastRollingFileManager.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/FastRollingFileManager.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/FastRollingFileManager.java Fri May 10 15:20:35 2013
@@ -130,6 +130,7 @@ public class FastRollingFileManager exte
          * @param data The data required to create the entity.
          * @return a RollingFileManager.
          */
+        @Override
         public FastRollingFileManager createManager(String name,
                 FactoryData data) {
             File file = new File(name);

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=1481052&r1=1481051&r2=1481052&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 Fri May 10 15:20:35 2013
@@ -40,6 +40,7 @@ public class OnStartupTriggeringPolicy i
      * Provide the RollingFileManager to the policy.
      * @param manager The RollingFileManager.
      */
+    @Override
     public void initialize(final RollingFileManager manager) {
         this.manager = manager;
     }
@@ -49,6 +50,7 @@ public class OnStartupTriggeringPolicy i
      * @param event   A reference to the current event.
      * @return true if the target file's timestamp is older than the JVM start time.
      */
+    @Override
     public boolean isTriggeringEvent(final LogEvent event) {
         if (evaluated) {
             return false;

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java Fri May 10 15:20:35 2013
@@ -264,6 +264,7 @@ public class RollingFileManager extends 
          * @param data The data required to create the entity.
          * @return a RollingFileManager.
          */
+        @Override
         public RollingFileManager createManager(final String name, final FactoryData data) {
             final File file = new File(name);
             final File parent = file.getParentFile();

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RolloverDescriptionImpl.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RolloverDescriptionImpl.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RolloverDescriptionImpl.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RolloverDescriptionImpl.java Fri May 10 15:20:35 2013
@@ -70,6 +70,7 @@ public final class RolloverDescriptionIm
      *
      * @return active log file name after rollover.
      */
+    @Override
     public String getActiveFileName() {
         return activeFileName;
     }
@@ -77,6 +78,7 @@ public final class RolloverDescriptionIm
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean getAppend() {
         return append;
     }
@@ -87,6 +89,7 @@ public final class RolloverDescriptionIm
      *
      * @return action, may be null.
      */
+    @Override
     public Action getSynchronous() {
         return synchronous;
     }
@@ -97,6 +100,7 @@ public final class RolloverDescriptionIm
      *
      * @return action, may be null.
      */
+    @Override
     public Action getAsynchronous() {
         return asynchronous;
     }

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=1481052&r1=1481051&r2=1481052&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 Fri May 10 15:20:35 2013
@@ -79,6 +79,7 @@ public class SizeBasedTriggeringPolicy i
      * Initialize the TriggeringPolicy.
      * @param manager The RollingFileManager.
      */
+    @Override
     public void initialize(final RollingFileManager manager) {
         this.manager = manager;
     }
@@ -89,6 +90,7 @@ public class SizeBasedTriggeringPolicy i
      * @param event   A reference to the currently event.
      * @return true if a rollover should take place, false otherwise.
      */
+    @Override
     public boolean isTriggeringEvent(final LogEvent event) {
         return manager.getFileSize() > maxFileSize;
     }

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=1481052&r1=1481051&r2=1481052&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 Fri May 10 15:20:35 2013
@@ -42,6 +42,7 @@ public final class TimeBasedTriggeringPo
      * Initialize the policy.
      * @param manager The RollingFileManager.
      */
+    @Override
     public void initialize(final RollingFileManager manager) {
         this.manager = manager;
         nextRollover = manager.getProcessor().getNextTime(manager.getFileTime(), interval, modulate);
@@ -52,6 +53,7 @@ public final class TimeBasedTriggeringPo
      * @param event   A reference to the currently event.
      * @return true if a rollover should occur.
      */
+    @Override
     public boolean isTriggeringEvent(final LogEvent event) {
         if (manager.getFileSize() == 0) {
             return false;

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/helper/AbstractAction.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/helper/AbstractAction.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/helper/AbstractAction.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/helper/AbstractAction.java Fri May 10 15:20:35 2013
@@ -52,11 +52,13 @@ public abstract class AbstractAction imp
      * @return true if successful.
      * @throws IOException if IO error.
      */
+    @Override
     public abstract boolean execute() throws IOException;
 
     /**
      * {@inheritDoc}
      */
+    @Override
     public synchronized void run() {
         if (!interrupted) {
             try {
@@ -73,6 +75,7 @@ public abstract class AbstractAction imp
     /**
      * {@inheritDoc}
      */
+    @Override
     public synchronized void close() {
         interrupted = true;
     }
@@ -82,6 +85,7 @@ public abstract class AbstractAction imp
      *
      * @return true if action is complete.
      */
+    @Override
     public boolean isComplete() {
         return complete;
     }

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerContextSelector.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerContextSelector.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerContextSelector.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerContextSelector.java Fri May 10 15:20:35 2013
@@ -32,17 +32,20 @@ public class AsyncLoggerContextSelector 
     private static final AsyncLoggerContext CONTEXT = new AsyncLoggerContext(
             "AsyncLoggerContext");
 
+    @Override
     public LoggerContext getContext(String fqcn, ClassLoader loader,
             boolean currentContext) {
         return CONTEXT;
     }
 
+    @Override
     public List<LoggerContext> getLoggerContexts() {
         List<LoggerContext> list = new ArrayList<LoggerContext>();
         list.add(CONTEXT);
         return Collections.unmodifiableList(list);
     }
 
+    @Override
     public LoggerContext getContext(String fqcn, ClassLoader loader,
             boolean currentContext, URI configLocation) {
         return CONTEXT;

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java Fri May 10 15:20:35 2013
@@ -42,6 +42,7 @@ public class RingBufferLogEvent implemen
      */
     private static class Factory implements EventFactory<RingBufferLogEvent> {
         // @Override
+        @Override
         public RingBufferLogEvent newInstance() {
             return new RingBufferLogEvent();
         }
@@ -103,43 +104,52 @@ public class RingBufferLogEvent implemen
      * @return {@code true} if this event is the end of a batch, {@code false}
      *         otherwise
      */
+    @Override
     public boolean isEndOfBatch() {
         return endOfBatch;
     }
 
+    @Override
     public void setEndOfBatch(boolean endOfBatch) {
         this.endOfBatch = endOfBatch;
     }
 
+    @Override
     public boolean isIncludeLocation() {
         return includeLocation;
     }
 
+    @Override
     public void setIncludeLocation(boolean includeLocation) {
         this.includeLocation = includeLocation;
     }
 
     // @Override
+    @Override
     public String getLoggerName() {
         return loggerName;
     }
 
     // @Override
+    @Override
     public Marker getMarker() {
         return marker;
     }
 
     // @Override
+    @Override
     public String getFQCN() {
         return fqcn;
     }
 
     // @Override
+    @Override
     public Level getLevel() {
         return level;
     }
 
     // @Override
+    @Override
     public Message getMessage() {
         if (message == null) {
             message = new SimpleMessage("");
@@ -148,31 +158,37 @@ public class RingBufferLogEvent implemen
     }
 
     // @Override
+    @Override
     public Throwable getThrown() {
         return thrown;
     }
 
     // @Override
+    @Override
     public Map<String, String> getContextMap() {
         return contextMap;
     }
 
     // @Override
+    @Override
     public ContextStack getContextStack() {
         return contextStack;
     }
 
     // @Override
+    @Override
     public String getThreadName() {
         return threadName;
     }
 
     // @Override
+    @Override
     public StackTraceElement getSource() {
         return location;
     }
 
     // @Override
+    @Override
     public long getMillis() {
         return currentTimeMillis;
     }

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEventTranslator.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEventTranslator.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEventTranslator.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEventTranslator.java Fri May 10 15:20:35 2013
@@ -48,6 +48,7 @@ public class RingBufferLogEventTranslato
     private long currentTimeMillis;
 
     // @Override
+    @Override
     public void translateTo(RingBufferLogEvent event, long sequence) {
         event.setValues(asyncLogger, loggerName, marker, fqcn, level, message,
                 thrown, contextMap, contextStack, threadName, location,

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java Fri May 10 15:20:35 2013
@@ -312,6 +312,7 @@ public abstract class ConfigurationFacto
             this.factoryClass = clazz;
         }
 
+        @Override
         public int compareTo(final WeightedFactory wf) {
             final int w = wf.weight;
             if (weight == w) {

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=1481052&r1=1481051&r2=1481052&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 Fri May 10 15:20:35 2013
@@ -31,6 +31,7 @@ public class DefaultAdvertiser implement
      *
      * @return null
      */
+    @Override
     public Object advertise(Map<String, String> properties) {
         return null;
     }
@@ -39,6 +40,7 @@ public class DefaultAdvertiser implement
      * Does nothing
      * @param advertisedObject
      */
+    @Override
     public void unadvertise(Object advertisedObject) {
         //no-op
     }

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfigurationMonitor.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfigurationMonitor.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfigurationMonitor.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfigurationMonitor.java Fri May 10 15:20:35 2013
@@ -24,6 +24,7 @@ public class DefaultConfigurationMonitor
     /**
      * Does nothing.
      */
+    @Override
     public void checkConfiguration() {
         // do nothing
     }

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/FileConfigurationMonitor.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/FileConfigurationMonitor.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/FileConfigurationMonitor.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/FileConfigurationMonitor.java Fri May 10 15:20:35 2013
@@ -66,6 +66,7 @@ public class FileConfigurationMonitor im
     /**
      * Called to determine if the configuration has changed.
      */
+    @Override
     public void checkConfiguration() {
         if ((++counter & MASK) == 0) {
             synchronized (this) {

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/JSONConfiguration.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/JSONConfiguration.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/JSONConfiguration.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/JSONConfiguration.java Fri May 10 15:20:35 2013
@@ -211,6 +211,7 @@ public class JSONConfiguration extends B
         }
     }
 
+    @Override
     public Configuration reconfigure() {
         if (configFile != null) {
             try {

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=1481052&r1=1481051&r2=1481052&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 Fri May 10 15:20:35 2013
@@ -417,6 +417,7 @@ public class LoggerConfig extends Abstra
      * @param t An optional Throwable.
      * @return The LogEvent.
      */
+    @Override
     public LogEvent createEvent(final String loggerName, final Marker marker,
             final String fqcn, final Level level, final Message data,
             final List<Property> properties, final Throwable t) {

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/XMLConfiguration.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/XMLConfiguration.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/XMLConfiguration.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/XMLConfiguration.java Fri May 10 15:20:35 2013
@@ -266,6 +266,7 @@ public class XMLConfiguration extends Ba
         }
     }
 
+    @Override
     public Configuration reconfigure() {
         if (configFile != null) {
             try {

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=1481052&r1=1481051&r2=1481052&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 Fri May 10 15:20:35 2013
@@ -301,6 +301,7 @@ public class PluginManager {
          * @param type The type to check for.
          * @return true if the Class is of the specified type.
          */
+        @Override
         public boolean matches(final Class<?> type) {
             return type != null && type.isAnnotationPresent(Plugin.class) &&
                 (isA == null || isA.isAssignableFrom(type));

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java Fri May 10 15:20:35 2013
@@ -69,6 +69,7 @@ public abstract class AbstractFilter imp
     /**
      * Mark the Filter as started.
      */
+    @Override
     public void start() {
         started = true;
     }
@@ -77,6 +78,7 @@ public abstract class AbstractFilter imp
      * Determine if the the Filter has started.
      * @return true if the Filter is started, false otherwise.
      */
+    @Override
     public boolean isStarted() {
         return started;
     }
@@ -84,6 +86,7 @@ public abstract class AbstractFilter imp
     /**
      * Mark the Filter as stopped.
      */
+    @Override
     public void stop() {
         started = false;
     }
@@ -92,6 +95,7 @@ public abstract class AbstractFilter imp
      * Returns the Result to be returned when a match does not occur.
      * @return the onMismatch Result.
      */
+    @Override
     public final Result getOnMismatch() {
         return onMismatch;
     }
@@ -100,6 +104,7 @@ public abstract class AbstractFilter imp
      * Returns the Result to be returned when a match occurs.
      * @return the onMatch Result.
      */
+    @Override
     public final Result getOnMatch() {
         return onMatch;
     }
@@ -118,6 +123,7 @@ public abstract class AbstractFilter imp
      * @param params An array of parameters or null.
      * @return The Result of filtering.
      */
+    @Override
     public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
                          final Object... params) {
         return Result.NEUTRAL;
@@ -132,6 +138,7 @@ public abstract class AbstractFilter imp
      * @param t A throwable or null.
      * @return The Result of filtering.
      */
+    @Override
     public Result filter(final Logger logger, final Level level, final Marker marker, final Object msg,
                          final Throwable t) {
         return Result.NEUTRAL;
@@ -146,6 +153,7 @@ public abstract class AbstractFilter imp
      * @param t A throwable or null.
      * @return The Result of filtering.
      */
+    @Override
     public Result filter(final Logger logger, final Level level, final Marker marker, final Message msg,
                          final Throwable t) {
         return Result.NEUTRAL;
@@ -156,6 +164,7 @@ public abstract class AbstractFilter imp
      * @param event The LogEvent.
      * @return The Result of filtering.
      */
+    @Override
     public Result filter(final LogEvent event) {
         return Result.NEUTRAL;
     }

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java Fri May 10 15:20:35 2013
@@ -40,6 +40,7 @@ public abstract class AbstractFilterable
      * Returns the Filter.
      * @return the Filter.
      */
+    @Override
     public Filter getFilter() {
         return filter;
     }
@@ -48,6 +49,7 @@ public abstract class AbstractFilterable
      * Add a filter.
      * @param filter The Filter to add.
      */
+    @Override
     public synchronized void addFilter(final Filter filter) {
         if (this.filter == null) {
             this.filter = filter;
@@ -63,6 +65,7 @@ public abstract class AbstractFilterable
      * Remove a Filter.
      * @param filter The Filter to remove.
      */
+    @Override
     public synchronized void removeFilter(final Filter filter) {
         if (this.filter == filter) {
             this.filter = null;
@@ -84,6 +87,7 @@ public abstract class AbstractFilterable
      * Determines if a Filter is present.
      * @return false if no Filter is present.
      */
+    @Override
     public boolean hasFilter() {
         return filter != null;
     }
@@ -111,6 +115,7 @@ public abstract class AbstractFilterable
      * @param event The LogEvent.
      * @return true if the LogEvent should be processed.
      */
+    @Override
     public boolean isFiltered(final LogEvent event) {
         return filter != null && filter.filter(event) == Filter.Result.DENY;
     }

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=1481052&r1=1481051&r2=1481052&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 Fri May 10 15:20:35 2013
@@ -175,10 +175,12 @@ public final class BurstFilter extends A
             this.expireTime = delay + System.nanoTime();
         }
 
+        @Override
         public long getDelay(final TimeUnit timeUnit) {
             return timeUnit.convert(expireTime - System.nanoTime(), TimeUnit.NANOSECONDS);
         }
 
+        @Override
         public int compareTo(final Delayed delayed) {
             if (this.expireTime < ((LogDelay) delayed).expireTime) {
                 return -1;

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=1481052&r1=1481051&r2=1481052&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 Fri May 10 15:20:35 2013
@@ -71,6 +71,7 @@ public final class CompositeFilter imple
         return new CompositeFilter(Collections.unmodifiableList(filters));
     }
 
+    @Override
     public Iterator<Filter> iterator() {
         return filters.iterator();
     }
@@ -87,6 +88,7 @@ public final class CompositeFilter imple
         return filters.size();
     }
 
+    @Override
     public void start() {
         for (final Filter filter : filters) {
             if (filter instanceof LifeCycle) {
@@ -96,6 +98,7 @@ public final class CompositeFilter imple
         isStarted = true;
     }
 
+    @Override
     public void stop() {
         for (final Filter filter : filters) {
             if (filter instanceof LifeCycle) {
@@ -105,6 +108,7 @@ public final class CompositeFilter imple
         isStarted = false;
     }
 
+    @Override
     public boolean isStarted() {
         return isStarted;
     }
@@ -114,6 +118,7 @@ public final class CompositeFilter imple
      *
      * @return the Result that should be returned when the filter does not match the event.
      */
+    @Override
     public Result getOnMismatch() {
         return Result.NEUTRAL;
     }
@@ -123,6 +128,7 @@ public final class CompositeFilter imple
      *
      * @return the Result that should be returned when the filter matches the event.
      */
+    @Override
     public Result getOnMatch() {
         return Result.NEUTRAL;
     }
@@ -142,6 +148,7 @@ public final class CompositeFilter imple
      *            An array of parameters or null.
      * @return the Result.
      */
+    @Override
     public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
                          final Object... params) {
         Result result = Result.NEUTRAL;
@@ -169,6 +176,7 @@ public final class CompositeFilter imple
      *            A Throwable or null.
      * @return the Result.
      */
+    @Override
     public Result filter(final Logger logger, final Level level, final Marker marker, final Object msg,
                          final Throwable t) {
         Result result = Result.NEUTRAL;
@@ -196,6 +204,7 @@ public final class CompositeFilter imple
      *            A Throwable or null.
      * @return the Result.
      */
+    @Override
     public Result filter(final Logger logger, final Level level, final Marker marker, final Message msg,
                          final Throwable t) {
         Result result = Result.NEUTRAL;
@@ -215,6 +224,7 @@ public final class CompositeFilter imple
      *            The Event to filter on.
      * @return the Result.
      */
+    @Override
     public Result filter(final LogEvent event) {
         Result result = Result.NEUTRAL;
         for (final Filter filter : filters) {

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/CachedClock.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/CachedClock.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/CachedClock.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/CachedClock.java Fri May 10 15:20:35 2013
@@ -32,6 +32,7 @@ public final class CachedClock implement
     private volatile long millis = System.currentTimeMillis();
     private volatile short count = 0;
     private final Thread updater = new Thread("Clock Updater Thread") {
+        @Override
         public void run() {
             while (true) {
                 long time = System.currentTimeMillis();

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/CoarseCachedClock.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/CoarseCachedClock.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/CoarseCachedClock.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/CoarseCachedClock.java Fri May 10 15:20:35 2013
@@ -27,6 +27,7 @@ public final class CoarseCachedClock imp
     private volatile long millis = System.currentTimeMillis();
 
     private final Thread updater = new Thread("Clock Updater Thread") {
+        @Override
         public void run() {
             while (true) {
                 long time = System.currentTimeMillis();

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Loader.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Loader.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Loader.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Loader.java Fri May 10 15:20:35 2013
@@ -261,6 +261,7 @@ public final class Loader {
         } else {
             cl = java.security.AccessController.doPrivileged(
                 new java.security.PrivilegedAction<ClassLoader>() {
+                    @Override
                     public ClassLoader run() {
                         return Thread.currentThread().getContextClassLoader();
                     }

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java Fri May 10 15:20:35 2013
@@ -78,6 +78,7 @@ public class Log4jContextFactory impleme
      * for the caller if a more appropriate Context can be determined.
      * @return The LoggerContext.
      */
+    @Override
     public LoggerContext getContext(final String fqcn, final ClassLoader loader, final boolean currentContext) {
         final LoggerContext ctx = selector.getContext(fqcn, loader, currentContext);
         if (ctx.getStatus() == LoggerContext.Status.INITIALIZED) {
@@ -95,6 +96,7 @@ public class Log4jContextFactory impleme
      * @param configLocation The location of the configuration for the LoggerContext.
      * @return The LoggerContext.
      */
+    @Override
     public LoggerContext getContext(final String fqcn, final ClassLoader loader, final boolean currentContext,
             URI configLocation) {
         final LoggerContext ctx = selector.getContext(fqcn, loader, currentContext, configLocation);

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java Fri May 10 15:20:35 2013
@@ -139,6 +139,7 @@ public class Log4jLogEvent implements Lo
      * Returns the logging Level.
      * @return the Level associated with this event.
      */
+    @Override
     public Level getLevel() {
         return level;
     }
@@ -147,6 +148,7 @@ public class Log4jLogEvent implements Lo
      * Returns the name of the Logger used to generate the event.
      * @return The Logger name.
      */
+    @Override
     public String getLoggerName() {
         return name;
     }
@@ -155,6 +157,7 @@ public class Log4jLogEvent implements Lo
      * Returns the Message associated with the event.
      * @return The Message.
      */
+    @Override
     public Message getMessage() {
         return message;
     }
@@ -163,6 +166,7 @@ public class Log4jLogEvent implements Lo
      * Returns the name of the Thread on which the event was generated.
      * @return The name of the Thread.
      */
+    @Override
     public String getThreadName() {
         if (threadName == null) {
             threadName = Thread.currentThread().getName();
@@ -174,6 +178,7 @@ public class Log4jLogEvent implements Lo
      * Returns the time in milliseconds from the epoch when the event occurred.
      * @return The time the event occurred.
      */
+    @Override
     public long getMillis() {
         return timestamp;
     }
@@ -182,6 +187,7 @@ public class Log4jLogEvent implements Lo
      * Returns the Throwable associated with the event, or null.
      * @return The Throwable associated with the event.
      */
+    @Override
     public Throwable getThrown() {
         return throwable;
     }
@@ -190,6 +196,7 @@ public class Log4jLogEvent implements Lo
      * Returns the Marker associated with the event, or null.
      * @return the Marker associated with the event.
      */
+    @Override
     public Marker getMarker() {
         return marker;
     }
@@ -198,6 +205,7 @@ public class Log4jLogEvent implements Lo
      * The fully qualified class name of the class that was called by the caller.
      * @return the fully qualified class name of the class that is performing logging.
      */
+    @Override
     public String getFQCN() {
         return fqcnOfLogger;
     }
@@ -206,6 +214,7 @@ public class Log4jLogEvent implements Lo
      * Returns the immutable copy of the ThreadContext Map.
      * @return The context Map.
      */
+    @Override
     public Map<String, String> getContextMap() {
         return mdc == null ? ThreadContext.EMPTY_MAP : mdc;
     }
@@ -214,6 +223,7 @@ public class Log4jLogEvent implements Lo
      * Returns an immutable copy of the ThreadContext stack.
      * @return The context Stack.
      */
+    @Override
     public ThreadContext.ContextStack getContextStack() {
         return ndc == null ? ThreadContext.EMPTY_STACK : ndc;
     }
@@ -223,6 +233,7 @@ public class Log4jLogEvent implements Lo
      * before the first occurrence of FQCN as a class name.
      * @return the StackTraceElement for the caller.
      */
+    @Override
     public StackTraceElement getSource() {
         if (location != null) {
             return location;
@@ -258,18 +269,22 @@ public class Log4jLogEvent implements Lo
         return null;
     }
 
+    @Override
     public boolean isIncludeLocation() {
         return includeLocation;
     }
 
+    @Override
     public void setIncludeLocation(boolean includeLocation) {
         this.includeLocation = includeLocation;
     }
 
+    @Override
     public boolean isEndOfBatch() {
         return endOfBatch;
     }
 
+    @Override
     public void setEndOfBatch(boolean endOfBatch) {
         this.endOfBatch = endOfBatch;
     }

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java Fri May 10 15:20:35 2013
@@ -44,6 +44,7 @@ public abstract class AbstractLayout<T e
      * Returns the header, if one is available.
      * @return A byte array containing the header.
      */
+    @Override
     public byte[] getHeader() {
         return header;
     }
@@ -60,6 +61,7 @@ public abstract class AbstractLayout<T e
      * Returns the footer, if one is available.
      * @return A byte array containing the footer.
      */
+    @Override
     public byte[] getFooter() {
         return footer;
     }

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java Fri May 10 15:20:35 2013
@@ -52,6 +52,7 @@ public abstract class AbstractStringLayo
      * @param event The Log Event.
      * @return The formatted event as a byte array.
      */
+    @Override
     public byte[] toByteArray(final LogEvent event) {
         return encoder.getBytes(toSerializable(event));
     }
@@ -59,6 +60,7 @@ public abstract class AbstractStringLayo
     /**
      * @return The default content type for Strings.
      */
+    @Override
     public String getContentType() {
         return "text/plain";
     }
@@ -79,6 +81,7 @@ public abstract class AbstractStringLayo
      * JDK 6 or greater.
      */
     private class ClassEncoder implements StringEncoder {
+        @Override
         public byte[] getBytes(final String str) {
             return str.getBytes(charset);
         }
@@ -88,6 +91,7 @@ public abstract class AbstractStringLayo
      * JDK 5.
      */
     private class NameEncoder implements StringEncoder {
+        @Override
         public byte[] getBytes(final String str) {
             try {
                 return str.getBytes(charset.name());

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=1481052&r1=1481051&r2=1481052&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 Fri May 10 15:20:35 2013
@@ -115,6 +115,7 @@ public final class HTMLLayout extends Ab
      * @param event The Logging Event.
      * @return A String containing the LogEvent as HTML.
      */
+    @Override
     public String toSerializable(final LogEvent event) {
         final StringBuilder sbuf = new StringBuilder(BUF_SIZE);
 
@@ -197,6 +198,7 @@ public final class HTMLLayout extends Ab
      * but isn't at this time - returning empty Map/unspecified.
      * @return empty Map
      */
+    @Override
     public Map<String, String> getContentFormat() {
         return new HashMap<String, String>();
     }

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=1481052&r1=1481051&r2=1481052&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 Fri May 10 15:20:35 2013
@@ -142,6 +142,7 @@ public final class PatternLayout extends
      * Key: "format" Value: provided "conversionPattern" param
      * @return Map of content format keys supporting PatternLayout
      */
+    @Override
     public Map<String, String> getContentFormat()
     {
         Map<String, String> result = new HashMap<String, String>();
@@ -158,6 +159,7 @@ public final class PatternLayout extends
      * @param event logging event to be formatted.
      * @return The event formatted as a String.
      */
+    @Override
     public String toSerializable(final LogEvent event) {
         final StringBuilder buf = new StringBuilder();
         for (final PatternFormatter formatter : formatters) {

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=1481052&r1=1481051&r2=1481052&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 Fri May 10 15:20:35 2013
@@ -196,6 +196,7 @@ public final class RFC5424Layout extends
      * Key: "format" Value: "RFC5424"<p/>
      * @return Map of content format keys supporting RFC5424Layout
      */
+    @Override
     public Map<String, String> getContentFormat()
     {
         Map<String, String> result = new HashMap<String, String>();
@@ -210,6 +211,7 @@ public final class RFC5424Layout extends
      * @param event The LogEvent.
      * @return The RFC 5424 String representation of the LogEvent.
      */
+    @Override
     public String toSerializable(final LogEvent event) {
         final Message msg = event.getMessage();
         final boolean isStructured = msg instanceof StructuredDataMessage;
@@ -437,6 +439,7 @@ public final class RFC5424Layout extends
      * Includes only the listed keys.
      */
     private class IncludeChecker implements ListChecker {
+        @Override
         public boolean check(final String key) {
             return mdcIncludes.contains(key);
         }
@@ -446,6 +449,7 @@ public final class RFC5424Layout extends
      * Excludes the listed keys.
      */
     private class ExcludeChecker implements ListChecker {
+        @Override
         public boolean check(final String key) {
             return !mdcExcludes.contains(key);
         }
@@ -455,6 +459,7 @@ public final class RFC5424Layout extends
      * Does nothing.
      */
     private class NoopChecker implements ListChecker {
+        @Override
         public boolean check(final String key) {
             return true;
         }

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=1481052&r1=1481051&r2=1481052&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 Fri May 10 15:20:35 2013
@@ -55,6 +55,7 @@ public final class SerializedLayout exte
      * @param event The LogEvent.
      * @return the formatted LogEvent.
      */
+    @Override
     public byte[] toByteArray(final LogEvent event) {
         final ByteArrayOutputStream baos = new ByteArrayOutputStream();
         try {
@@ -77,6 +78,7 @@ public final class SerializedLayout exte
      * @param event The Logging Event.
      * @return The LogEvent.
      */
+    @Override
     public LogEvent toSerializable(final LogEvent event) {
         return event;
     }
@@ -100,6 +102,7 @@ public final class SerializedLayout exte
      * SerializedLayout's format is sufficiently specified via the content type, use empty Map/unspecified.
      * @return empty Map
      */
+    @Override
     public Map<String, String> getContentFormat() {
         return new HashMap<String, String>();
     }
@@ -108,6 +111,7 @@ public final class SerializedLayout exte
      * SerializedLayout returns a binary stream.
      * @return The content type.
      */
+    @Override
     public String getContentType() {
         return "application/octet-stream";
     }

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=1481052&r1=1481051&r2=1481052&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 Fri May 10 15:20:35 2013
@@ -74,6 +74,7 @@ public class SyslogLayout extends Abstra
      * @param event The LogEvent
      * @return the event formatted as a String.
      */
+    @Override
     public String toSerializable(final LogEvent event) {
         final StringBuilder buf = new StringBuilder();
 
@@ -131,6 +132,7 @@ public class SyslogLayout extends Abstra
      * Key: "formatType" Value: "logfilepatternreceiver" (format uses the keywords supported by LogFilePatternReceiver)
      * @return Map of content format keys supporting SyslogLayout
      */
+    @Override
     public Map<String, String> getContentFormat()
     {
         Map<String, String> result = new HashMap<String, String>();

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=1481052&r1=1481051&r2=1481052&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 Fri May 10 15:20:35 2013
@@ -97,6 +97,7 @@ public class XMLLayout extends AbstractS
      * @param event The LogEvent.
      * @return The XML representation of the LogEvent.
      */
+    @Override
     public String toSerializable(final LogEvent event) {
         final StringBuilder buf = new StringBuilder(DEFAULT_SIZE);
 
@@ -223,6 +224,7 @@ public class XMLLayout extends AbstractS
      * Key: "version" Value: "1.2"
      * @return Map of content format keys supporting XMLLayout
      */
+    @Override
     public Map<String, String> getContentFormat() {
         Map<String, String> result = new HashMap<String, String>();
         result.put("dtd", "log4j.dtd");

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=1481052&r1=1481051&r2=1481052&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 Fri May 10 15:20:35 2013
@@ -31,6 +31,7 @@ public class ContextMapLookup implements
      * @param key  the key to be looked up, may be null
      * @return The value associated with the key.
      */
+    @Override
     public String lookup(final String key) {
         return ThreadContext.get(key);
     }
@@ -41,6 +42,7 @@ public class ContextMapLookup implements
      * @param key  the key to be looked up, may be null
      * @return The value associated with the key.
      */
+    @Override
     public String lookup(final LogEvent event, final String key) {
         return event.getContextMap().get(key);
     }

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=1481052&r1=1481051&r2=1481052&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 Fri May 10 15:20:35 2013
@@ -37,6 +37,7 @@ public class DateLookup implements StrLo
      * @param key the format to use. If null, the default DateFormat will be used.
      * @return The value of the environment variable.
      */
+    @Override
     public String lookup(final String key) {
         return formatDate(System.currentTimeMillis(), key);
     }
@@ -47,6 +48,7 @@ public class DateLookup implements StrLo
      * @param key the format to use. If null, the default DateFormat will be used.
      * @return The value of the environment variable.
      */
+    @Override
     public String lookup(final LogEvent event, final String key) {
         return formatDate(event.getMillis(), key);
     }

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=1481052&r1=1481051&r2=1481052&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 Fri May 10 15:20:35 2013
@@ -30,6 +30,7 @@ public class EnvironmentLookup implement
      * @param key  the key to be looked up, may be null
      * @return The value of the environment variable.
      */
+    @Override
     public String lookup(final String key) {
         return System.getenv(key);
     }
@@ -40,6 +41,7 @@ public class EnvironmentLookup implement
      * @param key  the key to be looked up, may be null
      * @return The value of the environment variable.
      */
+    @Override
     public String lookup(final LogEvent event, final String key) {
         return System.getenv(key);
     }

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=1481052&r1=1481051&r2=1481052&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 Fri May 10 15:20:35 2013
@@ -57,6 +57,7 @@ public class MapLookup implements StrLoo
      * @param key the key to be looked up, may be null
      * @return the matching value, null if no match
      */
+    @Override
     public String lookup(final String key) {
         if (map == null) {
             return null;
@@ -68,6 +69,7 @@ public class MapLookup implements StrLoo
         return obj;
     }
 
+    @Override
     public String lookup(final LogEvent event, final String key) {
         if (map == null && !(event.getMessage() instanceof MapMessage)) {
             return null;

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=1481052&r1=1481051&r2=1481052&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 Fri May 10 15:20:35 2013
@@ -31,6 +31,7 @@ public class StructuredDataLookup implem
      * @param key  the key to be looked up, may be null
      * @return The value for the key.
      */
+    @Override
     public String lookup(final String key) {
         return null;
     }
@@ -41,6 +42,7 @@ public class StructuredDataLookup implem
      * @param key  the key to be looked up, may be null
      * @return The value associated with the key.
      */
+    @Override
     public String lookup(final LogEvent event, final String key) {
         if (event == null || !(event.getMessage() instanceof StructuredDataMessage)) {
             return null;

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=1481052&r1=1481051&r2=1481052&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 Fri May 10 15:20:35 2013
@@ -30,6 +30,7 @@ public class SystemPropertiesLookup impl
      * @param key  the key to be looked up, may be null
      * @return The value for the key.
      */
+    @Override
     public String lookup(final String key) {
         try {
             return System.getProperty(key);
@@ -44,6 +45,7 @@ public class SystemPropertiesLookup impl
      * @param key  the key to be looked up, may be null
      * @return The value associated with the key.
      */
+    @Override
     public String lookup(final LogEvent event, final String key) {
         try {
             return System.getProperty(key);

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/AbstractJMSReceiver.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/AbstractJMSReceiver.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/AbstractJMSReceiver.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/AbstractJMSReceiver.java Fri May 10 15:20:35 2013
@@ -41,6 +41,7 @@ public abstract class AbstractJMSReceive
      * Listener that receives the event.
      * @param message The received message.
      */
+    @Override
     public void onMessage(final javax.jms.Message message) {
 
         try {

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java Fri May 10 15:20:35 2013
@@ -63,6 +63,7 @@ public abstract class AbstractSocketMana
      * Key: "address" Value: provided "address" param
      * @return Map of content format keys supporting AbstractSocketManager
      */
+    @Override
     public Map<String, String> getContentFormat()
     {
         Map<String, String> result = new HashMap<String, String>(super.getContentFormat());

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java Fri May 10 15:20:35 2013
@@ -66,6 +66,7 @@ public class DatagramSocketManager exten
      * Key: "direction" Value: "out"
      * @return Map of content format keys supporting DatagramSocketManager
      */
+    @Override
     public Map<String, String> getContentFormat()
     {
         Map<String, String> result = new HashMap<String, String>(super.getContentFormat());
@@ -93,6 +94,7 @@ public class DatagramSocketManager exten
      */
     private static class DatagramSocketManagerFactory implements ManagerFactory<DatagramSocketManager, FactoryData> {
 
+        @Override
         public DatagramSocketManager createManager(final String name, final FactoryData data) {
             InetAddress address;
             final OutputStream os = new DatagramOutputStream(data.host, data.port);

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/JMSQueueManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/JMSQueueManager.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/JMSQueueManager.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/JMSQueueManager.java Fri May 10 15:20:35 2013
@@ -215,6 +215,7 @@ public class JMSQueueManager extends Abs
      */
     private static class JMSQueueManagerFactory implements ManagerFactory<JMSQueueManager, FactoryData> {
 
+        @Override
         public JMSQueueManager createManager(final String name, final FactoryData data) {
             try {
                 final Context ctx = createContext(data.factoryName, data.providerURL, data.urlPkgPrefixes,

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/JMSTopicManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/JMSTopicManager.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/JMSTopicManager.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/JMSTopicManager.java Fri May 10 15:20:35 2013
@@ -216,6 +216,7 @@ public class JMSTopicManager extends Abs
      */
     private static class JMSTopicManagerFactory implements ManagerFactory<JMSTopicManager, FactoryData> {
 
+        @Override
         public JMSTopicManager createManager(final String name, final FactoryData data) {
             try {
                 final Context ctx = createContext(data.factoryName, data.providerURL, data.urlPkgPrefixes,

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=1481052&r1=1481051&r2=1481052&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 Fri May 10 15:20:35 2013
@@ -58,6 +58,7 @@ public class MulticastDNSAdvertiser impl
      * @param properties the properties representing the entity to advertise
      * @return the object which can be used to unadvertise, or null if advertisement was unsuccessful
      */
+    @Override
     public Object advertise(Map<String, String> properties) {
         //default to tcp if "protocol" was not set
         Map<String, String> truncatedProperties = new HashMap<String, String>();
@@ -117,6 +118,7 @@ public class MulticastDNSAdvertiser impl
      * Unadvertise the previously advertised entity
      * @param serviceInfo
      */
+    @Override
     public void unadvertise(Object serviceInfo) {
         if (jmDNS != null) {
             try {

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/SMTPManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/SMTPManager.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/SMTPManager.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/SMTPManager.java Fri May 10 15:20:35 2013
@@ -295,6 +295,7 @@ public class SMTPManager extends Abstrac
      */
     private static class SMTPManagerFactory implements ManagerFactory<SMTPManager, FactoryData> {
 
+        @Override
         public SMTPManager createManager(final String name, final FactoryData data) {
             final String prefix = "mail." + data.protocol;
 

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/SocketServer.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/SocketServer.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/SocketServer.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/SocketServer.java Fri May 10 15:20:35 2013
@@ -119,6 +119,7 @@ public class SocketServer extends Abstra
     /**
      * Accept incoming events and processes them.
      */
+    @Override
     public void run() {
         while (isActive) {
             try {



Mime
View raw message