Return-Path: X-Original-To: apmail-logging-commits-archive@minotaur.apache.org Delivered-To: apmail-logging-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A50DFDB72 for ; Fri, 28 Sep 2012 21:58:48 +0000 (UTC) Received: (qmail 22927 invoked by uid 500); 28 Sep 2012 21:58:48 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 22897 invoked by uid 500); 28 Sep 2012 21:58:48 -0000 Mailing-List: contact commits-help@logging.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@logging.apache.org Delivered-To: mailing list commits@logging.apache.org Received: (qmail 22888 invoked by uid 99); 28 Sep 2012 21:58:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Sep 2012 21:58:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Sep 2012 21:58:44 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7AC7923888E3; Fri, 28 Sep 2012 21:58:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1391672 - in /logging/log4j/log4j2/trunk/core/src: main/java/org/apache/logging/log4j/core/ main/java/org/apache/logging/log4j/core/appender/ main/java/org/apache/logging/log4j/core/appender/rolling/ main/java/org/apache/logging/log4j/core... Date: Fri, 28 Sep 2012 21:57:58 -0000 To: commits@logging.apache.org From: ggregory@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120928215801.7AC7923888E3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ggregory Date: Fri Sep 28 21:57:55 2012 New Revision: 1391672 URL: http://svn.apache.org/viewvc?rev=1391672&view=rev Log: Add missing '@Override' annotations (Java 5 level) Added: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/CollectionLoggingTest.java (with props) Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Logger.java logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AsynchAppender.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/OutputStreamManager.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/helper/CompositeAction.java logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/helper/FileRenameAction.java logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/helper/GZCompressAction.java logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/helper/ZipCompressAction.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/JSONConfiguration.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/XMLConfiguration.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/filter/BurstFilter.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/lookup/Interpolator.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/CachedDateFormat.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/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/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/LiteralPatternConverter.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/NameAbbreviator.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/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/FilterPerformanceComparison.java logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/BasicConfigurationFactory.java logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/SimplePerfTest.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/Timer.java logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTest.java logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/helpers/UUIDTest.java logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueTest.java logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/net/JMSTopicTest.java logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/net/SocketServerTest.java logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/InMemoryAppender.java logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Logger.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Logger.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Logger.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Logger.java Fri Sep 28 21:57:55 2012 @@ -346,6 +346,7 @@ public class Logger extends AbstractLogg /** * Returns a String representation of this instance in the form {@code "name:level[ in context_name]"}. */ + @Override public String toString() { final String nameLevel = "" + name + ":" + getLevel(); if (context == null) { Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AsynchAppender.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AsynchAppender.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AsynchAppender.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AsynchAppender.java Fri Sep 28 21:57:55 2012 @@ -186,6 +186,7 @@ public final class AsynchAppender extend this.queue = queue; } + @Override public void run() { while (!shutdown) { Serializable s; 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=1391672&r1=1391671&r2=1391672&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 Sep 28 21:57:55 2012 @@ -58,6 +58,7 @@ public class FileManager extends OutputS return (FileManager) getManager(fileName, new FactoryData(append, locking, bufferedIO), factory); } + @Override protected synchronized void write(byte[] bytes, int offset, int length) { if (isLocking) { Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java Fri Sep 28 21:57:55 2012 @@ -74,6 +74,7 @@ public class OutputStreamManager extends /** * Default hook to write footer during close. */ + @Override public void releaseSub() { if (footer != null) { write(footer); 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=1391672&r1=1391671&r2=1391672&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 Sep 28 21:57:55 2012 @@ -65,6 +65,7 @@ public class RollingFileManager extends bufferedIO), factory); } + @Override protected synchronized void write(byte[] bytes, int offset, int length) { size += length; super.write(bytes, offset, length); @@ -183,6 +184,7 @@ public class RollingFileManager extends * @throws java.io.IOException if IO error, a thrown exception will cause the rollover * to be aborted if possible. */ + @Override public boolean execute() throws IOException { try { return action.execute(); @@ -194,6 +196,7 @@ public class RollingFileManager extends /** * Cancels the action if not already initialized or waits till completion. */ + @Override public void close() { action.close(); } @@ -203,6 +206,7 @@ public class RollingFileManager extends * * @return true if action is complete. */ + @Override public boolean isComplete() { return action.isComplete(); } Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/helper/CompositeAction.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/helper/CompositeAction.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/helper/CompositeAction.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/helper/CompositeAction.java Fri Sep 28 21:57:55 2012 @@ -51,6 +51,7 @@ public class CompositeAction extends Act /** * {@inheritDoc} */ + @Override public void run() { try { execute(); @@ -65,6 +66,7 @@ public class CompositeAction extends Act * @return true if all actions were successful. * @throws IOException on IO error. */ + @Override public boolean execute() throws IOException { if (stopOnError) { for (Action action : actions) { Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/helper/FileRenameAction.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/helper/FileRenameAction.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/helper/FileRenameAction.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/helper/FileRenameAction.java Fri Sep 28 21:57:55 2012 @@ -66,6 +66,7 @@ public final class FileRenameAction exte * * @return true if successfully renamed. */ + @Override public boolean execute() { return execute(source, destination, renameEmptyFiles); } Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/helper/GZCompressAction.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/helper/GZCompressAction.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/helper/GZCompressAction.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/helper/GZCompressAction.java Fri Sep 28 21:57:55 2012 @@ -74,6 +74,7 @@ public final class GZCompressAction exte * @return true if successfully compressed. * @throws IOException on IO exception. */ + @Override public boolean execute() throws IOException { return execute(source, destination, deleteSource); } @@ -121,6 +122,7 @@ public final class GZCompressAction exte * * @param ex exception. */ + @Override protected void reportException(final Exception ex) { LOGGER.warn("Exception during compression of '" + source.toString() + "'.", ex); } Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/helper/ZipCompressAction.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/helper/ZipCompressAction.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/helper/ZipCompressAction.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/helper/ZipCompressAction.java Fri Sep 28 21:57:55 2012 @@ -75,6 +75,7 @@ public final class ZipCompressAction ext * @return true if successfully compressed. * @throws IOException on IO exception. */ + @Override public boolean execute() throws IOException { return execute(source, destination, deleteSource); } @@ -124,6 +125,7 @@ public final class ZipCompressAction ext * * @param ex exception. */ + @Override protected void reportException(final Exception ex) { LOGGER.warn("Exception during compression of '" + source.toString() + "'.", ex); } 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=1391672&r1=1391671&r2=1391672&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 Sep 28 21:57:55 2012 @@ -332,6 +332,7 @@ public abstract class ConfigurationFacto * @param configLocation The configuration location. * @return The Configuration. */ + @Override public Configuration getConfiguration(String name, URI configLocation) { if (configLocation == null) { @@ -410,10 +411,12 @@ public abstract class ConfigurationFacto return null; } + @Override public String[] getSupportedTypes() { return null; } + @Override public Configuration getConfiguration(InputSource source) { return null; } 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=1391672&r1=1391671&r2=1391672&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 Sep 28 21:57:55 2012 @@ -151,7 +151,8 @@ public class JSONConfiguration extends B } } - public void setup() { + @Override + public void setup() { Iterator> iter = root.getFields(); List children = rootNode.getChildren(); while (iter.hasNext()) { 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=1391672&r1=1391671&r2=1391672&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 Fri Sep 28 21:57:55 2012 @@ -60,6 +60,7 @@ public class JSONConfigurationFactory ex return isActive; } + @Override public Configuration getConfiguration(InputSource source) { if (!isActive) { return null; @@ -67,6 +68,7 @@ public class JSONConfigurationFactory ex return new JSONConfiguration(source, configFile); } + @Override public String[] getSupportedTypes() { return SUFFIXES; } 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=1391672&r1=1391671&r2=1391672&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 Sep 28 21:57:55 2012 @@ -206,6 +206,7 @@ public class XMLConfiguration extends Ba } } + @Override public void setup() { constructHierarchy(rootNode, rootElement); if (status.size() > 0) { 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=1391672&r1=1391671&r2=1391672&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 Fri Sep 28 21:57:55 2012 @@ -36,6 +36,7 @@ public class XMLConfigurationFactory ext * @param source The InputSource. * @return The Configuration. */ + @Override public Configuration getConfiguration(InputSource source) { return new XMLConfiguration(source, configFile); } @@ -44,6 +45,7 @@ public class XMLConfigurationFactory ext * Returns the file suffixes for XML files. * @return An array of File extensions. */ + @Override public String[] getSupportedTypes() { return SUFFIXES; } 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=1391672&r1=1391671&r2=1391672&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 Sep 28 21:57:55 2012 @@ -86,14 +86,17 @@ public final class BurstFilter extends F } } + @Override public Result filter(Logger logger, Level level, Marker marker, String msg, Object[] params) { return filter(level); } + @Override public Result filter(Logger logger, Level level, Marker marker, Object msg, Throwable t) { return filter(level); } + @Override public Result filter(Logger logger, Level level, Marker marker, Message msg, Throwable t) { return filter(level); } @@ -149,6 +152,7 @@ public final class BurstFilter extends F } } + @Override public String toString() { return "level=" + level.toString() + ", interval=" + burstInterval + ", max=" + history.size(); } 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=1391672&r1=1391671&r2=1391672&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 Fri Sep 28 21:57:55 2012 @@ -54,14 +54,17 @@ public final class DynamicThresholdFilte return this.key; } + @Override public Result filter(Logger logger, Level level, Marker marker, String msg, Object[] params) { return filter(level); } + @Override public Result filter(Logger logger, Level level, Marker marker, Object msg, Throwable t) { return filter(level); } + @Override public Result filter(Logger logger, Level level, Marker marker, Message msg, Throwable t) { return filter(level); } 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=1391672&r1=1391671&r2=1391672&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 Fri Sep 28 21:57:55 2012 @@ -77,6 +77,7 @@ public class MapFilter extends FilterBas return match ? onMatch : onMismatch; } + @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("isAnd=").append(isAnd); 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=1391672&r1=1391671&r2=1391672&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 Fri Sep 28 21:57:55 2012 @@ -40,14 +40,17 @@ public final class MarkerFilter extends this.name = name; } + @Override public Result filter(Logger logger, Level level, Marker marker, String msg, Object[] params) { return filter(marker); } + @Override public Result filter(Logger logger, Level level, Marker marker, Object msg, Throwable t) { return filter(marker); } + @Override public Result filter(Logger logger, Level level, Marker marker, Message msg, Throwable t) { return filter(marker); } 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=1391672&r1=1391671&r2=1391672&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 Fri Sep 28 21:57:55 2012 @@ -48,14 +48,17 @@ public final class RegexFilter extends F this.useRawMessage = raw; } + @Override public Result filter(Logger logger, Level level, Marker marker, String msg, Object[] params) { return filter(msg); } + @Override public Result filter(Logger logger, Level level, Marker marker, Object msg, Throwable t) { return filter(msg.toString()); } + @Override public Result filter(Logger logger, Level level, Marker marker, Message msg, Throwable t) { String text = useRawMessage ? msg.getMessageFormat() : msg.getFormattedMessage(); return filter(text); 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=1391672&r1=1391671&r2=1391672&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 Fri Sep 28 21:57:55 2012 @@ -58,6 +58,7 @@ public final class StructuredDataFilter return Result.NEUTRAL; } + @Override protected Result filter(MapMessage message) { if (!(message instanceof StructuredDataMessage)) { return super.filter(message); 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=1391672&r1=1391671&r2=1391672&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 Fri Sep 28 21:57:55 2012 @@ -108,6 +108,7 @@ public class ThreadContextMapFilter exte return match ? onMatch : onMismatch; } + @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("isAnd=").append(isAnd); 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=1391672&r1=1391671&r2=1391672&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 Fri Sep 28 21:57:55 2012 @@ -43,14 +43,17 @@ public final class ThresholdFilter exten this.level = level; } + @Override public Result filter(Logger logger, Level level, Marker marker, String msg, Object[] params) { return filter(level); } + @Override public Result filter(Logger logger, Level level, Marker marker, Object msg, Throwable t) { return filter(level); } + @Override public Result filter(Logger logger, Level level, Marker marker, Message msg, Throwable t) { return filter(level); } Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java Fri Sep 28 21:57:55 2012 @@ -115,6 +115,7 @@ public class Interpolator implements Str return null; } + @Override public String toString() { StringBuilder sb = new StringBuilder(); for (String name : lookups.keySet()) { 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=1391672&r1=1391671&r2=1391672&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 Sep 28 21:57:55 2012 @@ -167,6 +167,7 @@ public class SocketServer extends Abstra interrupt(); } + @Override public void run() { boolean closed = false; try { Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/TCPSocketManager.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/TCPSocketManager.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/TCPSocketManager.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/TCPSocketManager.java Fri Sep 28 21:57:55 2012 @@ -132,6 +132,7 @@ public class TCPSocketManager extends Ab shutdown = true; } + @Override public void run() { while (!shutdown) { try { Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/CachedDateFormat.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/CachedDateFormat.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/CachedDateFormat.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/CachedDateFormat.java Fri Sep 28 21:57:55 2012 @@ -231,6 +231,7 @@ final class CachedDateFormat extends Dat * @param fieldPosition remains untouched. * @return the formatted time string. */ + @Override public StringBuffer format(Date date, StringBuffer sbuf, FieldPosition fieldPosition) { format(date.getTime(), sbuf); @@ -329,6 +330,7 @@ final class CachedDateFormat extends Dat * * @param timeZone TimeZone new timezone */ + @Override public void setTimeZone(final TimeZone timeZone) { formatter.setTimeZone(timeZone); previousTime = Long.MIN_VALUE; @@ -343,6 +345,7 @@ final class CachedDateFormat extends Dat * @param pos field position, unused. * @return parsed date, likely null. */ + @Override public Date parse(String s, ParsePosition pos) { return formatter.parse(s, pos); } @@ -352,6 +355,7 @@ final class CachedDateFormat extends Dat * * @return NumberFormat number formatter */ + @Override public NumberFormat getNumberFormat() { return formatter.getNumberFormat(); } 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=1391672&r1=1391671&r2=1391672&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 Fri Sep 28 21:57:55 2012 @@ -54,6 +54,7 @@ public final class ClassNamePatternConve * @param event event to format. * @param toAppendTo string buffer to which class name will be appended. */ + @Override public void format(final LogEvent event, final StringBuilder toAppendTo) { StackTraceElement element = event.getSource(); Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java Fri Sep 28 21:57:55 2012 @@ -125,6 +125,7 @@ public final class DatePatternConverter /** * {@inheritDoc} */ + @Override public void format(final LogEvent event, final StringBuilder output) { long timestamp = event.getMillis(); @@ -149,6 +150,7 @@ public final class DatePatternConverter /** * {@inheritDoc} */ + @Override public void format(final Object obj, final StringBuilder output) { if (obj instanceof Date) { format((Date) obj, output); Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java Fri Sep 28 21:57:55 2012 @@ -55,6 +55,7 @@ public final class ExtendedThrowablePatt /** * {@inheritDoc} */ + @Override public void format(final LogEvent event, final StringBuilder toAppendTo) { Throwable throwable = event.getThrown(); if (throwable != null) { Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/FileLocationPatternConverter.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/FileLocationPatternConverter.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/FileLocationPatternConverter.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/FileLocationPatternConverter.java Fri Sep 28 21:57:55 2012 @@ -52,6 +52,7 @@ public final class FileLocationPatternCo /** * {@inheritDoc} */ + @Override public void format(final LogEvent event, final StringBuilder output) { StackTraceElement element = event.getSource(); Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/FullLocationPatternConverter.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/FullLocationPatternConverter.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/FullLocationPatternConverter.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/FullLocationPatternConverter.java Fri Sep 28 21:57:55 2012 @@ -52,6 +52,7 @@ public final class FullLocationPatternCo /** * {@inheritDoc} */ + @Override public void format(final LogEvent event, final StringBuilder output) { StackTraceElement element = event.getSource(); Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LevelPatternConverter.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LevelPatternConverter.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LevelPatternConverter.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LevelPatternConverter.java Fri Sep 28 21:57:55 2012 @@ -54,6 +54,7 @@ public final class LevelPatternConverter /** * {@inheritDoc} */ + @Override public void format(final LogEvent event, final StringBuilder output) { output.append(event.getLevel().toString()); } @@ -61,6 +62,7 @@ public final class LevelPatternConverter /** * {@inheritDoc} */ + @Override public String getStyleClass(Object e) { if (e instanceof LogEvent) { Level level = ((LogEvent) e).getLevel(); Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LineLocationPatternConverter.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LineLocationPatternConverter.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LineLocationPatternConverter.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LineLocationPatternConverter.java Fri Sep 28 21:57:55 2012 @@ -52,6 +52,7 @@ public final class LineLocationPatternCo /** * {@inheritDoc} */ + @Override public void format(final LogEvent event, final StringBuilder output) { StackTraceElement element = event.getSource(); Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LineSeparatorPatternConverter.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LineSeparatorPatternConverter.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LineSeparatorPatternConverter.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LineSeparatorPatternConverter.java Fri Sep 28 21:57:55 2012 @@ -58,7 +58,8 @@ public final class LineSeparatorPatternC /** * {@inheritDoc} */ - public void format(LogEvent event, final StringBuilder toAppendTo) { + @Override +public void format(LogEvent event, final StringBuilder toAppendTo) { toAppendTo.append(lineSep); } } Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LiteralPatternConverter.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LiteralPatternConverter.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LiteralPatternConverter.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LiteralPatternConverter.java Fri Sep 28 21:57:55 2012 @@ -49,12 +49,14 @@ public final class LiteralPatternConvert /** * {@inheritDoc} */ + @Override public void format(final LogEvent event, final StringBuilder toAppendTo) { toAppendTo.append(substitute ? config.getSubst().replace(event, literal) : literal); } /** * {@inheritDoc} */ + @Override public void format(final Object obj, final StringBuilder output) { output.append(substitute ? config.getSubst().replace(literal) : literal); } Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LoggerPatternConverter.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LoggerPatternConverter.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LoggerPatternConverter.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LoggerPatternConverter.java Fri Sep 28 21:57:55 2012 @@ -59,6 +59,7 @@ public final class LoggerPatternConverte /** * {@inheritDoc} */ + @Override public void format(final LogEvent event, final StringBuilder toAppendTo) { toAppendTo.append(abbreviate(event.getLoggerName())); } Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MDCPatternConverter.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MDCPatternConverter.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MDCPatternConverter.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MDCPatternConverter.java Fri Sep 28 21:57:55 2012 @@ -61,6 +61,7 @@ public final class MDCPatternConverter e /** * {@inheritDoc} */ + @Override public void format(final LogEvent event, final StringBuilder toAppendTo) { Map contextMap = event.getContextMap(); // if there is no additional options, we output every single Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MapPatternConverter.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MapPatternConverter.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MapPatternConverter.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MapPatternConverter.java Fri Sep 28 21:57:55 2012 @@ -61,6 +61,7 @@ public final class MapPatternConverter e /** * {@inheritDoc} */ + @Override public void format(final LogEvent event, final StringBuilder toAppendTo) { MapMessage msg; if (event.getMessage() instanceof MapMessage) { Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MarkerPatternConverter.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MarkerPatternConverter.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MarkerPatternConverter.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MarkerPatternConverter.java Fri Sep 28 21:57:55 2012 @@ -48,6 +48,7 @@ public final class MarkerPatternConverte /** * {@inheritDoc} */ + @Override public void format(final LogEvent event, final StringBuilder toAppendTo) { Marker marker = event.getMarker(); if (marker != null) { Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java Fri Sep 28 21:57:55 2012 @@ -57,6 +57,7 @@ public final class MessagePatternConvert /** * {@inheritDoc} */ + @Override public void format(final LogEvent event, final StringBuilder toAppendTo) { Message msg = event.getMessage(); if (msg != null) { Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MethodLocationPatternConverter.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MethodLocationPatternConverter.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MethodLocationPatternConverter.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/MethodLocationPatternConverter.java Fri Sep 28 21:57:55 2012 @@ -52,6 +52,7 @@ public final class MethodLocationPattern /** * {@inheritDoc} */ + @Override public void format(final LogEvent event, final StringBuilder toAppendTo) { StackTraceElement element = event.getSource(); Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/NDCPatternConverter.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/NDCPatternConverter.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/NDCPatternConverter.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/NDCPatternConverter.java Fri Sep 28 21:57:55 2012 @@ -51,7 +51,8 @@ public final class NDCPatternConverter e /** * {@inheritDoc} */ - public void format(final LogEvent event, final StringBuilder toAppendTo) { + @Override +public void format(final LogEvent event, final StringBuilder toAppendTo) { toAppendTo.append(event.getContextStack()); } } Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/NameAbbreviator.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/NameAbbreviator.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/NameAbbreviator.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/NameAbbreviator.java Fri Sep 28 21:57:55 2012 @@ -143,6 +143,7 @@ public abstract class NameAbbreviator { /** * {@inheritDoc} */ + @Override public String abbreviate(final String buf) { return buf; } @@ -172,6 +173,7 @@ public abstract class NameAbbreviator { * @param buf The String to abbreviate. * @return the abbreviated String. */ + @Override public String abbreviate(final String buf) { // We substract 1 from 'len' when assigning to 'end' to avoid out of @@ -276,6 +278,7 @@ public abstract class NameAbbreviator { * @param buf buffer that abbreviated name is appended. * @param nameStart start of name. */ + @Override public String abbreviate(final String buf) { // // all non-terminal patterns are executed once Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacement.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacement.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacement.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacement.java Fri Sep 28 21:57:55 2012 @@ -56,6 +56,7 @@ public final class RegexReplacement { return pattern.matcher(msg).replaceAll(substitution); } + @Override public String toString() { return "replace(regex=" + pattern.pattern() + ", replacement=" + substitution + ")"; } Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacementConverter.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacementConverter.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacementConverter.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacementConverter.java Fri Sep 28 21:57:55 2012 @@ -86,6 +86,7 @@ public final class RegexReplacementConve /** * {@inheritDoc} */ + @Override public void format(final LogEvent event, final StringBuilder toAppendTo) { StringBuilder buf = new StringBuilder(); for (PatternFormatter formatter : formatters) { Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RelativeTimePatternConverter.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RelativeTimePatternConverter.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RelativeTimePatternConverter.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RelativeTimePatternConverter.java Fri Sep 28 21:57:55 2012 @@ -55,6 +55,7 @@ public class RelativeTimePatternConverte /** * {@inheritDoc} */ + @Override public void format(final LogEvent event, final StringBuilder toAppendTo) { long timestamp = event.getMillis(); Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java Fri Sep 28 21:57:55 2012 @@ -56,6 +56,7 @@ public final class RootThrowablePatternC /** * {@inheritDoc} */ + @Override public void format(final LogEvent event, final StringBuilder toAppendTo) { Throwable throwable = event.getThrown(); if (throwable != null) { Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/SequenceNumberPatternConverter.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/SequenceNumberPatternConverter.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/SequenceNumberPatternConverter.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/SequenceNumberPatternConverter.java Fri Sep 28 21:57:55 2012 @@ -56,6 +56,7 @@ public final class SequenceNumberPattern /** * {@inheritDoc} */ + @Override public void format(final LogEvent event, final StringBuilder toAppendTo) { toAppendTo.append(Long.toString(sequence.incrementAndGet())); } Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/ThreadPatternConverter.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/ThreadPatternConverter.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/ThreadPatternConverter.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/ThreadPatternConverter.java Fri Sep 28 21:57:55 2012 @@ -52,6 +52,7 @@ public final class ThreadPatternConverte /** * {@inheritDoc} */ + @Override public void format(final LogEvent event, final StringBuilder toAppendTo) { toAppendTo.append(event.getThreadName()); } Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java Fri Sep 28 21:57:55 2012 @@ -90,6 +90,7 @@ public class ThrowablePatternConverter e /** * {@inheritDoc} */ + @Override public void format(final LogEvent event, final StringBuilder toAppendTo) { Throwable t = event.getThrown(); @@ -119,6 +120,7 @@ public class ThrowablePatternConverter e * * @return true. */ + @Override public boolean handlesThrowable() { return true; } Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/UUIDPatternConverter.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/UUIDPatternConverter.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/UUIDPatternConverter.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/UUIDPatternConverter.java Fri Sep 28 21:57:55 2012 @@ -59,6 +59,7 @@ public final class UUIDPatternConverter /** * {@inheritDoc} */ + @Override public void format(final LogEvent event, final StringBuilder toAppendTo) { UUID uuid = isRandom ? UUID.randomUUID() : UUIDUtil.getTimeBasedUUID(); toAppendTo.append(uuid.toString()); Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/FilterPerformanceComparison.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/FilterPerformanceComparison.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/FilterPerformanceComparison.java (original) +++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/FilterPerformanceComparison.java Fri Sep 28 21:57:55 2012 @@ -151,6 +151,7 @@ public class FilterPerformanceComparison this.index = index; } + @Override public void run() { results[index] = isLog4j ? log4j2(count) : logback(count); } Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/BasicConfigurationFactory.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/BasicConfigurationFactory.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/BasicConfigurationFactory.java (original) +++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/BasicConfigurationFactory.java Fri Sep 28 21:57:55 2012 @@ -30,6 +30,7 @@ import java.net.URI; */ public class BasicConfigurationFactory extends ConfigurationFactory { + @Override public Configuration getConfiguration(String name, URI configLocation) { return new BasicConfiguration(); } Added: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/CollectionLoggingTest.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/CollectionLoggingTest.java?rev=1391672&view=auto ============================================================================== --- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/CollectionLoggingTest.java (added) +++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/CollectionLoggingTest.java Fri Sep 28 21:57:55 2012 @@ -0,0 +1,50 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache license, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the license for the specific language governing permissions and + * limitations under the license. + */ +package org.apache.logging.log4j.core; + +import java.net.NetworkInterface; +import java.net.SocketException; +import java.nio.charset.Charset; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.Test; + +/** + * Work in progress. + */ +public class CollectionLoggingTest { + + @Test + public void testSystemProperties() { + Logger logger = LogManager.getLogger(CollectionLoggingTest.class.getName()); + logger.error(System.getProperties()); + } + + @Test + public void testNetworkInterfaces() throws SocketException { + Logger logger = LogManager.getLogger(CollectionLoggingTest.class.getName()); + logger.error(NetworkInterface.getNetworkInterfaces()); + } + + @Test + public void testAvailableCharsets() throws SocketException { + Logger logger = LogManager.getLogger(CollectionLoggingTest.class.getName()); + logger.error(Charset.availableCharsets()); + } + +} Propchange: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/CollectionLoggingTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/CollectionLoggingTest.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/SimplePerfTest.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/SimplePerfTest.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/SimplePerfTest.java (original) +++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/SimplePerfTest.java Fri Sep 28 21:57:55 2012 @@ -125,6 +125,7 @@ public class SimplePerfTest { private int low = 5; private int high = 55; + @Override public int nextInt() { high = 36969 * (high & 65535) + (high >> 16); low = 18000 * (low & 65535) + (low >> 16); Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/ThreadedTest.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/ThreadedTest.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/ThreadedTest.java (original) +++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/ThreadedTest.java Fri Sep 28 21:57:55 2012 @@ -121,6 +121,7 @@ public class ThreadedTest { return counter; } + @Override public String toString() { return "state=" + getState(); } Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/Timer.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/Timer.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/Timer.java (original) +++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/Timer.java Fri Sep 28 21:57:55 2012 @@ -137,6 +137,7 @@ public class Timer implements Serializab /** * Return the String representation of the timer based upon its current state */ + @Override public String toString() { StringBuilder result = new StringBuilder("Timer ").append(m_name); @@ -226,6 +227,7 @@ public class Timer implements Serializab return result.toString(); } + @Override public boolean equals(Object o) { if (this == o) return true; if (!(o instanceof Timer)) return false; @@ -240,6 +242,7 @@ public class Timer implements Serializab return true; } + @Override public int hashCode() { int result; result = (m_name != null ? m_name.hashCode() : 0); Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java (original) +++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java Fri Sep 28 21:57:55 2012 @@ -142,6 +142,7 @@ public class SocketAppenderTest { thread.interrupt(); } + @Override public void run() { this.thread = Thread.currentThread(); byte[] bytes = new byte[4096]; @@ -175,6 +176,7 @@ public class SocketAppenderTest { interrupt(); } + @Override public void run() { try { Socket socket = sock.accept(); Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTest.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTest.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTest.java (original) +++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTest.java Fri Sep 28 21:57:55 2012 @@ -209,6 +209,7 @@ public class SyslogAppenderTest { thread.interrupt(); } + @Override public void run() { this.thread = Thread.currentThread(); byte[] bytes = new byte[4096]; @@ -243,6 +244,7 @@ public class SyslogAppenderTest { thread.interrupt(); } + @Override public void run() { this.thread = Thread.currentThread(); try { Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java (original) +++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java Fri Sep 28 21:57:55 2012 @@ -60,6 +60,7 @@ public class OnStartupTriggeringPolicyTe this.timestamp = timestamp; } + @Override public long getFileTime() { return timestamp; } Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/helpers/UUIDTest.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/helpers/UUIDTest.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/helpers/UUIDTest.java (original) +++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/helpers/UUIDTest.java Fri Sep 28 21:57:55 2012 @@ -111,6 +111,7 @@ public class UUIDTest { this.elapsed = elapsed; } + @Override public void run() { int pos = index * count; long start = System.nanoTime(); Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueTest.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueTest.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueTest.java (original) +++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueTest.java Fri Sep 28 21:57:55 2012 @@ -128,6 +128,7 @@ public class JMSQueueTest { super(onMatch, onMismatch); } + @Override public Result filter(LogEvent event) { StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace(); for (StackTraceElement element : stackTrace) { Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/net/JMSTopicTest.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/net/JMSTopicTest.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/net/JMSTopicTest.java (original) +++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/net/JMSTopicTest.java Fri Sep 28 21:57:55 2012 @@ -128,6 +128,7 @@ public class JMSTopicTest { super(onMatch, onMismatch); } + @Override public Result filter(LogEvent event) { StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace(); for (StackTraceElement element : stackTrace) { Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/net/SocketServerTest.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/net/SocketServerTest.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/net/SocketServerTest.java (original) +++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/net/SocketServerTest.java Fri Sep 28 21:57:55 2012 @@ -124,6 +124,7 @@ public class SocketServerTest { super(onMatch, onMismatch); } + @Override public Filter.Result filter(LogEvent event) { return event.getThreadName().equals(Thread.currentThread().getName()) ? onMatch : onMismatch; } Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/InMemoryAppender.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/InMemoryAppender.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/InMemoryAppender.java (original) +++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/InMemoryAppender.java Fri Sep 28 21:57:55 2012 @@ -32,6 +32,7 @@ public class InMemoryAppender extends Ou super(name, layout, filters, handleException, true, new InMemoryManager(name)); } + @Override public String toString() { return getManager().toString(); } @@ -42,6 +43,7 @@ public class InMemoryAppender extends Ou super(new ByteArrayOutputStream(), name); } + @Override public String toString() { return getOutputStream().toString(); } Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java?rev=1391672&r1=1391671&r2=1391672&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java (original) +++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java Fri Sep 28 21:57:55 2012 @@ -120,6 +120,7 @@ public class ListAppender extends Append } } + @Override public void stop() { super.stop(); Layout layout = getLayout();