From 70a06f894775b7c0b6582568bad96a1fa1a550ba Mon Sep 17 00:00:00 2001 From: Thomas Neidhart Date: Sun, 13 Jan 2013 17:24:18 +0000 Subject: [PATCH] Move authors to pom.xml. git-svn-id: https://svn.apache.org/repos/asf/commons/proper/logging/trunk@1432663 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 33 ++++++++++-- src/java/org/apache/commons/logging/Log.java | 4 -- .../logging/LogConfigurationException.java | 1 - .../apache/commons/logging/LogFactory.java | 3 -- .../org/apache/commons/logging/LogSource.java | 1 - .../commons/logging/impl/AvalonLogger.java | 1 - .../logging/impl/Jdk13LumberjackLogger.java | 8 +-- .../commons/logging/impl/Jdk14Logger.java | 3 -- .../commons/logging/impl/Log4JLogger.java | 3 -- .../commons/logging/impl/LogFactoryImpl.java | 20 +++---- .../commons/logging/impl/LogKitLogger.java | 2 - .../apache/commons/logging/impl/NoOpLog.java | 2 - .../commons/logging/impl/SimpleLog.java | 14 ++--- .../commons/logging/impl/WeakHashtable.java | 52 ++++++++----------- 14 files changed, 65 insertions(+), 82 deletions(-) diff --git a/pom.xml b/pom.xml index dab3658..7b67e55 100644 --- a/pom.xml +++ b/pom.xml @@ -98,7 +98,7 @@ under the License. baliuka Juozas Baliuka - baliuka@apache.org + baliuka at apache dot org Java Developer @@ -106,13 +106,13 @@ under the License. skitching Simon Kitching - skitching@apache.org + skitching at apache dot org Apache Software Foundation dennisl Dennis Lundberg - dennisl@apache.org + dennisl at apache dot org Apache Software Foundation @@ -120,7 +120,32 @@ under the License. Brian Stansberry - + + + Vince Eagen + vince256 at comcast dot net + + Lumberjack logging abstraction + + + + Berin Loritsch + bloritsch at apache dot org + + Lumberjack logging abstraction + JDK 1.4 logging abstraction + + + + Neeme Praks + neeme at apache dot org + + Avalon logging abstraction + + + + + scm:svn:http://svn.apache.org/repos/asf/commons/proper/logging/trunk scm:svn:https://svn.apache.org/repos/asf/commons/proper/logging/trunk diff --git a/src/java/org/apache/commons/logging/Log.java b/src/java/org/apache/commons/logging/Log.java index 1f63280..b542c90 100644 --- a/src/java/org/apache/commons/logging/Log.java +++ b/src/java/org/apache/commons/logging/Log.java @@ -54,8 +54,6 @@ package org.apache.commons.logging; * external to the Logging APIs, through whatever mechanism is supported by * that system. * - * @author Scott Sanders - * @author Rod Waldhoff * @version $Id$ */ public interface Log { @@ -205,7 +203,6 @@ public interface Log { */ public void error(Object message, Throwable t); - /** * Log a message with fatal log level. * @@ -213,7 +210,6 @@ public interface Log { */ public void fatal(Object message); - /** * Log an error with fatal log level. * diff --git a/src/java/org/apache/commons/logging/LogConfigurationException.java b/src/java/org/apache/commons/logging/LogConfigurationException.java index 174186d..9bf174c 100644 --- a/src/java/org/apache/commons/logging/LogConfigurationException.java +++ b/src/java/org/apache/commons/logging/LogConfigurationException.java @@ -22,7 +22,6 @@ package org.apache.commons.logging; * or Log instance cannot be created by the corresponding * factory methods. * - * @author Craig R. McClanahan * @version $Id$ */ public class LogConfigurationException extends RuntimeException { diff --git a/src/java/org/apache/commons/logging/LogFactory.java b/src/java/org/apache/commons/logging/LogFactory.java index 19aecb7..79c4bde 100644 --- a/src/java/org/apache/commons/logging/LogFactory.java +++ b/src/java/org/apache/commons/logging/LogFactory.java @@ -42,9 +42,6 @@ import java.util.Properties; * based on the SAXParserFactory and DocumentBuilderFactory implementations * (corresponding to the JAXP pluggability APIs) found in Apache Xerces. * - * @author Craig R. McClanahan - * @author Costin Manolache - * @author Richard A. Sitze * @version $Id$ */ public abstract class LogFactory { diff --git a/src/java/org/apache/commons/logging/LogSource.java b/src/java/org/apache/commons/logging/LogSource.java index 290f134..a95d86d 100644 --- a/src/java/org/apache/commons/logging/LogSource.java +++ b/src/java/org/apache/commons/logging/LogSource.java @@ -50,7 +50,6 @@ import org.apache.commons.logging.impl.NoOpLog; * @deprecated Use {@link LogFactory} instead - The default factory * implementation performs exactly the same algorithm as this class did * - * @author Rod Waldhoff * @version $Id$ */ public class LogSource { diff --git a/src/java/org/apache/commons/logging/impl/AvalonLogger.java b/src/java/org/apache/commons/logging/impl/AvalonLogger.java index 55637c8..58950e5 100644 --- a/src/java/org/apache/commons/logging/impl/AvalonLogger.java +++ b/src/java/org/apache/commons/logging/impl/AvalonLogger.java @@ -47,7 +47,6 @@ import org.apache.commons.logging.Log; * be thrown as soon as the deserialized object was used), so removing this marker * is not considered to be an incompatible change. * - * @author Neeme Praks * @version $Id$ */ public class AvalonLogger implements Log { diff --git a/src/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java b/src/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java index 3bc84dc..bce5364 100644 --- a/src/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java +++ b/src/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java @@ -28,14 +28,10 @@ import java.io.StringWriter; import org.apache.commons.logging.Log; /** - *

