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 95FECD7ED for ; Wed, 10 Oct 2012 16:06:13 +0000 (UTC) Received: (qmail 93684 invoked by uid 500); 10 Oct 2012 16:06:13 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 93655 invoked by uid 500); 10 Oct 2012 16:06:13 -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 93642 invoked by uid 99); 10 Oct 2012 16:06:13 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Oct 2012 16:06:13 +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; Wed, 10 Oct 2012 16:06:01 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C604C238896F; Wed, 10 Oct 2012 16:05:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1396660 - in /logging/log4j/log4j2/trunk: api/src/main/java/org/apache/logging/log4j/ api/src/main/java/org/apache/logging/log4j/message/ api/src/main/java/org/apache/logging/log4j/spi/ api/src/main/java/org/apache/logging/log4j/status/ ap... Date: Wed, 10 Oct 2012 16:05:12 -0000 To: commits@logging.apache.org From: ggregory@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121010160515.C604C238896F@eris.apache.org> Author: ggregory Date: Wed Oct 10 16:05:10 2012 New Revision: 1396660 URL: http://svn.apache.org/viewvc?rev=1396660&view=rev Log: Javadoc: use the active voice, "Return foo..." -> "Returns foo..." Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/LogManager.java logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/ThreadContext.java logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/LocalizedMessage.java logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MapMessage.java logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ObjectMessage.java logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/SimpleMessage.java logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StringFormattedMessage.java logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/LoggerContext.java logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/status/StatusData.java logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/Timer.java logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Filter.java 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/LoggerContext.java logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoversPlugin.java logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.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/RollingFileAppender.java logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/PatternProcessor.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/routing/Route.java logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/Routes.java logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Configuration.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/LoggerConfig.java logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Property.java logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/XMLConfigurationFactory.java logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/ResolverUtil.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/CompositeFilter.java logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/KeyValuePair.java logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/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/impl/StackTracePackageElement.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/net/Priority.java logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/Severity.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/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/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/RelativeTimePatternConverter.java logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/selector/ContextSelector.java logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/Timer.java logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java logging/log4j/log4j2/trunk/flume-og/src/main/java/org/apache/logging/log4j/flumeog/appender/FlumeAvroManager.java logging/log4j/log4j2/trunk/flume-og/src/main/java/org/apache/logging/log4j/flumeog/appender/FlumeEvent.java logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/Priority.java logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/LogManager.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/LogManager.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/LogManager.java (original) +++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/LogManager.java Wed Oct 10 16:05:10 2012 @@ -48,7 +48,7 @@ public class LogManager { private static final Logger logger = StatusLogger.getLogger(); /** - * Prevent instantiation + * Prevents instantiation */ protected LogManager() { } @@ -111,7 +111,7 @@ public class LogManager { } /** - * Return the LoggerContextFactory. + * Returns the LoggerContextFactory. * @return The LoggerContextFactory. */ public static LoggerContextFactory getFactory() { @@ -119,7 +119,7 @@ public class LogManager { } /** - * Return a Logger with the specified name. + * Returns a Logger with the specified name. * * @param name The logger name. * @return The Logger. @@ -130,7 +130,7 @@ public class LogManager { } /** - * Return a Logger using the fully qualified name of the Class as the Logger name. + * Returns a Logger using the fully qualified name of the Class as the Logger name. * @param clazz The Class whose name should be used as the Logger name. * @return The Logger. */ @@ -139,7 +139,7 @@ public class LogManager { } /** - * Return a Logger with the specified name. + * Returns a Logger with the specified name. * * @param fqcn The fully qualified class name of the class that this method is a member of. * @param name The logger name. @@ -251,6 +251,4 @@ public class LogManager { return false; } - - } Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/ThreadContext.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/ThreadContext.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/ThreadContext.java (original) +++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/ThreadContext.java Wed Oct 10 16:05:10 2012 @@ -152,7 +152,7 @@ public final class ThreadContext { } /** - * Return true if the Map is empty. + * Returns true if the Map is empty. * @return true if the Map is empty, false otherwise. */ public static boolean isEmpty() { @@ -168,7 +168,7 @@ public final class ThreadContext { } /** - * Return a copy of this thread's stack. + * Returns a copy of this thread's stack. * @return A copy of this thread's stack. */ public static ContextStack cloneStack() { @@ -329,14 +329,14 @@ public final class ThreadContext { void clear(); /** - * Return the element at the top of the stack. + * Returns the element at the top of the stack. * @return The element at the top of the stack. * @throws java.util.NoSuchElementException if the stack is empty. */ String pop(); /** - * Return the element at the top of the stack without removing it or null if the stack is empty. + * Returns the element at the top of the stack without removing it or null if the stack is empty. * @return the element at the top of the stack or null if the stack is empty. */ String peek(); @@ -348,7 +348,7 @@ public final class ThreadContext { void push(String message); /** - * Return the number of elements in the stack. + * Returns the number of elements in the stack. * @return the number of elements in the stack. */ int getDepth(); Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/LocalizedMessage.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/LocalizedMessage.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/LocalizedMessage.java (original) +++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/LocalizedMessage.java Wed Oct 10 16:05:10 2012 @@ -196,7 +196,7 @@ public class LocalizedMessage extends Pa } /** - * Return the name of the Logger. + * Returns the name of the Logger. * @return the name of the Logger. */ public String getLoggerName() { @@ -210,7 +210,7 @@ public class LocalizedMessage extends Pa } /** - * Return the formatted message after looking up the format in the resource bundle. + * Returns the formatted message after looking up the format in the resource bundle. * @param messagePattern The key for the resource bundle or the pattern if the bundle doesn't contain the key. * @param args The parameters. * @return The formatted message String. Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MapMessage.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MapMessage.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MapMessage.java (original) +++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MapMessage.java Wed Oct 10 16:05:10 2012 @@ -68,7 +68,7 @@ public class MapMessage implements Multi } /** - * Return the data elements as if they were parameters on the logging event. + * Returns the data elements as if they were parameters on the logging event. * @return the data elements. */ public Object[] getParameters() { @@ -76,7 +76,7 @@ public class MapMessage implements Multi } /** - * Return the message. + * Returns the message. * @return the message. */ public String getFormat() { @@ -84,7 +84,7 @@ public class MapMessage implements Multi } /** - * Return the message data as an unmodifiable Map. + * Returns the message data as an unmodifiable Map. * @return the message data as an unmodifiable map. */ public Map getData() { Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ObjectMessage.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ObjectMessage.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ObjectMessage.java (original) +++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ObjectMessage.java Wed Oct 10 16:05:10 2012 @@ -42,7 +42,7 @@ public class ObjectMessage implements Me } /** - * Return the formatted object message. + * Returns the formatted object message. * @return the formatted object message. */ public String getFormattedMessage() { Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java (original) +++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java Wed Oct 10 16:05:10 2012 @@ -161,7 +161,7 @@ public class ParameterizedMessage implem } /** - * Return the formatted message. + * Returns the formatted message. * @return the formatted message. */ public String getFormattedMessage() { Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/SimpleMessage.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/SimpleMessage.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/SimpleMessage.java (original) +++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/SimpleMessage.java Wed Oct 10 16:05:10 2012 @@ -42,7 +42,7 @@ public class SimpleMessage implements Me } /** - * Return the message. + * Returns the message. * @return the message. */ public String getFormattedMessage() { @@ -50,7 +50,7 @@ public class SimpleMessage implements Me } /** - * Return the message. + * Returns the message. * @return the message. */ public String getFormat() { Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StringFormattedMessage.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StringFormattedMessage.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StringFormattedMessage.java (original) +++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StringFormattedMessage.java Wed Oct 10 16:05:10 2012 @@ -48,7 +48,7 @@ public class StringFormattedMessage impl } /** - * Return the formatted message. + * Returns the formatted message. * @return the formatted message. */ public String getFormattedMessage() { Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java (original) +++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java Wed Oct 10 16:05:10 2012 @@ -156,7 +156,7 @@ public class StructuredDataId implements } /** - * Return the StructuredDataId name. + * Returns the StructuredDataId name. * @return the StructuredDataId name. */ public String getName() { @@ -164,7 +164,7 @@ public class StructuredDataId implements } /** - * Return the enterprise number. + * Returns the enterprise number. * @return the enterprise number. */ public int getEnterpriseNumber() { Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java (original) +++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java Wed Oct 10 16:05:10 2012 @@ -119,7 +119,7 @@ public class StructuredDataMessage exten } /** - * Return the supported formats. + * Returns the supported formats. * @return An array of the supported format names. */ @Override @@ -133,7 +133,7 @@ public class StructuredDataMessage exten } /** - * Return the id. + * Returns the id. * @return the StructuredDataId. */ public StructuredDataId getId() { @@ -171,7 +171,7 @@ public class StructuredDataMessage exten this.type = type; } /** - * Return the message. + * Returns the message. * @return the message. */ @Override Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java (original) +++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java Wed Oct 10 16:05:10 2012 @@ -78,7 +78,7 @@ public class ThreadDumpMessage implement } /** - * Return the ThreadDump in printable format. + * Returns the ThreadDump in printable format. * @return the ThreadDump suitable for logging. */ public String getFormattedMessage() { @@ -143,7 +143,7 @@ public class ThreadDumpMessage implement } /** - * Return a ThreadDumpMessage using the data in the proxy. + * Returns a ThreadDumpMessage using the data in the proxy. * @return a ThreadDumpMessage. */ protected Object readResolve() { Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/LoggerContext.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/LoggerContext.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/LoggerContext.java (original) +++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/LoggerContext.java Wed Oct 10 16:05:10 2012 @@ -24,7 +24,7 @@ import org.apache.logging.log4j.Logger; public interface LoggerContext { /** - * Return a Logger. + * Returns a Logger. * @param name The name of the Logger to return. * @return The logger with the specified name. */ Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/status/StatusData.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/status/StatusData.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/status/StatusData.java (original) +++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/status/StatusData.java Wed Oct 10 16:05:10 2012 @@ -55,7 +55,7 @@ public class StatusData { } /** - * Return the event's timestamp. + * Returns the event's timestamp. * @return The event's timestamp. */ public long getTimestamp() { Modified: logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/Timer.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/Timer.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/Timer.java (original) +++ logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/Timer.java Wed Oct 10 16:05:10 2012 @@ -125,7 +125,7 @@ public class Timer implements Serializab } /** - * Return the name of the last operation performed on this timer (Start, Stop, Pause or + * Returns the name of the last operation performed on this timer (Start, Stop, Pause or * Resume). * @return the string representing the last operation performed. */ @@ -135,7 +135,7 @@ public class Timer implements Serializab } /** - * Return the String representation of the timer based upon its current state + * Returns the String representation of the timer based upon its current state */ @Override public String toString() Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Filter.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Filter.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Filter.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Filter.java Wed Oct 10 16:05:10 2012 @@ -50,12 +50,12 @@ public interface Filter { } /** - * Return the result that should be returned when the filter does not match the event. + * Returns the result that should be returned when the filter does not match the event. * @return the Result that should be returned when the filter does not match the event. */ Result getOnMismatch(); /** - * Return the result that should be returned when the filter matches the event. + * Returns the result that should be returned when the filter matches the event. * @return the Result that should be returned when the filter matches the event. */ Result getOnMatch(); 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=1396660&r1=1396659&r2=1396660&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 Wed Oct 10 16:05:10 2012 @@ -67,7 +67,7 @@ public class Logger extends AbstractLogg } /** - * Return the parent of this Logger. If it doesn't already exist return a temporary Logger. + * Returns the parent of this Logger. If it doesn't already exist return a temporary Logger. * @return The parent Logger. */ public Logger getParent() { @@ -82,7 +82,7 @@ public class Logger extends AbstractLogg } /** - * Return the LoggerContext this Logger is associated with. + * Returns the LoggerContext this Logger is associated with. * @return the LoggerContext. */ public LoggerContext getContext() { @@ -100,7 +100,7 @@ public class Logger extends AbstractLogg } /** - * Return the Level associated with the Logger. + * Returns the Level associated with the Logger. * @return the Level associate with the Logger. */ public Level getLevel() { 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=1396660&r1=1396659&r2=1396660&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 Wed Oct 10 16:05:10 2012 @@ -179,7 +179,7 @@ public class LoggerContext implements or } /** - * Return the external context. + * Returns the external context. * @return The external context. */ public Object getExternalContext() { @@ -213,7 +213,7 @@ public class LoggerContext implements or } /** - * Return the current Configuration. The Configuration will be replaced when a reconfigure occurs. + * Returns the current Configuration. The Configuration will be replaced when a reconfigure occurs. * @return The Configuration. */ public Configuration getConfiguration() { Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java Wed Oct 10 16:05:10 2012 @@ -75,7 +75,7 @@ public abstract class AbstractAppender e } /** - * Return the ErrorHandler, if any. + * Returns the ErrorHandler, if any. * @return The ErrorHandler. */ public ErrorHandler getHandler() { Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java Wed Oct 10 16:05:10 2012 @@ -122,7 +122,7 @@ public abstract class AbstractManager { } /** - * Return the name of the Manager. + * Returns the name of the Manager. * @return The name of the Manager. */ public String getName() { Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoversPlugin.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoversPlugin.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoversPlugin.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoversPlugin.java Wed Oct 10 16:05:10 2012 @@ -38,7 +38,7 @@ public final class FailoversPlugin { } /** - * Return the appender references. + * Returns the appender references. * @param refs The references to return. * @return The appender references. */ Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java Wed Oct 10 16:05:10 2012 @@ -39,7 +39,7 @@ public final class FileAppender extends } /** - * Return the file name this appender is associated with. + * Returns the file name this appender is associated with. * @return The File name. */ public String getFileName() { 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=1396660&r1=1396659&r2=1396660&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 Wed Oct 10 16:05:10 2012 @@ -43,7 +43,7 @@ public class FileManager extends OutputS } /** - * Return the FileManager. + * Returns the FileManager. * @param fileName The name of the file to manage. * @param append true if the file should be appended to, false if it should be overwritten. * @param locking true if the file should be locked while writing, false otherwise. @@ -87,7 +87,7 @@ public class FileManager extends OutputS } /** - * Return the name of the File being managed. + * Returns the name of the File being managed. * @return The name of the File being managed. */ public String getFileName() { @@ -95,7 +95,7 @@ public class FileManager extends OutputS } /** - * Return the append status. + * Returns the append status. * @return true if the file will be appended to, false if it is overwritten. */ public boolean isAppend() { @@ -103,7 +103,7 @@ public class FileManager extends OutputS } /** - * Return the lock status. + * Returns the lock status. * @return true if the file will be locked when writing, false otherwise. */ public boolean 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=1396660&r1=1396659&r2=1396660&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 Wed Oct 10 16:05:10 2012 @@ -83,7 +83,7 @@ public class OutputStreamManager extends } /** - * Return the status of the stream. + * Returns the status of the stream. * @return true if the stream is open, false if it is not. */ public boolean isOpen() { Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java Wed Oct 10 16:05:10 2012 @@ -65,7 +65,7 @@ public final class RollingFileAppender e } /** - * Return the File name for the Appender. + * Returns the File name for the Appender. * @return The file name. */ public String getFileName() { Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/PatternProcessor.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/PatternProcessor.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/PatternProcessor.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/PatternProcessor.java Wed Oct 10 16:05:10 2012 @@ -71,7 +71,7 @@ public class PatternProcessor { } /** - * Return the next potential rollover time. + * Returns the next potential rollover time. * @param current The current time. * @param increment The increment to the next time. * @return the next potential rollover time. 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=1396660&r1=1396659&r2=1396660&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 Wed Oct 10 16:05:10 2012 @@ -51,7 +51,7 @@ public class RollingFileManager extends } /** - * Return a RollingFileManager. + * Returns a RollingFileManager. * @param fileName The file name. * @param pattern The pattern for rolling file. * @param append true if the file should be appended to. @@ -72,7 +72,7 @@ public class RollingFileManager extends } /** - * Return the current size of the file. + * Returns the current size of the file. * @return The size of the file in bytes. */ public long getFileSize() { @@ -80,7 +80,7 @@ public class RollingFileManager extends } /** - * Return the time the file was created. + * Returns the time the file was created. * @return The time the file was created. */ public long getFileTime() { @@ -107,7 +107,7 @@ public class RollingFileManager extends } /** - * Return the pattern processor. + * Returns the pattern processor. * @return The PatternProcessor. */ public PatternProcessor getProcessor() { Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/Route.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/Route.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/Route.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/Route.java Wed Oct 10 16:05:10 2012 @@ -42,7 +42,7 @@ public final class Route { } /** - * Return the Dynamic Appender Node. + * Returns the Dynamic Appender Node. * @return The Node. */ public Node getNode() { @@ -58,7 +58,7 @@ public final class Route { } /** - * Return the key for this Route. + * Returns the key for this Route. * @return the key for this Route. */ public String getKey() { Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/Routes.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/Routes.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/Routes.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/Routes.java Wed Oct 10 16:05:10 2012 @@ -40,7 +40,7 @@ public final class Routes { } /** - * Return the pattern. + * Returns the pattern. * @return the pattern. */ public String getPattern() { @@ -48,7 +48,7 @@ public final class Routes { } /** - * Return the array of Route elements. + * Returns the array of Route elements. * @return an array of Route elements. */ public Route[] getRoutes() { Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java Wed Oct 10 16:05:10 2012 @@ -52,7 +52,7 @@ public class AppenderControl extends Fil } /** - * Return the Appender. + * Returns the Appender. * @return the Appender. */ public Appender getAppender() { Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java Wed Oct 10 16:05:10 2012 @@ -216,7 +216,7 @@ public class BaseConfiguration extends F } /** - * Return the name of the configuration. + * Returns the name of the configuration. * @return the name of the configuration. */ public String getName() { @@ -240,7 +240,7 @@ public class BaseConfiguration extends F } /** - * Return the Appender with the specified name. + * Returns the Appender with the specified name. * @param name The name of the Appender. * @return the Appender with the specified name or null if the Appender cannot be located. */ @@ -249,7 +249,7 @@ public class BaseConfiguration extends F } /** - * Return a Map containing all the Appenders and their name. + * Returns a Map containing all the Appenders and their name. * @return A Map containing each Appender's naem and the Appender object. */ public Map getAppenders() { @@ -388,7 +388,7 @@ public class BaseConfiguration extends F } /** - * Return a Map of all the LoggerConfigs. + * Returns a Map of all the LoggerConfigs. * @return a Map with each entry containing the name of the Logger and the LoggerConfig. */ public Map getLoggers() { Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Configuration.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Configuration.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Configuration.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Configuration.java Wed Oct 10 16:05:10 2012 @@ -31,7 +31,7 @@ import java.util.Map; public interface Configuration extends Filtering { /** - * Return the configuration name. + * Returns the configuration name. * @return the name of the configuration. */ String getName(); @@ -45,7 +45,7 @@ public interface Configuration extends F LoggerConfig getLoggerConfig(String name); /** - * Return a Map containing all the Appenders and their name. + * Returns a Map containing all the Appenders and their name. * @return A Map containing each Appender's naem and the Appender object. */ Map getAppenders(); 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=1396660&r1=1396659&r2=1396660&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 Wed Oct 10 16:05:10 2012 @@ -90,7 +90,7 @@ public abstract class ConfigurationFacto protected File configFile = null; /** - * Return the ConfigurationFactory. + * Returns the ConfigurationFactory. * @return the ConfigurationFactory. */ public static ConfigurationFactory getInstance() { @@ -171,7 +171,7 @@ public abstract class ConfigurationFacto public abstract Configuration getConfiguration(InputSource source); /** - * Return the Configuration. + * Returns the Configuration. * @param name The configuration name. * @param configLocation The configuration location. * @return The Configuration. 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=1396660&r1=1396659&r2=1396660&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 Wed Oct 10 16:05:10 2012 @@ -103,7 +103,7 @@ public class LoggerConfig extends Filter } /** - * Return the name of the LoggerConfig. + * Returns the name of the LoggerConfig. * @return the name of the LoggerConfig. */ public String getName() { @@ -119,7 +119,7 @@ public class LoggerConfig extends Filter } /** - * Return the parent of this LoggerConfig. + * Returns the parent of this LoggerConfig. * @return the LoggerConfig that is the parent of this one. */ public LoggerConfig getParent() { @@ -148,7 +148,7 @@ public class LoggerConfig extends Filter } /** - * Return all Appenders as a Map. + * Returns all Appenders as a Map. * @return a Map with the Appender name as the key and the Appender as the value. */ public Map getAppenders() { @@ -184,7 +184,7 @@ public class LoggerConfig extends Filter } /** - * Return the Appender references. + * Returns the Appender references. * @return a List of all the Appender names attached to this LoggerConfig. */ public List getAppenderRefs() { @@ -200,7 +200,7 @@ public class LoggerConfig extends Filter } /** - * Return the logging Level. + * Returns the logging Level. * @return the logging Level. */ public Level getLevel() { @@ -208,7 +208,7 @@ public class LoggerConfig extends Filter } /** - * Return the LogEventFactory. + * Returns the LogEventFactory. * @return the LogEventFactory. */ public LogEventFactory getLogEventFactory() { @@ -224,7 +224,7 @@ public class LoggerConfig extends Filter } /** - * Return the valid of the additive flag. + * Returns the valid of the additive flag. * @return true if the LoggerConfig is additive, false otherwise. */ public boolean isAdditive() { Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Property.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Property.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Property.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Property.java Wed Oct 10 16:05:10 2012 @@ -40,7 +40,7 @@ public final class Property { } /** - * Return the property name. + * Returns the property name. * @return the property name. */ public String getName() { @@ -48,7 +48,7 @@ public final class Property { } /** - * Return the property value. + * Returns the property value. * @return the value of the property. */ public String getValue() { 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=1396660&r1=1396659&r2=1396660&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 Wed Oct 10 16:05:10 2012 @@ -32,7 +32,7 @@ public class XMLConfigurationFactory ext public static final String[] SUFFIXES = new String[] {".xml", "*"}; /** - * Return the Configuration. + * Returns the Configuration. * @param source The InputSource. * @return The Configuration. */ Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/ResolverUtil.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/ResolverUtil.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/ResolverUtil.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/ResolverUtil.java Wed Oct 10 16:05:10 2012 @@ -99,7 +99,7 @@ public class ResolverUtil { } /** - * Return the matching resources. + * Returns the matching resources. * @return A Set of URIs that match the criteria. */ public Set getResources() { 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=1396660&r1=1396659&r2=1396660&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 Wed Oct 10 16:05:10 2012 @@ -89,7 +89,7 @@ public abstract class AbstractFilter imp } /** - * Return the Result to be returned when a match does not occur. + * Returns the Result to be returned when a match does not occur. * @return the onMismatch Result. */ public final Result getOnMismatch() { @@ -97,7 +97,7 @@ public abstract class AbstractFilter imp } /** - * Return the Result to be returned when a match occurs. + * Returns the Result to be returned when a match occurs. * @return the onMatch Result. */ public final Result getOnMatch() { 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=1396660&r1=1396659&r2=1396660&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 Wed Oct 10 16:05:10 2012 @@ -110,7 +110,7 @@ public final class CompositeFilter imple } /** - * Return the result that should be returned when the filter does not match the event. + * Returns the result that should be returned when the filter does not match the event. * * @return the Result that should be returned when the filter does not match the event. */ @@ -119,7 +119,7 @@ public final class CompositeFilter imple } /** - * Return the result that should be returned when the filter matches the event. + * Returns the result that should be returned when the filter matches the event. * * @return the Result that should be returned when the filter matches the event. */ Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java Wed Oct 10 16:05:10 2012 @@ -37,7 +37,7 @@ public class Filterable implements Filte } /** - * Return the Filter. + * Returns the Filter. * @return the Filter. */ public Filter getFilter() { Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/KeyValuePair.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/KeyValuePair.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/KeyValuePair.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/KeyValuePair.java Wed Oct 10 16:05:10 2012 @@ -40,7 +40,7 @@ public class KeyValuePair { } /** - * Return the key. + * Returns the key. * @return the key. */ public String getKey() { @@ -48,7 +48,7 @@ public class KeyValuePair { } /** - * Return the value. + * Returns the value. * @return The value. */ public String getValue() { 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=1396660&r1=1396659&r2=1396660&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 Wed Oct 10 16:05:10 2012 @@ -246,7 +246,7 @@ public final class Loader { } /** - * Return the ClassLoader to use. + * Returns the ClassLoader to use. * @return the ClassLoader. */ public static ClassLoader getClassLoader() { 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=1396660&r1=1396659&r2=1396660&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 Wed Oct 10 16:05:10 2012 @@ -54,7 +54,7 @@ public class Log4jContextFactory impleme } /** - * Return the ContextSelector. + * Returns the ContextSelector. * @return The ContextSelector. */ public ContextSelector getSelector() { 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=1396660&r1=1396659&r2=1396660&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 Wed Oct 10 16:05:10 2012 @@ -106,7 +106,7 @@ public class Log4jLogEvent implements Lo } /** - * Return the name of the Logger used to generate the event. + * Returns the name of the Logger used to generate the event. * @return The Logger name. */ public String getLoggerName() { @@ -114,7 +114,7 @@ public class Log4jLogEvent implements Lo } /** - * Return the Message associated with the event. + * Returns the Message associated with the event. * @return The Message. */ public Message getMessage() { @@ -122,7 +122,7 @@ public class Log4jLogEvent implements Lo } /** - * Return the name of the Thread on which the event was generated. + * Returns the name of the Thread on which the event was generated. * @return The name of the Thread. */ public String getThreadName() { @@ -133,7 +133,7 @@ public class Log4jLogEvent implements Lo } /** - * Return the time in milliseconds from the epoch when the event occurred. + * Returns the time in milliseconds from the epoch when the event occurred. * @return The time the event occurred. */ public long getMillis() { @@ -141,7 +141,7 @@ public class Log4jLogEvent implements Lo } /** - * Return the Throwable associated with the event, or null. + * Returns the Throwable associated with the event, or null. * @return The Throwable associated with the event. */ public Throwable getThrown() { @@ -149,7 +149,7 @@ public class Log4jLogEvent implements Lo } /** - * Return the Marker associated with the event, or null. + * Returns the Marker associated with the event, or null. * @return the Marker associated with the event. */ public Marker getMarker() { @@ -181,7 +181,7 @@ public class Log4jLogEvent implements Lo } /** - * Return the StackTraceElement for the caller. This will be the entry that occurs right + * Returns the StackTraceElement for the caller. This will be the entry that occurs right * before the first occurrence of FQCN as a class name. * @return the StackTraceElement for the caller. */ @@ -284,7 +284,7 @@ public class Log4jLogEvent implements Lo } /** - * Return a Log4jLogEvent using the data in the proxy. + * Returns a Log4jLogEvent using the data in the proxy. * @return Log4jLogEvent. */ protected Object readResolve() { Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/StackTracePackageElement.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/StackTracePackageElement.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/StackTracePackageElement.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/StackTracePackageElement.java Wed Oct 10 16:05:10 2012 @@ -44,7 +44,7 @@ public class StackTracePackageElement im } /** - * Return the location of the element. + * Returns the location of the element. * @return The location of the element. */ public String getLocation() { @@ -52,7 +52,7 @@ public class StackTracePackageElement im } /** - * Return the version of the element. + * Returns the version of the element. * @return the version of the element. */ public String getVersion() { @@ -60,7 +60,7 @@ public class StackTracePackageElement im } /** - * Return the indicator of whether this is an exact match. + * Returns the indicator of whether this is an exact match. * @return true if the location was determined exactly. */ public boolean isExact() { 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=1396660&r1=1396659&r2=1396660&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 Wed Oct 10 16:05:10 2012 @@ -41,7 +41,7 @@ public abstract class AbstractLayout getLoggerContexts(); 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=1396660&r1=1396659&r2=1396660&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 Wed Oct 10 16:05:10 2012 @@ -125,7 +125,7 @@ public class Timer implements Serializab } /** - * Return the name of the last operation performed on this timer (Start, Stop, Pause or + * Returns the name of the last operation performed on this timer (Start, Stop, Pause or * Resume). * @return the string representing the last operation performed. */ @@ -135,7 +135,7 @@ public class Timer implements Serializab } /** - * Return the String representation of the timer based upon its current state + * Returns the String representation of the timer based upon its current state */ @Override public String toString() Modified: logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java (original) +++ logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java Wed Oct 10 16:05:10 2012 @@ -74,7 +74,7 @@ public class FlumeAvroManager extends Ab } /** - * Return a FlumeAvroManager. + * Returns a FlumeAvroManager. * @param agents The agents to use. * @param batchSize The number of events to include in a batch. * @return A FlumeAvroManager. @@ -102,7 +102,7 @@ public class FlumeAvroManager extends Ab } /** - * Return the agents. + * Returns the agents. * @return The agent array. */ public Agent[] getAgents() { Modified: logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java (original) +++ logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java Wed Oct 10 16:05:10 2012 @@ -65,7 +65,7 @@ public class FlumeEmbeddedManager extend } /** - * Return a FlumeEmbeddedManager. + * Returns a FlumeEmbeddedManager. * @param agents The agents to use. * @param batchSize The number of events to include in a batch. * @return A FlumeAvroManager. Modified: logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java (original) +++ logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java Wed Oct 10 16:05:10 2012 @@ -185,7 +185,7 @@ public class FlumeEvent extends SimpleEv } /** - * Return the logging Level. + * Returns the logging Level. * @return the Level. */ public Level getLevel() { @@ -193,7 +193,7 @@ public class FlumeEvent extends SimpleEv } /** - * Return the logger name. + * Returns the logger name. * @return the logger name. */ public String getLoggerName() { @@ -201,7 +201,7 @@ public class FlumeEvent extends SimpleEv } /** - * Return the StackTraceElement for the caller of the logging API. + * Returns the StackTraceElement for the caller of the logging API. * @return the StackTraceElement of the caller. */ public StackTraceElement getSource() { @@ -209,7 +209,7 @@ public class FlumeEvent extends SimpleEv } /** - * Return the Message. + * Returns the Message. * @return the Message. */ public Message getMessage() { @@ -217,7 +217,7 @@ public class FlumeEvent extends SimpleEv } /** - * Return the Marker. + * Returns the Marker. * @return the Marker. */ public Marker getMarker() { @@ -225,7 +225,7 @@ public class FlumeEvent extends SimpleEv } /** - * Return the name of the Thread. + * Returns the name of the Thread. * @return the name of the Thread. */ public String getThreadName() { @@ -233,7 +233,7 @@ public class FlumeEvent extends SimpleEv } /** - * Return the event timestamp. + * Returns the event timestamp. * @return the event timestamp. */ public long getMillis() { @@ -241,7 +241,7 @@ public class FlumeEvent extends SimpleEv } /** - * Return the Throwable associated with the event, if any. + * Returns the Throwable associated with the event, if any. * @return the Throwable. */ public Throwable getThrown() { @@ -249,7 +249,7 @@ public class FlumeEvent extends SimpleEv } /** - * Return a copy of the context Map. + * Returns a copy of the context Map. * @return a copy of the context Map. */ public Map getContextMap() { @@ -257,7 +257,7 @@ public class FlumeEvent extends SimpleEv } /** - * Return a copy of the context stack. + * Returns a copy of the context stack. * @return a copy of the context stack. */ public ThreadContext.ContextStack getContextStack() { Modified: logging/log4j/log4j2/trunk/flume-og/src/main/java/org/apache/logging/log4j/flumeog/appender/FlumeAvroManager.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-og/src/main/java/org/apache/logging/log4j/flumeog/appender/FlumeAvroManager.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/flume-og/src/main/java/org/apache/logging/log4j/flumeog/appender/FlumeAvroManager.java (original) +++ logging/log4j/log4j2/trunk/flume-og/src/main/java/org/apache/logging/log4j/flumeog/appender/FlumeAvroManager.java Wed Oct 10 16:05:10 2012 @@ -57,7 +57,7 @@ public class FlumeAvroManager extends Ab } /** - * Return a FlumeAvroManager. + * Returns a FlumeAvroManager. * @param agents The agents to use. * @return A FlumeAvroManager. */ @@ -80,7 +80,7 @@ public class FlumeAvroManager extends Ab } /** - * Return the agents. + * Returns the agents. * @return The agent array. */ public Agent[] getAgents() { Modified: logging/log4j/log4j2/trunk/flume-og/src/main/java/org/apache/logging/log4j/flumeog/appender/FlumeEvent.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-og/src/main/java/org/apache/logging/log4j/flumeog/appender/FlumeEvent.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/flume-og/src/main/java/org/apache/logging/log4j/flumeog/appender/FlumeEvent.java (original) +++ logging/log4j/log4j2/trunk/flume-og/src/main/java/org/apache/logging/log4j/flumeog/appender/FlumeEvent.java Wed Oct 10 16:05:10 2012 @@ -226,7 +226,7 @@ public class FlumeEvent extends EventBas } /** - * Return the logging Level. + * Returns the logging Level. * @return the Level. */ public Level getLevel() { @@ -234,7 +234,7 @@ public class FlumeEvent extends EventBas } /** - * Return the logger name. + * Returns the logger name. * @return the logger name. */ public String getLoggerName() { @@ -242,7 +242,7 @@ public class FlumeEvent extends EventBas } /** - * Return the StackTraceElement for the caller of the logging API. + * Returns the StackTraceElement for the caller of the logging API. * @return the StackTraceElement of the caller. */ public StackTraceElement getSource() { @@ -250,7 +250,7 @@ public class FlumeEvent extends EventBas } /** - * Return the Message. + * Returns the Message. * @return the Message. */ public Message getMessage() { @@ -258,7 +258,7 @@ public class FlumeEvent extends EventBas } /** - * Return the Marker. + * Returns the Marker. * @return the Marker. */ public Marker getMarker() { @@ -266,7 +266,7 @@ public class FlumeEvent extends EventBas } /** - * Return the name of the Thread. + * Returns the name of the Thread. * @return the name of the Thread. */ public String getThreadName() { @@ -274,7 +274,7 @@ public class FlumeEvent extends EventBas } /** - * Return the event timestamp. + * Returns the event timestamp. * @return the event timestamp. */ public long getMillis() { @@ -282,7 +282,7 @@ public class FlumeEvent extends EventBas } /** - * Return the Throwable associated with the event, if any. + * Returns the Throwable associated with the event, if any. * @return the Throwable. */ public Throwable getThrown() { @@ -290,7 +290,7 @@ public class FlumeEvent extends EventBas } /** - * Return a copy of the context Map. + * Returns a copy of the context Map. * @return a copy of the context Map. */ public Map getContextMap() { @@ -298,7 +298,7 @@ public class FlumeEvent extends EventBas } /** - * Return a copy of the context stack. + * Returns a copy of the context stack. * @return a copy of the context stack. */ public Stack getContextStack() { Modified: logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/Priority.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/Priority.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/Priority.java (original) +++ logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/Priority.java Wed Oct 10 16:05:10 2012 @@ -136,7 +136,7 @@ public class Priority { } /** - * Return the syslog equivalent of this priority as an integer. + * Returns the syslog equivalent of this priority as an integer. * @return The equivalent syslog value. */ public @@ -160,7 +160,7 @@ public class Priority { } /** - * Return all possible priorities as an array of Level objects in + * Returns all possible priorities as an array of Level objects in * descending order. * @return An array of all possible Priorities. * Modified: logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java?rev=1396660&r1=1396659&r2=1396660&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java (original) +++ logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java Wed Oct 10 16:05:10 2012 @@ -53,7 +53,7 @@ public final class StaticLoggerBinder im } /** - * Return the singleton of this class. + * Returns the singleton of this class. * * @return the StaticLoggerBinder singleton */ @@ -62,7 +62,7 @@ public final class StaticLoggerBinder im } /** - * Return the factory. + * Returns the factory. * @return the factor. */ public ILoggerFactory getLoggerFactory() { @@ -70,7 +70,7 @@ public final class StaticLoggerBinder im } /** - * Return the class name. + * Returns the class name. * @return the class name; */ public String getLoggerFactoryClassStr() {