logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nickwilli...@apache.org
Subject svn commit: r1500537 - in /logging/log4j/log4j2/trunk: ./ flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/ log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/ log4j12-api/src/main/java/org/apache/log4j/ log4j12-api/src/main/java/org/a...
Date Sun, 07 Jul 2013 21:02:21 GMT
Author: nickwilliams
Date: Sun Jul  7 21:02:20 2013
New Revision: 1500537

URL: http://svn.apache.org/r1500537
Log:
Checkstyle police

Added:
    logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/config/package-info.java
    logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/helpers/package-info.java
    logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/spi/package-info.java
    logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/xml/package-info.java
Modified:
    logging/log4j/log4j2/trunk/checkstyle-import-control.xml
    logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/BatchEvent.java
    logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
    logging/log4j/log4j2/trunk/flume-ng/src/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/FlumeConfigurationBuilder.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/FlumeNode.java
    logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/MDCContextMap.java
    logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContext.java
    logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/Appender.java
    logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/Category.java
    logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/LogManager.java
    logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/MDC.java
    logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/Priority.java
    logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/PropertyConfigurator.java
    logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/config/PropertySetter.java
    logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/config/PropertySetterException.java
    logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/helpers/NullEnumeration.java
    logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/spi/ErrorHandler.java
    logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/spi/LoggerRepository.java
    logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/xml/DOMConfigurator.java
    logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/impl/SLF4JLogger.java

Modified: logging/log4j/log4j2/trunk/checkstyle-import-control.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/checkstyle-import-control.xml?rev=1500537&r1=1500536&r2=1500537&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/checkstyle-import-control.xml (original)
+++ logging/log4j/log4j2/trunk/checkstyle-import-control.xml Sun Jul  7 21:02:20 2013
@@ -20,7 +20,7 @@
    limitations under the License.
 -->
 
-<import-control pkg="org.apache.logging.log4j">
+<import-control pkg="org">
   <!-- Allow all by default -->
   <allow pkg="java" />
   <allow pkg="javax" />
@@ -45,49 +45,61 @@
   <disallow pkg="org.codehaus.jackson" />
   <disallow pkg="com.fasterxml.jackson" />
 
-  <subpackage name="core">
+  <subpackage name="apache">
 
-    <subpackage name="appender">
+    <subpackage name="logging">
 
-      <subpackage name="db">
+      <subpackage name="log4j">
 
-        <subpackage name="jpa">
-          <allow pkg="javax.persistence" />
+        <subpackage name="core">
 
-          <subpackage name="converter">
-            <allow pkg="com.fasterxml.jackson" />
-          </subpackage>
-        </subpackage>
+          <subpackage name="appender">
+
+            <subpackage name="db">
+
+              <subpackage name="jpa">
+                <allow pkg="javax.persistence" />
+
+                <subpackage name="converter">
+                  <allow pkg="com.fasterxml.jackson" />
+                </subpackage>
+              </subpackage>
 
-        <subpackage name="nosql">
+              <subpackage name="nosql">
+
+                <subpackage name="mongo">
+                  <allow pkg="com.mongodb" />
+                  <allow pkg="org.bson" />
+                </subpackage>
+
+                <subpackage name="couch">
+                  <allow pkg="org.lightcouch" />
+                </subpackage>
+
+              </subpackage>
+
+            </subpackage>
 
-          <subpackage name="mongo">
-            <allow pkg="com.mongodb" />
-            <allow pkg="org.bson" />
           </subpackage>
 
-          <subpackage name="couch">
-            <allow pkg="org.lightcouch" />
+          <subpackage name="config">
+            <allow pkg="com.fasterxml.jackson" />
           </subpackage>
 
-        </subpackage>
+          <subpackage name="web">
+            <allow pkg="javax.servlet" />
+          </subpackage>
 
-      </subpackage>
+        </subpackage>
 
-    </subpackage>
+        <subpackage name="taglib">
+          <allow pkg="javax.servlet" />
+        </subpackage>
 
-    <subpackage name="config">
-      <allow pkg="com.fasterxml.jackson" />
-    </subpackage>
+      </subpackage>
 
-    <subpackage name="web">
-      <allow pkg="javax.servlet" />
     </subpackage>
 
   </subpackage>
 