Implementation of the org.apache.commons.logging.Log + * Implementation of the org.apache.commons.logging.Log * interface that wraps the standard JDK logging mechanisms that are - * available in SourceForge's Lumberjack for JDKs prior to 1.4.

+ * available in SourceForge's Lumberjack for JDKs prior to 1.4. * - * @author Scott Sanders - * @author Berin Loritsch - * @author Peter Donald - * @author Vince Eagen * @version $Id$ * @since 1.1 */ diff --git a/src/java/org/apache/commons/logging/impl/Jdk14Logger.java b/src/java/org/apache/commons/logging/impl/Jdk14Logger.java index 9ae37ea..1b2b0a0 100644 --- a/src/java/org/apache/commons/logging/impl/Jdk14Logger.java +++ b/src/java/org/apache/commons/logging/impl/Jdk14Logger.java @@ -28,9 +28,6 @@ import org.apache.commons.logging.Log; * interface that wraps the standard JDK logging mechanisms that were * introduced in the Merlin release (JDK 1.4). * - * @author Scott Sanders - * @author Berin Loritsch - * @author Peter Donald * @version $Id$ */ public class Jdk14Logger implements Log, Serializable { diff --git a/src/java/org/apache/commons/logging/impl/Log4JLogger.java b/src/java/org/apache/commons/logging/impl/Log4JLogger.java index 4fbe7f3..1345a20 100644 --- a/src/java/org/apache/commons/logging/impl/Log4JLogger.java +++ b/src/java/org/apache/commons/logging/impl/Log4JLogger.java @@ -40,9 +40,6 @@ import org.apache.log4j.Level; * a non-binary-compatible change. The class generated by compiling this code against * log4j 1.2 will therefore not run against log4j 1.3. * - * @author Scott Sanders - * @author Rod Waldhoff - * @author Robert Burrell Donkin * @version $Id$ */ public class Log4JLogger implements Log, Serializable { diff --git a/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java b/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java index dded44a..0a38494 100644 --- a/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java +++ b/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java @@ -30,9 +30,9 @@ import org.apache.commons.logging.LogConfigurationException; import org.apache.commons.logging.LogFactory; /** - *

Concrete subclass of {@link LogFactory} that implements the + * Concrete subclass of {@link LogFactory} that implements the * following algorithm to dynamically select a logging implementation - * class to instantiate a wrapper for.

