logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nickwilli...@apache.org
Subject svn commit: r1483569 - in /logging/log4j/log4j2/trunk: api/src/main/java/org/apache/logging/log4j/ core/src/main/java/org/apache/logging/log4j/core/config/ core/src/main/java/org/apache/logging/log4j/core/pattern/ core/src/main/resources/ jcl-bridge/sr...
Date Thu, 16 May 2013 21:18:29 GMT
Author: nickwilliams
Date: Thu May 16 21:18:28 2013
New Revision: 1483569

URL: http://svn.apache.org/r1483569
Log:
Using Log4j instead of Log4J Part 2: Most classes that have Log4j in their name use lowercase
J, but some use uppercase J. Replacing all Log4J with Log4j for consistency.

Added:
    logging/log4j/log4j2/trunk/core/src/main/resources/Log4j-V2.0.xsd
      - copied unchanged from r1483566, logging/log4j/log4j2/trunk/core/src/main/resources/Log4J-V2.0.xsd
    logging/log4j/log4j2/trunk/jcl-bridge/src/main/java/org/apache/logging/log4j/jcl/Log4jLog.java
      - copied, changed from r1483566, logging/log4j/log4j2/trunk/jcl-bridge/src/main/java/org/apache/logging/log4j/jcl/Log4JLog.java
    logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/helpers/Log4jLoggerFactory.java
      - copied, changed from r1483567, logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/helpers/Log4JLoggerFactory.java
    logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/helpers/Log4jMDCAdapter.java
      - copied, changed from r1483566, logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/helpers/Log4JMDCAdapter.java
    logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/helpers/Log4jMarkerFactory.java
      - copied, changed from r1483566, logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/helpers/Log4JMarkerFactory.java
Removed:
    logging/log4j/log4j2/trunk/core/src/main/resources/Log4J-V2.0.xsd
    logging/log4j/log4j2/trunk/jcl-bridge/src/main/java/org/apache/logging/log4j/jcl/Log4JLog.java
    logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/helpers/Log4JLoggerFactory.java
    logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/helpers/Log4JMDCAdapter.java
    logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/helpers/Log4JMarkerFactory.java