-  <subpackage name="taglib">
-    <allow pkg="javax.servlet" />
-  </subpackage>
-
 </import-control>

Modified: logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/BatchEvent.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/BatchEvent.java?rev=1500537&r1=1500536&r2=1500537&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/BatchEvent.java (original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/BatchEvent.java Sun Jul  7 21:02:20 2013
@@ -16,11 +16,11 @@
  */
 package org.apache.logging.log4j.flume.appender;
 
-import org.apache.flume.Event;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.flume.Event;
+
 /**
  *
  */

Modified: logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java?rev=1500537&r1=1500536&r2=1500537&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java (original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java Sun Jul  7 21:02:20 2013
@@ -38,6 +38,7 @@ import org.apache.logging.log4j.core.lay
 public final class FlumeAppender<T extends Serializable> extends AbstractAppender<T> implements FlumeEventFactory {
 
     private static final String[] EXCLUDED_PACKAGES = {"org.apache.flume", "org.apache.avro"};
+    private static final int DEFAULT_MAX_DELAY = 60000;
 
     private final AbstractFlumeManager manager;
 
@@ -209,10 +210,10 @@ public final class FlumeAppender<T exten
         final int connectTimeout = connectionTimeout == null ? 0 : Integer.parseInt(connectionTimeout);
         final int reqTimeout = requestTimeout == null ? 0 : Integer.parseInt(requestTimeout);
         final int retries = agentRetries == null ? 0 : Integer.parseInt(agentRetries);
-        final int delay = maxDelay == null ? 60000 : Integer.parseInt(maxDelay);
+        final int delay = maxDelay == null ? DEFAULT_MAX_DELAY : Integer.parseInt(maxDelay);
 
         if (layout == null) {
-            @SuppressWarnings({"unchecked", "UnnecessaryLocalVariable" })
+            @SuppressWarnings({ "unchecked", "UnnecessaryLocalVariable" })
             Layout<S> l = (Layout<S>) RFC5424Layout.createLayout(null, null, null, "True", null, mdcPrefix, eventPrefix,
                     null, null, null, excludes, includes, required, null, null, null, null);
             layout = l;

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=1500537&r1=1500536&r2=1500537&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 Sun Jul  7 21:02:20 2013
@@ -16,20 +16,21 @@
  */
 package org.apache.logging.log4j.flume.appender;
 
+import java.util.Properties;
+
 import org.apache.flume.Event;
 import org.apache.flume.api.RpcClient;
 import org.apache.flume.api.RpcClientFactory;
 import org.apache.logging.log4j.core.appender.AppenderRuntimeException;
 import org.apache.logging.log4j.core.appender.ManagerFactory;
 
-import java.util.Properties;
-
 /**
  * Manager for FlumeAvroAppenders.
  */
 public class FlumeAvroManager extends AbstractFlumeManager {
 
     private static final int MAX_RECONNECTS = 3;
+    private static final int MINIMUM_TIMEOUT = 1000;
 
     private static AvroManagerFactory factory = new AvroManagerFactory();
 
@@ -73,6 +74,9 @@ public class FlumeAvroManager extends Ab
      * @param name The name of the manager.
      * @param agents The agents to use.
      * @param batchSize The number of events to include in a batch.
+     * @param retries The number of times to retry connecting before giving up.
+     * @param connectTimeout The connection timeout in ms.
+     * @param requestTimeout The request timeout in ms.
      * @return A FlumeAvroManager.
      */
     public static FlumeAvroManager getManager(final String name, final Agent[] agents, int batchSize,
@@ -209,10 +213,10 @@ public class FlumeAvroManager extends Ab
                 }
                 props.put("max-attempts", Integer.toString(retries * agents.length));
             }
-            if (requestTimeout >= 1000) {
+            if (requestTimeout >= MINIMUM_TIMEOUT) {
                 props.put("request-timeout", Integer.toString(requestTimeout));
             }
-            if (connectTimeout >= 1000) {
+            if (connectTimeout >= MINIMUM_TIMEOUT) {
                 props.put("connect-timeout", Integer.toString(connectTimeout));
             }
             return RpcClientFactory.getInstance(props);

Modified: logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeConfigurationBuilder.java?rev=1500537&r1=1500536&r2=1500537&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeConfigurationBuilder.java (original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeConfigurationBuilder.java Sun Jul  7 21:02:20 2013
@@ -16,6 +16,14 @@
  */
 package org.apache.logging.log4j.flume.appender;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.TreeSet;
+
 import org.apache.flume.Channel;
 import org.apache.flume.ChannelFactory;
 import org.apache.flume.ChannelSelector;
@@ -50,14 +58,6 @@ import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.core.config.ConfigurationException;
 import org.apache.logging.log4j.status.StatusLogger;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.TreeSet;
-
 /**
  * See Flume's PropertiesFileConfigurationProvider. This class would extend that if it were possible.
  */

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=1500537&r1=1500536&r2=1500537&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 Sun Jul  7 21:02:20 2013
@@ -16,6 +16,9 @@
  */
 package org.apache.logging.log4j.flume.appender;
 
+import java.util.Locale;
+import java.util.Properties;
+
 import org.apache.flume.Event;
 import org.apache.flume.SourceRunner;
 import org.apache.flume.node.NodeConfiguration;
@@ -26,9 +29,6 @@ import org.apache.logging.log4j.core.con
 import org.apache.logging.log4j.core.helpers.NameUtil;
 import org.apache.logging.log4j.util.PropertiesUtil;
 
-import java.util.Locale;
-import java.util.Properties;
-
 /**
  *
  */
@@ -37,12 +37,12 @@ public class FlumeEmbeddedManager extend
     /** Name for the Flume source */
     protected static final String SOURCE_NAME = "log4j-source";
 
-    private static FlumeManagerFactory factory = new FlumeManagerFactory();
-
-    private static final String FiLE_SEP = PropertiesUtil.getProperties().getStringProperty("file.separator");
+    private static final String FILE_SEP = PropertiesUtil.getProperties().getStringProperty("file.separator");
 
     private static final String IN_MEMORY = "InMemory";
 
+    private static FlumeManagerFactory factory = new FlumeManagerFactory();
+
     private final FlumeNode node;
 
     private NodeConfiguration conf;
@@ -214,8 +214,8 @@ public class FlumeEmbeddedManager extend
                         props.put(name + ".channels", "primary");
                         props.put(name + ".channels.primary.type", "file");
 
-                        if (!dataDir.endsWith(FiLE_SEP)) {
-                            dataDir = dataDir + FiLE_SEP;
+                        if (!dataDir.endsWith(FILE_SEP)) {
+                            dataDir = dataDir + FILE_SEP;
                         }
 
                         props.put(name + ".channels.primary.checkpointDir", dataDir + "checkpoint");

Modified: logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeNode.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeNode.java?rev=1500537&r1=1500536&r2=1500537&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeNode.java (original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeNode.java Sun Jul  7 21:02:20 2013
@@ -16,7 +16,6 @@
  */
 package org.apache.logging.log4j.flume.appender;
 
-import com.google.common.base.Preconditions;
 import org.apache.flume.lifecycle.LifecycleAware;
 import org.apache.flume.lifecycle.LifecycleState;
 import org.apache.flume.node.NodeConfiguration;
@@ -25,6 +24,8 @@ import org.apache.flume.node.nodemanager
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.base.Preconditions;
+
 /**
  *
  */

Modified: logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/MDCContextMap.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/MDCContextMap.java?rev=1500537&r1=1500536&r2=1500537&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/MDCContextMap.java (original)
+++ logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/MDCContextMap.java Sun Jul  7 21:02:20 2013
@@ -16,11 +16,11 @@
  */
 package org.apache.logging.slf4j;
 
+import java.util.Map;
+
 import org.apache.logging.log4j.spi.ThreadContextMap;
 import org.slf4j.MDC;
 
-import java.util.Map;
-
 /**
  * Bind the ThreadContextMap to the SLF4J MDC.
  */

Modified: logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContext.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContext.java?rev=1500537&r1=1500536&r2=1500537&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContext.java (original)
+++ logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContext.java Sun Jul  7 21:02:20 2013
@@ -16,14 +16,14 @@
  */
 package org.apache.logging.slf4j;
 
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.MessageFactory;
 import org.apache.logging.log4j.spi.LoggerContext;
 import org.slf4j.LoggerFactory;
 
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
 /**
  *
  */

Modified: logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/Appender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/Appender.java?rev=1500537&r1=1500536&r2=1500537&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/Appender.java (original)
+++ logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/Appender.java Sun Jul  7 21:02:20 2013
@@ -16,8 +16,8 @@
  */
 package org.apache.log4j;
 
-import org.apache.log4j.spi.Filter;
 import org.apache.log4j.spi.ErrorHandler;
+import org.apache.log4j.spi.Filter;
 import org.apache.log4j.spi.LoggingEvent;
 
 /**

Modified: logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/Category.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/Category.java?rev=1500537&r1=1500536&r2=1500537&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/Category.java (original)
+++ logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/Category.java Sun Jul  7 21:02:20 2013
@@ -16,6 +16,13 @@
  */
 package org.apache.log4j;
 
+import java.util.Enumeration;
+import java.util.Map;
+import java.util.ResourceBundle;
+import java.util.WeakHashMap;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
 import org.apache.log4j.helpers.NullEnumeration;
 import org.apache.log4j.spi.LoggerFactory;
 import org.apache.log4j.spi.LoggingEvent;
@@ -25,13 +32,6 @@ import org.apache.logging.log4j.message.
 import org.apache.logging.log4j.message.Message;
 import org.apache.logging.log4j.message.ObjectMessage;
 
-import java.util.Enumeration;
-import java.util.Map;
-import java.util.ResourceBundle;
-import java.util.WeakHashMap;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
 
 /**
  * Implementation of the Category class for compatibility, despite it having been deprecated a long, long time ago.

Modified: logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/LogManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/LogManager.java?rev=1500537&r1=1500536&r2=1500537&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/LogManager.java (original)
+++ logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/LogManager.java Sun Jul  7 21:02:20 2013
@@ -16,6 +16,8 @@
  */
 package org.apache.log4j;
 
+import java.util.Enumeration;
+
 import org.apache.log4j.helpers.NullEnumeration;
 import org.apache.log4j.spi.HierarchyEventListener;
 import org.apache.log4j.spi.LoggerFactory;
@@ -23,8 +25,6 @@ import org.apache.log4j.spi.LoggerReposi
 import org.apache.log4j.spi.RepositorySelector;
 import org.apache.logging.log4j.core.LoggerContext;
 
-import java.util.Enumeration;
-
 /**
  *
  */

Modified: logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/MDC.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/MDC.java?rev=1500537&r1=1500536&r2=1500537&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/MDC.java (original)
+++ logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/MDC.java Sun Jul  7 21:02:20 2013
@@ -16,12 +16,12 @@
  */
 package org.apache.log4j;
 
-import org.apache.logging.log4j.ThreadContext;
-
 import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.Map;
 
+import org.apache.logging.log4j.ThreadContext;
+
 /**
  * This class behaves just like Log4j's MDC would - and so can cause issues with the redeployment of web
  * applications if the Objects stored in the threads Map cannot be garbage collected.

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=1500537&r1=1500536&r2=1500537&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 Sun Jul  7 21:02:20 2013
@@ -134,6 +134,11 @@ public class Priority {
         return false;
     }
 
+    @Override
+    public int hashCode() {
+        return this.level;
+    }
+
     /**
      * Returns the syslog equivalent of this priority as an integer.
      * @return The equivalent syslog value.

Modified: logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/PropertyConfigurator.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/PropertyConfigurator.java?rev=1500537&r1=1500536&r2=1500537&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/PropertyConfigurator.java (original)
+++ logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/PropertyConfigurator.java Sun Jul  7 21:02:20 2013
@@ -16,96 +16,111 @@
  */
 package org.apache.log4j;
 
-import org.apache.log4j.spi.LoggerRepository;
-
 import java.io.InputStream;
 import java.net.URL;
 import java.util.Properties;
 
+import org.apache.log4j.spi.LoggerRepository;
+
 /**
- *
- * @since 0.8.1
+ * A configurator for properties.
  */
 public class PropertyConfigurator {
 
+    /**
+     * Read configuration options from configuration file.
+     *
+     * @param configFileName The configuration file
+     * @param hierarchy The hierarchy
+     */
     public void doConfigure(final String configFileName, final LoggerRepository hierarchy) {
 
     }
 
-    public static void configure(final String configFileName) {
+    /**
+     * Read configuration options from <code>properties</code>.
+     *
+     * See {@link #doConfigure(String, LoggerRepository)} for the expected format.
+     *
+     * @param properties The properties
+     * @param hierarchy The hierarchy
+     */
+    public void doConfigure(final Properties properties, final LoggerRepository hierarchy) {
     }
 
     /**
-     Read configuration options from url <code>configURL</code>.
-
-     @since 0.8.2
+     * Read configuration options from an InputStream.
+     *
+     * @param inputStream The input stream
+     * @param hierarchy The hierarchy
      */
-    public static void configure(final URL configURL) {
+    public void doConfigure(final InputStream inputStream, final LoggerRepository hierarchy) {
     }
 
     /**
-     Reads configuration options from an InputStream.
-
-     @since 1.2.17
+     * Read configuration options from url <code>configURL</code>.
+     *
+     * @param configURL The configuration URL
+     * @param hierarchy The hierarchy
      */
-    public static void configure(final InputStream inputStream) {
+    public void doConfigure(final java.net.URL configURL, final LoggerRepository hierarchy) {
     }
 
-
     /**
-     Read configuration options from <code>properties</code>.
-
-     See {@link #doConfigure(String, LoggerRepository)} for the expected format.
+     * Read configuration options from configuration file.
+     *
+     * @param configFileName The configuration file.
      */
-    public static void configure(final Properties properties) {
+    public static void configure(final String configFileName) {
     }
 
     /**
-     Like {@link #configureAndWatch(String, long)} except that the
-     default delay as defined by FileWatchdog.DEFAULT_DELAY is
-     used.
-
-     @param configFilename A file in key=value format.
-
+     * Read configuration options from url <code>configURL</code>.
+     *
+     * @param configURL The configuration URL
      */
-    public static void configureAndWatch(final String configFilename) {
+    public static void configure(final URL configURL) {
     }
 
-
     /**
-     Read the configuration file <code>configFilename</code> if it
-     exists. Moreover, a thread will be created that will periodically
-     check if <code>configFilename</code> has been created or
-     modified. The period is determined by the <code>delay</code>
-     argument. If a change or file creation is detected, then
-     <code>configFilename</code> is read to configure log4j.
-
-     @param configFilename A file in key=value format.
-     @param delay The delay in milliseconds to wait between each check.
+     * Reads configuration options from an InputStream.
+     *
+     * @param inputStream The input stream
      */
-    public static void configureAndWatch(final String configFilename, final long delay) {
+    public static void configure(final InputStream inputStream) {
     }
 
-
     /**
-     Read configuration options from <code>properties</code>.
-
-     See {@link #doConfigure(String, LoggerRepository)} for the expected format.
+     * Read configuration options from <code>properties</code>.
+     *
+     * See {@link #doConfigure(String, LoggerRepository)} for the expected format.
+     *
+     * @param properties The properties
      */
-    public void doConfigure(final Properties properties, final LoggerRepository hierarchy) {
+    public static void configure(final Properties properties) {
     }
 
     /**
-     * Read configuration options from an InputStream.
+     * Like {@link #configureAndWatch(String, long)} except that the
+     * default delay as defined by FileWatchdog.DEFAULT_DELAY is
+     * used.
      *
-     * @since 1.2.17
+     * @param configFilename A file in key=value format.
      */
-    public void doConfigure(final InputStream inputStream, final LoggerRepository hierarchy) {
+    public static void configureAndWatch(final String configFilename) {
     }
 
     /**
-     Read configuration options from url <code>configURL</code>.
+     * Read the configuration file <code>configFilename</code> if it
+     * exists. Moreover, a thread will be created that will periodically
+     * check if <code>configFilename</code> has been created or
+     * modified. The period is determined by the <code>delay</code>
+     * argument. If a change or file creation is detected, then
+     * <code>configFilename</code> is read to configure log4j.
+     *
+     * @param configFilename A file in key=value format.
+     * @param delay The delay in milliseconds to wait between each check.
      */
-    public void doConfigure(final java.net.URL configURL, final LoggerRepository hierarchy) {
+    public static void configureAndWatch(final String configFilename, final long delay) {
     }
 }

Modified: logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/config/PropertySetter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/config/PropertySetter.java?rev=1500537&r1=1500536&r2=1500537&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/config/PropertySetter.java (original)
+++ logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/config/PropertySetter.java Sun Jul  7 21:02:20 2013
@@ -34,53 +34,55 @@ public class PropertySetter {
     public PropertySetter(final Object obj) {
     }
 
-    /**
-     Set the properties of an object passed as a parameter in one
-     go. The <code>properties</code> are parsed relative to a
-     <code>prefix</code>.
-
-     @param obj The object to configure.
-     @param properties A java.util.Properties containing keys and values.
-     @param prefix Only keys having the specified prefix will be set.
-     */
-    public static void setProperties(final Object obj, final Properties properties, final String prefix) {
-    }
-
 
     /**
      * Set the properties for the object that match the <code>prefix</code> passed as parameter.
+     *
+     * @param properties The properties
+     * @param prefix The prefix
      */
     public void setProperties(final Properties properties, final String prefix) {
     }
 
     /**
-     Set a property on this PropertySetter's Object. If successful, this
-     method will invoke a setter method on the underlying Object. The
-     setter is the one for the specified property name and the value is
-     determined partly from the setter argument type and partly from the
-     value specified in the call to this method.
-
-     <p>If the setter expects a String no conversion is necessary.
-     If it expects an int, then an attempt is made to convert 'value'
-     to an int using new Integer(value). If the setter expects a boolean,
-     the conversion is by new Boolean(value).
-
-     @param name    name of the property
-     @param value   String value of the property
+     * Set a property on this PropertySetter's Object. If successful, this
+     * method will invoke a setter method on the underlying Object. The
+     * setter is the one for the specified property name and the value is
+     * determined partly from the setter argument type and partly from the
+     * value specified in the call to this method.
+     *
+     * <p>If the setter expects a String no conversion is necessary.
+     * If it expects an int, then an attempt is made to convert 'value'
+     * to an int using new Integer(value). If the setter expects a boolean,
+     * the conversion is by new Boolean(value).
+     *
+     * @param name    name of the property
+     * @param value   String value of the property
      */
     public void setProperty(final String name, final String value) {
     }
 
     /**
-     Set the named property given a {@link PropertyDescriptor}.
-
-     @param prop A PropertyDescriptor describing the characteristics
-     of the property to set.
-     @param name The named of the property to set.
-     @param value The value of the property.
+     * Set the named property given a {@link PropertyDescriptor}.
+     *
+     * @param prop A PropertyDescriptor describing the characteristics of the property to set.
+     * @param name The named of the property to set.
+     * @param value The value of the property.
+     * @throws PropertySetterException (Never actually throws this exception. Kept for historical purposes.)
      */
     public void setProperty(final PropertyDescriptor prop, final String name, final String value)
         throws PropertySetterException {
     }
 
+    /**
+     * Set the properties of an object passed as a parameter in one
+     * go. The <code>properties</code> are parsed relative to a
+     * <code>prefix</code>.
+     *
+     * @param obj The object to configure.
+     * @param properties A java.util.Properties containing keys and values.
+     * @param prefix Only keys having the specified prefix will be set.
+     */
+    public static void setProperties(final Object obj, final Properties properties, final String prefix) {
+    }
 }

Modified: logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/config/PropertySetterException.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/config/PropertySetterException.java?rev=1500537&r1=1500536&r2=1500537&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/config/PropertySetterException.java (original)
+++ logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/config/PropertySetterException.java Sun Jul  7 21:02:20 2013
@@ -24,12 +24,26 @@ package org.apache.log4j.config;
  */
 public class PropertySetterException extends Exception {
     private static final long serialVersionUID = -1352613734254235861L;
+
+    /**
+     * The root cause.
+     */
     protected Throwable rootCause;
 
+    /**
+     * Construct the exception with the given message.
+     *
+     * @param msg The message
+     */
     public PropertySetterException(final String msg) {
         super(msg);
     }
 
+    /**
+     * Construct the exception with the given root cause.
+     *
+     * @param rootCause The root cause
+     */
     public PropertySetterException(final Throwable rootCause) {
         super();
         this.rootCause = rootCause;
@@ -37,6 +51,8 @@ public class PropertySetterException ext
 
     /**
      * Returns descriptive text on the cause of this exception.
+     *
+     * @return the descriptive text.
      */
     @Override
     public String getMessage() {

Added: logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/config/package-info.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/config/package-info.java?rev=1500537&view=auto
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/config/package-info.java (added)
+++ logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/config/package-info.java Sun Jul  7 21:02:20 2013
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+/**
+ * Log4j 1.x compatibility layer.
+ */
+package org.apache.log4j.config;

Modified: logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/helpers/NullEnumeration.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/helpers/NullEnumeration.java?rev=1500537&r1=1500536&r2=1500537&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/helpers/NullEnumeration.java (original)
+++ logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/helpers/NullEnumeration.java Sun Jul  7 21:02:20 2013
@@ -24,14 +24,14 @@ import java.util.NoSuchElementException;
  *
  * @since version 1.0
  */
-public class NullEnumeration implements Enumeration {
-    private static final NullEnumeration instance = new NullEnumeration();
+public final class NullEnumeration implements Enumeration {
+    private static final NullEnumeration INSTANCE = new NullEnumeration();
 
     private NullEnumeration() {
     }
 
     public static NullEnumeration getInstance() {
-        return instance;
+        return INSTANCE;
     }
 
     @Override

Added: logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/helpers/package-info.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/helpers/package-info.java?rev=1500537&view=auto
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/helpers/package-info.java (added)
+++ logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/helpers/package-info.java Sun Jul  7 21:02:20 2013
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+/**
+ * Log4j 1.x compatibility layer.
+ */
+package org.apache.log4j.helpers;

Modified: logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/spi/ErrorHandler.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/spi/ErrorHandler.java?rev=1500537&r1=1500536&r2=1500537&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/spi/ErrorHandler.java (original)
+++ logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/spi/ErrorHandler.java Sun Jul  7 21:02:20 2013
@@ -50,12 +50,18 @@ public interface ErrorHandler {
      * Equivalent to the {@link #error(String, Exception, int,
      * LoggingEvent)} with the the event parameter set to
      * <code>null</code>.
+     *
+     * @param message   The message associated with the error.
+     * @param e         The Exception that was thrown when the error occurred.
+     * @param errorCode The error code associated with the error.
      */
     void error(String message, Exception e, int errorCode);
 
     /**
      * This method is normally used to just print the error message
      * passed as a parameter.
+     *
+     * @param message   The message associated with the error.
      */
     void error(String message);
 
@@ -75,6 +81,7 @@ public interface ErrorHandler {
      * Set the appender for which errors are handled. This method is
      * usually called when the error handler is configured.
      *
+     * @param appender The appender
      * @since 1.2
      */
     void setAppender(Appender appender);
@@ -82,6 +89,7 @@ public interface ErrorHandler {
     /**
      * Set the appender to fallback upon in case of failure.
      *
+     * @param appender The backup appender
      * @since 1.2
      */
     void setBackupAppender(Appender appender);

Modified: logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/spi/LoggerRepository.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/spi/LoggerRepository.java?rev=1500537&r1=1500536&r2=1500537&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/spi/LoggerRepository.java (original)
+++ logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/spi/LoggerRepository.java Sun Jul  7 21:02:20 2013
@@ -16,13 +16,13 @@
  */
 package org.apache.log4j.spi;
 
+import java.util.Enumeration;
+
 import org.apache.log4j.Appender;
 import org.apache.log4j.Category;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 
-import java.util.Enumeration;
-
 /**
  * A <code>LoggerRepository</code> is used to create and retrieve
  * <code>Loggers</code>. The relation between loggers in a repository
@@ -39,6 +39,8 @@ public interface LoggerRepository {
 
     /**
      * Add a {@link HierarchyEventListener} event to the repository.
+     *
+     * @param listener The listener
      */
     void addHierarchyEventListener(HierarchyEventListener listener);
 
@@ -47,6 +49,9 @@ public interface LoggerRepository {
      * level. The answer depends on the repository threshold and the
      * <code>level</code> parameter. See also {@link #setThreshold}
      * method.
+     *
+     * @param level The level
+     * @return whether this repository is disabled.
      */
     boolean isDisabled(int level);
 
@@ -54,20 +59,25 @@ public interface LoggerRepository {
      * Set the repository-wide threshold. All logging requests below the
      * threshold are immediately dropped. By default, the threshold is
      * set to <code>Level.ALL</code> which has the lowest possible rank.
+     *
+     * @param level The level
      */
     void setThreshold(Level level);
 
     /**
      * Another form of {@link #setThreshold(Level)} accepting a string
      * parameter instead of a <code>Level</code>.
+     *
+     * @param val The threshold value
      */
     void setThreshold(String val);
 
     void emitNoAppenderWarning(Category cat);
 
     /**
-     * Get the repository-wide threshold. See {@link
-     * #setThreshold(Level)} for an explanation.
+     * Get the repository-wide threshold. See {@link #setThreshold(Level)} for an explanation.
+     *
+     * @return the level.
      */
     Level getThreshold();
 
@@ -77,20 +87,20 @@ public interface LoggerRepository {
 
     Logger getRootLogger();
 
-    abstract Logger exists(String name);
+    Logger exists(String name);
 
-    abstract void shutdown();
+    void shutdown();
 
     Enumeration getCurrentLoggers();
 
     /**
      * Deprecated. Please use {@link #getCurrentLoggers} instead.
+     *
+     * @return an enumeration of loggers.
      */
     Enumeration getCurrentCategories();
 
+    void fireAddAppenderEvent(Category logger, Appender appender);
 
-    abstract void fireAddAppenderEvent(Category logger, Appender appender);
-
-    abstract void resetConfiguration();
-
+    void resetConfiguration();
 }

Added: logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/spi/package-info.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/spi/package-info.java?rev=1500537&view=auto
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/spi/package-info.java (added)
+++ logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/spi/package-info.java Sun Jul  7 21:02:20 2013
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+/**
+ * Log4j 1.x compatibility layer.
+ */
+package org.apache.log4j.spi;

Modified: logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/xml/DOMConfigurator.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/xml/DOMConfigurator.java?rev=1500537&r1=1500536&r2=1500537&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/xml/DOMConfigurator.java (original)
+++ logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/xml/DOMConfigurator.java Sun Jul  7 21:02:20 2013
@@ -16,30 +16,21 @@
  */
 package org.apache.log4j.xml;
 
-import org.apache.log4j.config.PropertySetter;
-import org.apache.log4j.spi.LoggerRepository;
-import org.w3c.dom.Element;
-
-import javax.xml.parsers.FactoryConfigurationError;
 import java.io.InputStream;
 import java.io.Reader;
 import java.net.URL;
 import java.util.Properties;
+import javax.xml.parsers.FactoryConfigurationError;
+
+import org.apache.log4j.config.PropertySetter;
+import org.apache.log4j.spi.LoggerRepository;
+import org.w3c.dom.Element;
 
 /**
  *
  */
 public class DOMConfigurator {
 
-    public static void configure(final Element element) {
-    }
-
-    public static void configureAndWatch(final String configFilename) {
-    }
-
-    public static void configureAndWatch(final String configFilename, final long delay) {
-    }
-
     public void doConfigure(final String filename, final LoggerRepository repository) {
     }
 
@@ -57,6 +48,15 @@ public class DOMConfigurator {
     public void doConfigure(final Element element, final LoggerRepository repository) {
     }
 
+    public static void configure(final Element element) {
+    }
+
+    public static void configureAndWatch(final String configFilename) {
+    }
+
+    public static void configureAndWatch(final String configFilename, final long delay) {
+    }
+
     public static void configure(final String filename) throws FactoryConfigurationError {
     }
 

Added: logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/xml/package-info.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/xml/package-info.java?rev=1500537&view=auto
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/xml/package-info.java (added)
+++ logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/xml/package-info.java Sun Jul  7 21:02:20 2013
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+/**
+ * Log4j 1.x compatibility layer.
+ */
+package org.apache.log4j.xml;

Modified: logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/impl/SLF4JLogger.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/impl/SLF4JLogger.java?rev=1500537&r1=1500536&r2=1500537&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/impl/SLF4JLogger.java (original)
+++ logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/impl/SLF4JLogger.java Sun Jul  7 21:02:20 2013
@@ -16,6 +16,8 @@
  */
 package org.slf4j.impl;
 
+import java.util.Map;
+
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.message.Message;
 import org.apache.logging.log4j.message.ParameterizedMessage;
@@ -28,8 +30,6 @@ import org.slf4j.MarkerFactory;
 import org.slf4j.ext.EventData;
 import org.slf4j.spi.LocationAwareLogger;
 
-import java.util.Map;
-
 /**
  *
  */



Mime
View raw message