+ * class to instantiate a wrapper for: *
    *
  • Use a factory configuration attribute named * org.apache.commons.logging.Log to identify the @@ -46,21 +46,17 @@ import org.apache.commons.logging.LogFactory; *
  • Otherwise, return an instance of * org.apache.commons.logging.impl.SimpleLog.
    • *
- * - *

If the selected {@link Log} implementation class has a + *

+ * If the selected {@link Log} implementation class has a * setLogFactory() method that accepts a {@link LogFactory} * parameter, this method will be called on each newly created instance * to identify the associated factory. This makes factory configuration - * attributes available to the Log instance, if it so desires.

- * - *

This factory will remember previously created Log instances + * attributes available to the Log instance, if it so desires. + *

+ * This factory will remember previously created Log instances * for the same name, and will return them on repeated requests to the - * getInstance() method.

+ * getInstance() method. * - * @author Rod Waldhoff - * @author Craig R. McClanahan - * @author Richard A. Sitze - * @author Brian Stansberry * @version $Id$ */ public class LogFactoryImpl extends LogFactory { diff --git a/src/java/org/apache/commons/logging/impl/LogKitLogger.java b/src/java/org/apache/commons/logging/impl/LogKitLogger.java index 097f848..84c0de8 100644 --- a/src/java/org/apache/commons/logging/impl/LogKitLogger.java +++ b/src/java/org/apache/commons/logging/impl/LogKitLogger.java @@ -31,8 +31,6 @@ import org.apache.commons.logging.Log; * Therefore, this implementation converts object messages into strings * by called their toString() method before logging them. * - * @author Scott Sanders - * @author Robert Burrell Donkin * @version $Id$ */ public class LogKitLogger implements Log, Serializable { diff --git a/src/java/org/apache/commons/logging/impl/NoOpLog.java b/src/java/org/apache/commons/logging/impl/NoOpLog.java index 1cf605b..bdafc87 100644 --- a/src/java/org/apache/commons/logging/impl/NoOpLog.java +++ b/src/java/org/apache/commons/logging/impl/NoOpLog.java @@ -24,8 +24,6 @@ import org.apache.commons.logging.Log; * Trivial implementation of Log that throws away all messages. No * configurable system properties are supported. * - * @author Scott Sanders - * @author Rod Waldhoff * @version $Id$ */ public class NoOpLog implements Log, Serializable { diff --git a/src/java/org/apache/commons/logging/impl/SimpleLog.java b/src/java/org/apache/commons/logging/impl/SimpleLog.java index c750036..af6966a 100644 --- a/src/java/org/apache/commons/logging/impl/SimpleLog.java +++ b/src/java/org/apache/commons/logging/impl/SimpleLog.java @@ -32,9 +32,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogConfigurationException; /** - *

Simple implementation of Log that sends all enabled log messages, + * Simple implementation of Log that sends all enabled log messages, * for all defined loggers, to System.err. The following system properties - * are supported to configure the behavior of this logger:

+ * are supported to configure the behavior of this logger: *
    *
  • org.apache.commons.logging.simplelog.defaultlog - * Default logging detail level for all instances of SimpleLog. @@ -60,15 +60,11 @@ import org.apache.commons.logging.LogConfigurationException; * specified or is invalid, the default format is used. * The default format is yyyy/MM/dd HH:mm:ss:SSS zzz.
    • *
- * - *

In addition to looking for system properties with the names specified + *

+ * In addition to looking for system properties with the names specified * above, this implementation also checks for a class loader resource named * "simplelog.properties", and includes any matching definitions - * from this resource (if it exists).

- * - * @author Scott Sanders - * @author Rod Waldhoff - * @author Robert Burrell Donkin + * from this resource (if it exists). * * @version $Id$ */ diff --git a/src/java/org/apache/commons/logging/impl/WeakHashtable.java b/src/java/org/apache/commons/logging/impl/WeakHashtable.java index afb69f0..3c5e812 100644 --- a/src/java/org/apache/commons/logging/impl/WeakHashtable.java +++ b/src/java/org/apache/commons/logging/impl/WeakHashtable.java @@ -28,29 +28,27 @@ import java.util.Map; import java.util.Set; /** - *

Implementation of Hashtable that uses WeakReference's + * Implementation of Hashtable that uses WeakReference's * to hold its keys thus allowing them to be reclaimed by the garbage collector. - * The associated values are retained using strong references.

- * - *

This class follows the semantics of Hashtable as closely as - * possible. It therefore does not accept null values or keys.

- * - *

Note: + * The associated values are retained using strong references. + *

+ * This class follows the semantics of Hashtable as closely as + * possible. It therefore does not accept null values or keys. + *

+ * Note: * This is not intended to be a general purpose hash table replacement. * This implementation is also tuned towards a particular purpose: for use as a replacement * for Hashtable in LogFactory. This application requires * good liveliness for get and put. Various tradeoffs * have been made with this in mind. - *

*

* Usage: typical use case is as a drop-in replacement * for the Hashtable used in LogFactory for J2EE environments * running 1.3+ JVMs. Use of this class in most cases (see below) will * allow classloaders to be collected by the garbage collector without the need * to call {@link org.apache.commons.logging.LogFactory#release(ClassLoader) LogFactory.release(ClassLoader)}. - *

- * - *

org.apache.commons.logging.LogFactory checks whether this class + *

+ * org.apache.commons.logging.LogFactory checks whether this class * can be supported by the current JVM, and if so then uses it to store * references to the LogFactory implementation it loads * (rather than using a standard Hashtable instance). @@ -60,9 +58,9 @@ import java.util.Set; * of java.lang.ref.WeakReference and associates). * And by the way, this extends Hashtable rather than HashMap * for backwards compatibility reasons. See the documentation - * for method LogFactory.createFactoryStore for more details.

- * - *

The reason all this is necessary is due to a issue which + * for method LogFactory.createFactoryStore for more details. + *

+ * The reason all this is necessary is due to a issue which * arises during hot deploy in a J2EE-like containers. * Each component running in the container owns one or more classloaders; when * the component loads a LogFactory instance via the component classloader @@ -77,16 +75,14 @@ import java.util.Set; * garbage collected; this should be done by any container that * bundles commons-logging by default. However, holding the classloader * references weakly ensures that the classloader will be garbage collected - * without the container performing this step.

- * + * without the container performing this step. *

* Limitations: * There is still one (unusual) scenario in which a component will not * be correctly unloaded without an explicit release. Though weak references * are used for its keys, it is necessary to use strong references for its values. - *

- * - *

If the abstract class LogFactory is + *

+ * If the abstract class LogFactory is * loaded by the container classloader but a subclass of * LogFactory [LogFactory1] is loaded by the component's * classloader and an instance stored in the static map associated with the @@ -94,22 +90,18 @@ import java.util.Set; * class to the LogFactory1 instance (as normal) and a strong reference from * the LogFactory1 instance to the component classloader via * getClass().getClassLoader(). This chain of references will prevent - * collection of the child classloader.

- * + * collection of the child classloader. *

* Such a situation occurs when the commons-logging.jar is * loaded by a parent classloader (e.g. a server level classloader in a * servlet container) and a custom LogFactory implementation is - * loaded by a child classloader (e.g. a web app classloader).

- * - *

To avoid this scenario, ensure + * loaded by a child classloader (e.g. a web app classloader). + *

+ * To avoid this scenario, ensure * that any custom LogFactory subclass is loaded by the same classloader as * the base LogFactory. Creating custom LogFactory subclasses is, * however, rare. The standard LogFactoryImpl class should be sufficient - * for most or all users.

- * - * - * @author Brian Stansberry + * for most or all users. * * @version $Id$ * @since 1.1 @@ -363,8 +355,7 @@ public final class WeakHashtable extends Hashtable { Map.Entry entry = (Map.Entry) o; result = (getKey()==null ? entry.getKey() == null : - getKey().equals(entry.getKey())) - && + getKey().equals(entry.getKey())) && (getValue()==null ? entry.getValue() == null : getValue().equals(entry.getValue())); @@ -373,7 +364,6 @@ public final class WeakHashtable extends Hashtable { } public int hashCode() { - return (getKey()==null ? 0 : getKey().hashCode()) ^ (getValue()==null ? 0 : getValue().hashCode()); }