Modified:
    logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/MarkerManager.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/XMLConfiguration.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java
    logging/log4j/log4j2/trunk/jcl-bridge/src/main/java/org/apache/logging/log4j/jcl/LogFactoryImpl.java
    logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContextFactory.java
    logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
    logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/impl/StaticMDCBinder.java
    logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
    logging/log4j/log4j2/trunk/web/src/main/java/org/apache/logging/log4j/core/web/Log4jContextListener.java

Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/MarkerManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/MarkerManager.java?rev=1483569&r1=1483568&r2=1483569&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/MarkerManager.java
(original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/MarkerManager.java
Thu May 16 21:18:28 2013
@@ -37,7 +37,7 @@ public final class MarkerManager {
      * @return The Marker with the specified name.
      */
     public static Marker getMarker(final String name) {
-        markerMap.putIfAbsent(name, new Log4JMarker(name));
+        markerMap.putIfAbsent(name, new Log4jMarker(name));
         return markerMap.get(name);
     }
 
@@ -63,26 +63,26 @@ public final class MarkerManager {
      * @return The Marker with the specified name.
      */
     public static Marker getMarker(final String name, final Marker parent) {
-        markerMap.putIfAbsent(name, new Log4JMarker(name, parent));
+        markerMap.putIfAbsent(name, new Log4jMarker(name, parent));
         return markerMap.get(name);
     }
 
     /**
      * The actual Marker implementation.
      */
-    private static class Log4JMarker implements Marker {
+    private static class Log4jMarker implements Marker {
 
         private static final long serialVersionUID = 100L;
 
         private final String name;
         private final Marker parent;
 
-        public Log4JMarker(final String name) {
+        public Log4jMarker(final String name) {
             this.name = name;
             this.parent = null;
         }
 
-        public Log4JMarker(final String name, final Marker parent) {
+        public Log4jMarker(final String name, final Marker parent) {
             this.name = name;
             this.parent = parent;
         }

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/XMLConfiguration.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/XMLConfiguration.java?rev=1483569&r1=1483568&r2=1483569&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/XMLConfiguration.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/XMLConfiguration.java
Thu May 16 21:18:28 2013
@@ -16,33 +16,6 @@
  */
 package org.apache.logging.log4j.core.config;
 
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.core.config.plugins.PluginManager;
-import org.apache.logging.log4j.core.config.plugins.PluginType;
-import org.apache.logging.log4j.core.config.plugins.ResolverUtil;
-import org.apache.logging.log4j.core.helpers.FileUtils;
-import org.apache.logging.log4j.core.net.Advertiser;
-import org.apache.logging.log4j.status.StatusConsoleListener;
-import org.apache.logging.log4j.status.StatusListener;
-import org.apache.logging.log4j.status.StatusLogger;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-import javax.xml.XMLConstants;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.Source;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.validation.Schema;
-import javax.xml.validation.SchemaFactory;
-import javax.xml.validation.Validator;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -60,6 +33,33 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Source;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.core.config.plugins.PluginManager;
+import org.apache.logging.log4j.core.config.plugins.PluginType;
+import org.apache.logging.log4j.core.config.plugins.ResolverUtil;
+import org.apache.logging.log4j.core.helpers.FileUtils;
+import org.apache.logging.log4j.core.net.Advertiser;
+import org.apache.logging.log4j.status.StatusConsoleListener;
+import org.apache.logging.log4j.status.StatusListener;
+import org.apache.logging.log4j.status.StatusLogger;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Text;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
 
 /**
  * Creates a Node hierarchy from an XML file.
@@ -68,7 +68,7 @@ public class XMLConfiguration extends Ba
 
     private static final String[] VERBOSE_CLASSES = new String[] {ResolverUtil.class.getName()};
 
-    private static final String LOG4J_XSD = "Log4J-V2.0.xsd";
+    private static final String LOG4J_XSD = "Log4j-V2.0.xsd";
 
     private static final int BUF_SIZE = 16384;
 

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java?rev=1483569&r1=1483568&r2=1483569&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java
Thu May 16 21:18:28 2013
@@ -52,12 +52,12 @@ import org.apache.logging.log4j.core.lay
  * You can use a predefined style:
  *
  * <pre>
- * %highlight{%d{ ISO8601 } [%t] %-5level: %msg%n%throwable}{STYLE=Log4J}
+ * %highlight{%d{ ISO8601 } [%t] %-5level: %msg%n%throwable}{STYLE=Log4j}
  * </pre>
  * The available predefined styles are:
  * <ul>
  * <li>{@code Default}</li>
- * <li>{@code Log4J} - The same as {@code Default}</li>
+ * <li>{@code Log4j} - The same as {@code Default}</li>
  * <li>{@code Logback}</li>
  * </ul>
  * </p>

Copied: logging/log4j/log4j2/trunk/jcl-bridge/src/main/java/org/apache/logging/log4j/jcl/Log4jLog.java
(from r1483566, logging/log4j/log4j2/trunk/jcl-bridge/src/main/java/org/apache/logging/log4j/jcl/Log4JLog.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/jcl-bridge/src/main/java/org/apache/logging/log4j/jcl/Log4jLog.java?p2=logging/log4j/log4j2/trunk/jcl-bridge/src/main/java/org/apache/logging/log4j/jcl/Log4jLog.java&p1=logging/log4j/log4j2/trunk/jcl-bridge/src/main/java/org/apache/logging/log4j/jcl/Log4JLog.java&r1=1483566&r2=1483569&rev=1483569&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/jcl-bridge/src/main/java/org/apache/logging/log4j/jcl/Log4JLog.java
(original)
+++ logging/log4j/log4j2/trunk/jcl-bridge/src/main/java/org/apache/logging/log4j/jcl/Log4jLog.java
Thu May 16 21:18:28 2013
@@ -23,9 +23,9 @@ import org.apache.logging.log4j.spi.Abst
 /**
  *
  */
-public class Log4JLog extends AbstractLoggerWrapper implements Log {
+public class Log4jLog extends AbstractLoggerWrapper implements Log {
 
-    public Log4JLog(final AbstractLogger logger, final String name) {
+    public Log4jLog(final AbstractLogger logger, final String name) {
         super(logger, name, null);
     }
 }

Modified: logging/log4j/log4j2/trunk/jcl-bridge/src/main/java/org/apache/logging/log4j/jcl/LogFactoryImpl.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/jcl-bridge/src/main/java/org/apache/logging/log4j/jcl/LogFactoryImpl.java?rev=1483569&r1=1483568&r2=1483569&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/jcl-bridge/src/main/java/org/apache/logging/log4j/jcl/LogFactoryImpl.java
(original)
+++ logging/log4j/log4j2/trunk/jcl-bridge/src/main/java/org/apache/logging/log4j/jcl/LogFactoryImpl.java
Thu May 16 21:18:28 2013
@@ -47,7 +47,7 @@ public class LogFactoryImpl extends LogF
         }
         final org.apache.logging.log4j.Logger logger = PrivateManager.getLogger(name);
         if (logger instanceof AbstractLogger) {
-            loggers.putIfAbsent(name, new Log4JLog((AbstractLogger) logger, name));
+            loggers.putIfAbsent(name, new Log4jLog((AbstractLogger) logger, name));
             return loggers.get(name);
         }
         throw new LogConfigurationException(

Modified: logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContextFactory.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContextFactory.java?rev=1483569&r1=1483568&r2=1483569&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContextFactory.java
(original)
+++ logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContextFactory.java
Thu May 16 21:18:28 2013
@@ -16,11 +16,11 @@
  */
 package org.apache.logging.slf4j;
 
+import java.net.URI;
+
 import org.apache.logging.log4j.spi.LoggerContext;
 import org.apache.logging.log4j.spi.LoggerContextFactory;
 
-import java.net.URI;
-
 /**
  *
  */
@@ -31,10 +31,10 @@ public class SLF4JLoggerContextFactory i
         // LOG4J2-230, LOG4J2-204 (improve error reporting when misconfigured)
         boolean misconfigured = false;
         try {
-            Class.forName("org.slf4j.helpers.Log4JLoggerFactory");
+            Class.forName("org.slf4j.helpers.Log4jLoggerFactory");
             misconfigured = true;
         } catch (ClassNotFoundException classNotFoundIsGood) {
-            // org.slf4j.helpers.Log4JLoggerFactory is not on classpath. Good!
+            // org.slf4j.helpers.Log4jLoggerFactory is not on classpath. Good!
         }
         if (misconfigured) {
             throw new IllegalStateException("slf4j-impl jar is mutually exclusive with log4j-to-slf4j
jar "

Copied: logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/helpers/Log4jLoggerFactory.java
(from r1483567, logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/helpers/Log4JLoggerFactory.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/helpers/Log4jLoggerFactory.java?p2=logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/helpers/Log4jLoggerFactory.java&p1=logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/helpers/Log4JLoggerFactory.java&r1=1483567&r2=1483569&rev=1483569&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/helpers/Log4JLoggerFactory.java
(original)
+++ logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/helpers/Log4jLoggerFactory.java
Thu May 16 21:18:28 2013
@@ -33,9 +33,9 @@ import org.slf4j.impl.SLF4JLogger;
 /**
  *
  */
-public class Log4JLoggerFactory implements ILoggerFactory {
+public class Log4jLoggerFactory implements ILoggerFactory {
 
-    private static final String FQCN = Log4JLoggerFactory.class.getName();
+    private static final String FQCN = Log4jLoggerFactory.class.getName();
     private static final String PACKAGE = "org.slf4j";
 
     private final Map<LoggerContext, ConcurrentMap<String, Logger>> contextMap
=

Copied: logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/helpers/Log4jMDCAdapter.java
(from r1483566, logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/helpers/Log4JMDCAdapter.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/helpers/Log4jMDCAdapter.java?p2=logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/helpers/Log4jMDCAdapter.java&p1=logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/helpers/Log4JMDCAdapter.java&r1=1483566&r2=1483569&rev=1483569&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/helpers/Log4JMDCAdapter.java
(original)
+++ logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/helpers/Log4jMDCAdapter.java
Thu May 16 21:18:28 2013
@@ -16,15 +16,15 @@
  */
 package org.slf4j.helpers;
 
+import java.util.Map;
+
 import org.apache.logging.log4j.ThreadContext;
 import org.slf4j.spi.MDCAdapter;
 
-import java.util.Map;
-
 /**
  *
  */
-public class Log4JMDCAdapter implements MDCAdapter {
+public class Log4jMDCAdapter implements MDCAdapter {
 
     @Override
     public void put(final String key, final String val) {

Copied: logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/helpers/Log4jMarkerFactory.java
(from r1483566, logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/helpers/Log4JMarkerFactory.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/helpers/Log4jMarkerFactory.java?p2=logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/helpers/Log4jMarkerFactory.java&p1=logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/helpers/Log4JMarkerFactory.java&r1=1483566&r2=1483569&rev=1483569&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/helpers/Log4JMarkerFactory.java
(original)
+++ logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/helpers/Log4jMarkerFactory.java
Thu May 16 21:18:28 2013
@@ -16,16 +16,16 @@
  */
 package org.slf4j.helpers;
 
-import org.slf4j.IMarkerFactory;
-import org.slf4j.Marker;
-
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
+import org.slf4j.IMarkerFactory;
+import org.slf4j.Marker;
+
 /**
  *
  */
-public class Log4JMarkerFactory implements IMarkerFactory {
+public class Log4jMarkerFactory implements IMarkerFactory {
 
     private final ConcurrentMap<String, Marker> markerMap = new ConcurrentHashMap<String,
Marker>();
 

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=1483569&r1=1483568&r2=1483569&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
Thu May 16 21:18:28 2013
@@ -17,7 +17,7 @@
 package org.slf4j.impl;
 
 import org.slf4j.ILoggerFactory;
-import org.slf4j.helpers.Log4JLoggerFactory;
+import org.slf4j.helpers.Log4jLoggerFactory;
 import org.slf4j.spi.LoggerFactoryBinder;
 
 /**
@@ -32,7 +32,7 @@ public final class StaticLoggerBinder im
     // to avoid constant folding by the compiler, this field must *not* be final
     public static String REQUESTED_API_VERSION = "1.6"; // !final
 
-    private static final String LOGGER_FACTORY_CLASS_STR = Log4JLoggerFactory.class.getName();
+    private static final String LOGGER_FACTORY_CLASS_STR = Log4jLoggerFactory.class.getName();
 
     /**
      * The unique instance of this class.
@@ -49,7 +49,7 @@ public final class StaticLoggerBinder im
      * Private constructor to prevent instantiation
      */
     private StaticLoggerBinder() {
-        loggerFactory = new Log4JLoggerFactory();
+        loggerFactory = new Log4jLoggerFactory();
     }
 
     /**

Modified: logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/impl/StaticMDCBinder.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/impl/StaticMDCBinder.java?rev=1483569&r1=1483568&r2=1483569&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/impl/StaticMDCBinder.java
(original)
+++ logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/impl/StaticMDCBinder.java
Thu May 16 21:18:28 2013
@@ -16,7 +16,7 @@
  */
 package org.slf4j.impl;
 
-import org.slf4j.helpers.Log4JMDCAdapter;
+import org.slf4j.helpers.Log4jMDCAdapter;
 import org.slf4j.spi.MDCAdapter;
 
 /**
@@ -37,7 +37,7 @@ public final class StaticMDCBinder {
      * @return an MDC adapter
      */
     public MDCAdapter getMDCA() {
-        return new Log4JMDCAdapter();
+        return new Log4jMDCAdapter();
     }
 
     /**
@@ -45,6 +45,6 @@ public final class StaticMDCBinder {
      * @return The adapter class name.
      */
     public String getMDCAdapterClassStr() {
-        return Log4JMDCAdapter.class.getName();
+        return Log4jMDCAdapter.class.getName();
     }
 }

Modified: logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/impl/StaticMarkerBinder.java?rev=1483569&r1=1483568&r2=1483569&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
(original)
+++ logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
Thu May 16 21:18:28 2013
@@ -17,7 +17,7 @@
 package org.slf4j.impl;
 
 import org.slf4j.IMarkerFactory;
-import org.slf4j.helpers.Log4JMarkerFactory;
+import org.slf4j.helpers.Log4jMarkerFactory;
 import org.slf4j.spi.MarkerFactoryBinder;
 
 /**
@@ -30,7 +30,7 @@ public class StaticMarkerBinder implemen
      */
     public static final StaticMarkerBinder SINGLETON = new StaticMarkerBinder();
 
-    private final IMarkerFactory markerFactory = new Log4JMarkerFactory();
+    private final IMarkerFactory markerFactory = new Log4jMarkerFactory();
 
     @Override
     public IMarkerFactory getMarkerFactory() {
@@ -39,6 +39,6 @@ public class StaticMarkerBinder implemen
 
     @Override
     public String getMarkerFactoryClassStr() {
-        return Log4JMarkerFactory.class.getName();
+        return Log4jMarkerFactory.class.getName();
     }
 }

Modified: logging/log4j/log4j2/trunk/web/src/main/java/org/apache/logging/log4j/core/web/Log4jContextListener.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/web/src/main/java/org/apache/logging/log4j/core/web/Log4jContextListener.java?rev=1483569&r1=1483568&r2=1483569&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/web/src/main/java/org/apache/logging/log4j/core/web/Log4jContextListener.java
(original)
+++ logging/log4j/log4j2/trunk/web/src/main/java/org/apache/logging/log4j/core/web/Log4jContextListener.java
Thu May 16 21:18:28 2013
@@ -16,13 +16,13 @@
  */
 package org.apache.logging.log4j.core.web;
 
-import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.config.Configurator;
-
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.config.Configurator;
+
 /**
  * Saves the LoggerContext into the ServletContext as an attribute.
  */
@@ -31,7 +31,7 @@ public class Log4jContextListener implem
     /**
      * The name of the attribute to use to store the LoggerContext into the ServletContext.
      */
-    public static final String LOG4J_CONTEXT_ATTRIBUTE = "Log4JContext";
+    public static final String LOG4J_CONTEXT_ATTRIBUTE = "Log4jContext";
 
     /**
      * The location of the configuration.



Mime
View raw message