logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rpo...@apache.org
Subject svn commit: r1600200 - in /logging/log4j/log4j2/trunk: log4j-api/src/main/java/org/apache/logging/log4j/ log4j-api/src/main/java/org/apache/logging/log4j/simple/ log4j-api/src/main/java/org/apache/logging/log4j/spi/ log4j-api/src/main/java/org/apache/l...
Date Wed, 04 Jun 2014 13:26:47 GMT
Author: rpopma
Date: Wed Jun  4 13:26:46 2014
New Revision: 1600200

URL: http://svn.apache.org/r1600200
Log:
LOG4J2-555 follow-up: renamed LoggerProvider interface to ExtendedLogger, renamed AbstractLoggerProvider back to AbstractLogger

Added:
    logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
      - copied, changed from r1600136, logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLoggerProvider.java
    logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLogger.java
      - copied, changed from r1600136, logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerProvider.java
    logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLoggerWrapper.java
      - copied, changed from r1600136, logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerProviderWrapper.java
Removed:
    logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLoggerProvider.java
    logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerProvider.java
    logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerProviderWrapper.java
Modified:
    logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/EventLogger.java
    logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java
    logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContext.java
    logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerContext.java
    logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java
    logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java
    logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/TestLogger.java
    logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/TestLoggerContext.java
    logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java
    logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
    logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigUseAfterShutdownTest.java
    logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerUseAfterShutdownTest.java
    logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JsonLayoutTest.java
    logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/XmlLayoutTest.java
    logging/log4j/log4j2/trunk/log4j-jcl/src/main/java/org/apache/logging/log4j/jcl/Log4jLog.java
    logging/log4j/log4j2/trunk/log4j-jcl/src/main/java/org/apache/logging/log4j/jcl/LogFactoryImpl.java
    logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java
    logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLoggerFactory.java
    logging/log4j/log4j2/trunk/log4j-taglib/src/main/java/org/apache/logging/log4j/taglib/Log4jTaglibLogger.java
    logging/log4j/log4j2/trunk/log4j-taglib/src/main/java/org/apache/logging/log4j/taglib/Log4jTaglibLoggerContext.java
    logging/log4j/log4j2/trunk/log4j-taglib/src/main/java/org/apache/logging/log4j/taglib/TagUtils.java
    logging/log4j/log4j2/trunk/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/LoggerAwareTagSupportTest.java
    logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java
    logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContext.java
    logging/log4j/log4j2/trunk/src/changes/changes.xml

Modified: logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/EventLogger.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/EventLogger.java?rev=1600200&r1=1600199&r2=1600200&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/EventLogger.java (original)
+++ logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/EventLogger.java Wed Jun  4 13:26:46 2014
@@ -17,7 +17,7 @@
 package org.apache.logging.log4j;
 
 import org.apache.logging.log4j.message.StructuredDataMessage;
-import org.apache.logging.log4j.spi.LoggerProvider;
+import org.apache.logging.log4j.spi.ExtendedLogger;
 
 /**
  *  Logs "Events" that are represented as StructuredDataMessages.
@@ -33,7 +33,7 @@ public final class EventLogger {
 
     private static final String FQCN = EventLogger.class.getName();
 
-    private static final LoggerProvider LOGGER = LogManager.getContext(false).getLogger(NAME);
+    private static final ExtendedLogger LOGGER = LogManager.getContext(false).getLogger(NAME);
 
     private EventLogger() {
     }

Modified: logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java?rev=1600200&r1=1600199&r2=1600200&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java (original)
+++ logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java Wed Jun  4 13:26:46 2014
@@ -28,13 +28,13 @@ import org.apache.logging.log4j.Marker;
 import org.apache.logging.log4j.ThreadContext;
 import org.apache.logging.log4j.message.Message;
 import org.apache.logging.log4j.message.MessageFactory;
-import org.apache.logging.log4j.spi.AbstractLoggerProvider;
+import org.apache.logging.log4j.spi.AbstractLogger;
 import org.apache.logging.log4j.util.PropertiesUtil;
 
 /**
  *  This is the default logger that is used when no suitable logging implementation is available.
  */
-public class SimpleLogger extends AbstractLoggerProvider {
+public class SimpleLogger extends AbstractLogger {
 
     private static final long serialVersionUID = 1L;
 

Modified: logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContext.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContext.java?rev=1600200&r1=1600199&r2=1600200&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContext.java (original)
+++ logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContext.java Wed Jun  4 13:26:46 2014
@@ -25,9 +25,9 @@ import java.util.concurrent.ConcurrentMa
 
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.message.MessageFactory;
-import org.apache.logging.log4j.spi.AbstractLoggerProvider;
+import org.apache.logging.log4j.spi.AbstractLogger;
 import org.apache.logging.log4j.spi.LoggerContext;
-import org.apache.logging.log4j.spi.LoggerProvider;
+import org.apache.logging.log4j.spi.ExtendedLogger;
 import org.apache.logging.log4j.util.PropertiesUtil;
 
 /**
@@ -64,7 +64,7 @@ public class SimpleLoggerContext impleme
 
     private final PrintStream stream;
 
-    private final ConcurrentMap<String, LoggerProvider> loggers = new ConcurrentHashMap<String, LoggerProvider>();
+    private final ConcurrentMap<String, ExtendedLogger> loggers = new ConcurrentHashMap<String, ExtendedLogger>();
 
     public SimpleLoggerContext() {
         props = new PropertiesUtil("log4j2.simplelog.properties");
@@ -97,15 +97,15 @@ public class SimpleLoggerContext impleme
     }
 
     @Override
-    public LoggerProvider getLogger(final String name) {
+    public ExtendedLogger getLogger(final String name) {
         return getLogger(name, null);
     }
 
     @Override
-    public LoggerProvider getLogger(final String name, final MessageFactory messageFactory) {
+    public ExtendedLogger getLogger(final String name, final MessageFactory messageFactory) {
         if (loggers.containsKey(name)) {
-            final LoggerProvider logger = loggers.get(name);
-            AbstractLoggerProvider.checkMessageFactory(logger, messageFactory);
+            final ExtendedLogger logger = loggers.get(name);
+            AbstractLogger.checkMessageFactory(logger, messageFactory);
             return logger;
         }
 

Copied: logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java (from r1600136, logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLoggerProvider.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java?p2=logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java&p1=logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLoggerProvider.java&r1=1600136&r2=1600200&rev=1600200&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLoggerProvider.java (original)
+++ logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java Wed Jun  4 13:26:46 2014
@@ -30,7 +30,7 @@ import org.apache.logging.log4j.status.S
 /**
  * Base implementation of a Logger. It is highly recommended that any Logger implementation extend this class.
  */
-public abstract class AbstractLoggerProvider implements LoggerProvider, Serializable {
+public abstract class AbstractLogger implements ExtendedLogger, Serializable {
 
     private static final long serialVersionUID = 2L;
 
@@ -69,7 +69,7 @@ public abstract class AbstractLoggerProv
      */
     public static final Class<? extends MessageFactory> DEFAULT_MESSAGE_FACTORY_CLASS = ParameterizedMessageFactory.class;
 
-    private static final String FQCN = AbstractLoggerProvider.class.getName();
+    private static final String FQCN = AbstractLogger.class.getName();
 
     private static final String THROWING = "throwing";
 
@@ -83,7 +83,7 @@ public abstract class AbstractLoggerProv
      * @param logger The logger to check
      * @param messageFactory The message factory to check.
      */
-    public static void checkMessageFactory(final LoggerProvider logger, final MessageFactory messageFactory) {
+    public static void checkMessageFactory(final ExtendedLogger logger, final MessageFactory messageFactory) {
         final String name = logger.getName();
         final MessageFactory loggerMessageFactory = logger.getMessageFactory();
         if (messageFactory != null && !loggerMessageFactory.equals(messageFactory)) {
@@ -107,7 +107,7 @@ public abstract class AbstractLoggerProv
     /**
      * Creates a new logger named after the class (or subclass).
      */
-    public AbstractLoggerProvider() {
+    public AbstractLogger() {
         this.name = getClass().getName();
         this.messageFactory = createDefaultMessageFactory();
     }
@@ -117,7 +117,7 @@ public abstract class AbstractLoggerProv
      *
      * @param name the logger name
      */
-    public AbstractLoggerProvider(final String name) {
+    public AbstractLogger(final String name) {
         this.name = name;
         this.messageFactory = createDefaultMessageFactory();
     }
@@ -128,7 +128,7 @@ public abstract class AbstractLoggerProv
      * @param name the logger name
      * @param messageFactory the message factory, if null then use the default message factory.
      */
-    public AbstractLoggerProvider(final String name, final MessageFactory messageFactory) {
+    public AbstractLogger(final String name, final MessageFactory messageFactory) {
         this.name = name;
         this.messageFactory = messageFactory == null ? createDefaultMessageFactory() : messageFactory;
     }
@@ -1264,7 +1264,7 @@ public abstract class AbstractLoggerProv
 
     /*
      * (non-Javadoc)
-     * @see org.apache.logging.log4j.spi.LoggerProvider#logIfEnabled(java.lang.String, org.apache.logging.log4j.Level,
+     * @see org.apache.logging.log4j.spi.ExtendedLogger#logIfEnabled(java.lang.String, org.apache.logging.log4j.Level,
      * org.apache.logging.log4j.Marker, org.apache.logging.log4j.message.Message, java.lang.Throwable)
      */
     @Override
@@ -1277,7 +1277,7 @@ public abstract class AbstractLoggerProv
 
     /*
      * (non-Javadoc)
-     * @see org.apache.logging.log4j.spi.LoggerProvider#logIfEnabled(java.lang.String, org.apache.logging.log4j.Level,
+     * @see org.apache.logging.log4j.spi.ExtendedLogger#logIfEnabled(java.lang.String, org.apache.logging.log4j.Level,
      * org.apache.logging.log4j.Marker, java.lang.Object, java.lang.Throwable)
      */
     @Override
@@ -1290,7 +1290,7 @@ public abstract class AbstractLoggerProv
 
     /*
      * (non-Javadoc)
-     * @see org.apache.logging.log4j.spi.LoggerProvider#logIfEnabled(java.lang.String, org.apache.logging.log4j.Level,
+     * @see org.apache.logging.log4j.spi.ExtendedLogger#logIfEnabled(java.lang.String, org.apache.logging.log4j.Level,
      * org.apache.logging.log4j.Marker, java.lang.String)
      */
     @Override
@@ -1302,7 +1302,7 @@ public abstract class AbstractLoggerProv
 
     /*
      * (non-Javadoc)
-     * @see org.apache.logging.log4j.spi.LoggerProvider#logIfEnabled(java.lang.String, org.apache.logging.log4j.Level,
+     * @see org.apache.logging.log4j.spi.ExtendedLogger#logIfEnabled(java.lang.String, org.apache.logging.log4j.Level,
      * org.apache.logging.log4j.Marker, java.lang.String, java.lang.Object[])
      */
     @Override
@@ -1315,7 +1315,7 @@ public abstract class AbstractLoggerProv
 
     /*
      * (non-Javadoc)
-     * @see org.apache.logging.log4j.spi.LoggerProvider#logIfEnabled(java.lang.String, org.apache.logging.log4j.Level,
+     * @see org.apache.logging.log4j.spi.ExtendedLogger#logIfEnabled(java.lang.String, org.apache.logging.log4j.Level,
      * org.apache.logging.log4j.Marker, java.lang.String, java.lang.Throwable)
      */
     @Override

Copied: logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLogger.java (from r1600136, logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerProvider.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLogger.java?p2=logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLogger.java&p1=logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerProvider.java&r1=1600136&r2=1600200&rev=1600200&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerProvider.java (original)
+++ logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLogger.java Wed Jun  4 13:26:46 2014
@@ -25,7 +25,7 @@ import org.apache.logging.log4j.message.
  * Extends the {@code Logger} interface with methods that facilitate implementing or extending {@code Logger}s. Users
  * should not need to use this interface.
  */
-public interface LoggerProvider extends Logger {
+public interface ExtendedLogger extends Logger {
 
     /**
      * Determines if logging is enabled.

Copied: logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLoggerWrapper.java (from r1600136, logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerProviderWrapper.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLoggerWrapper.java?p2=logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLoggerWrapper.java&p1=logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerProviderWrapper.java&r1=1600136&r2=1600200&rev=1600200&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerProviderWrapper.java (original)
+++ logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLoggerWrapper.java Wed Jun  4 13:26:46 2014
@@ -24,14 +24,14 @@ import org.apache.logging.log4j.message.
 /**
  * Wrapper class that exposes the protected AbstractLogger methods to support wrapped loggers.
  */
-public class LoggerProviderWrapper extends AbstractLoggerProvider {
+public class ExtendedLoggerWrapper extends AbstractLogger {
 
     private static final long serialVersionUID = 1L;
     
     /**
      * The wrapped Logger.
      */
-    protected final LoggerProvider logger;
+    protected final ExtendedLogger logger;
 
     /**
      * Constructor that wraps and existing Logger.
@@ -39,7 +39,7 @@ public class LoggerProviderWrapper exten
      * @param name The name of the Logger.
      * @param messageFactory TODO
      */
-    public LoggerProviderWrapper(final LoggerProvider logger, final String name, final MessageFactory messageFactory) {
+    public ExtendedLoggerWrapper(final ExtendedLogger logger, final String name, final MessageFactory messageFactory) {
         super(name, messageFactory);
         this.logger = logger;
     }

Modified: logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerContext.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerContext.java?rev=1600200&r1=1600199&r2=1600200&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerContext.java (original)
+++ logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerContext.java Wed Jun  4 13:26:46 2014
@@ -34,7 +34,7 @@ public interface LoggerContext {
      * @param name The name of the Logger to return.
      * @return The logger with the specified name.
      */
-    LoggerProvider getLogger(String name);
+    ExtendedLogger getLogger(String name);
 
     /**
      * Returns a Logger.
@@ -43,7 +43,7 @@ public interface LoggerContext {
      *                       the logger but will log a warning if mismatched.
      * @return The logger with the specified name.
      */
-    LoggerProvider getLogger(String name, MessageFactory messageFactory);
+    ExtendedLogger getLogger(String name, MessageFactory messageFactory);
 
     /**
      * Detects if a Logger with the specified name exists.

Modified: logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java?rev=1600200&r1=1600199&r2=1600200&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java (original)
+++ logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java Wed Jun  4 13:26:46 2014
@@ -33,14 +33,14 @@ import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.Marker;
 import org.apache.logging.log4j.message.Message;
 import org.apache.logging.log4j.simple.SimpleLogger;
-import org.apache.logging.log4j.spi.AbstractLoggerProvider;
+import org.apache.logging.log4j.spi.AbstractLogger;
 import org.apache.logging.log4j.util.PropertiesUtil;
 import org.apache.logging.log4j.util.Strings;
 
 /**
  * Mechanism to record events that occur in the logging system.
  */
-public final class StatusLogger extends AbstractLoggerProvider {
+public final class StatusLogger extends AbstractLogger {
 
     private static final long serialVersionUID = 2L;
 

Modified: logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java?rev=1600200&r1=1600199&r2=1600200&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java Wed Jun  4 13:26:46 2014
@@ -20,7 +20,7 @@ import org.apache.logging.log4j.message.
 import org.apache.logging.log4j.message.ObjectMessage;
 import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.apache.logging.log4j.message.SimpleMessage;
-import org.apache.logging.log4j.spi.AbstractLoggerProvider;
+import org.apache.logging.log4j.spi.AbstractLogger;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
@@ -28,7 +28,7 @@ import static org.junit.Assert.*;
 /**
  *
  */
-public class AbstractLoggerTest extends AbstractLoggerProvider {
+public class AbstractLoggerTest extends AbstractLogger {
 
     private static class LogEvent {
 
@@ -51,7 +51,7 @@ public class AbstractLoggerTest extends 
 
     private static Throwable t = new UnsupportedOperationException("Test");
 
-    private static Class<AbstractLoggerProvider> obj = AbstractLoggerProvider.class;
+    private static Class<AbstractLogger> obj = AbstractLogger.class;
     private static String pattern = "{}, {}";
     private static String p1 = "Long Beach";
 

Modified: logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/TestLogger.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/TestLogger.java?rev=1600200&r1=1600199&r2=1600200&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/TestLogger.java (original)
+++ logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/TestLogger.java Wed Jun  4 13:26:46 2014
@@ -24,12 +24,12 @@ import java.util.Map;
 
 import org.apache.logging.log4j.message.Message;
 import org.apache.logging.log4j.message.MessageFactory;
-import org.apache.logging.log4j.spi.AbstractLoggerProvider;
+import org.apache.logging.log4j.spi.AbstractLogger;
 
 /**
  *
  */
-public class TestLogger extends AbstractLoggerProvider {
+public class TestLogger extends AbstractLogger {
 
     private static final long serialVersionUID = 1L;
 

Modified: logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/TestLoggerContext.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/TestLoggerContext.java?rev=1600200&r1=1600199&r2=1600200&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/TestLoggerContext.java (original)
+++ logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/TestLoggerContext.java Wed Jun  4 13:26:46 2014
@@ -21,26 +21,26 @@ import java.util.Map;
 
 import org.apache.logging.log4j.message.MessageFactory;
 import org.apache.logging.log4j.spi.LoggerContext;
-import org.apache.logging.log4j.spi.LoggerProvider;
+import org.apache.logging.log4j.spi.ExtendedLogger;
 
 /**
  *
  */
 public class TestLoggerContext implements LoggerContext {
-    private final Map<String, LoggerProvider> map = new HashMap<String, LoggerProvider>();
+    private final Map<String, ExtendedLogger> map = new HashMap<String, ExtendedLogger>();
 
     @Override
-    public LoggerProvider getLogger(final String name) {
+    public ExtendedLogger getLogger(final String name) {
         if (map.containsKey(name)) {
             return map.get(name);
         }
-        final LoggerProvider logger = new TestLogger(name);
+        final ExtendedLogger logger = new TestLogger(name);
         map.put(name, logger);
         return logger;
     }
 
     @Override
-    public LoggerProvider getLogger(final String name, final MessageFactory messageFactory) {
+    public ExtendedLogger getLogger(final String name, final MessageFactory messageFactory) {
         return new TestLogger(name, messageFactory);
     }
 

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java?rev=1600200&r1=1600199&r2=1600200&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java Wed Jun  4 13:26:46 2014
@@ -29,7 +29,7 @@ import org.apache.logging.log4j.core.fil
 import org.apache.logging.log4j.message.Message;
 import org.apache.logging.log4j.message.MessageFactory;
 import org.apache.logging.log4j.message.SimpleMessage;
-import org.apache.logging.log4j.spi.AbstractLoggerProvider;
+import org.apache.logging.log4j.spi.AbstractLogger;
 import org.apache.logging.log4j.util.Strings;
 
 /**
@@ -38,7 +38,7 @@ import org.apache.logging.log4j.util.Str
  * Logger noticeably impacts performance. The message pattern and parameters are required so that they can be
  * used in global filters.
  */
-public class Logger extends AbstractLoggerProvider {
+public class Logger extends AbstractLogger {
 
     private static final long serialVersionUID = 1L;
 

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java?rev=1600200&r1=1600199&r2=1600200&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java Wed Jun  4 13:26:46 2014
@@ -42,7 +42,7 @@ import org.apache.logging.log4j.core.jmx
 import org.apache.logging.log4j.core.util.Assert;
 import org.apache.logging.log4j.core.util.NetUtils;
 import org.apache.logging.log4j.message.MessageFactory;
-import org.apache.logging.log4j.spi.AbstractLoggerProvider;
+import org.apache.logging.log4j.spi.AbstractLogger;
 import org.apache.logging.log4j.util.PropertiesUtil;
 
 /**
@@ -288,7 +288,7 @@ public class LoggerContext extends Abstr
     public Logger getLogger(final String name, final MessageFactory messageFactory) {
         Logger logger = loggers.get(name);
         if (logger != null) {
-            AbstractLoggerProvider.checkMessageFactory(logger, messageFactory);
+            AbstractLogger.checkMessageFactory(logger, messageFactory);
             return logger;
         }
 

Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigUseAfterShutdownTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigUseAfterShutdownTest.java?rev=1600200&r1=1600199&r2=1600200&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigUseAfterShutdownTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigUseAfterShutdownTest.java Wed Jun  4 13:26:46 2014
@@ -22,7 +22,7 @@ import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.core.LifeCycle;
 import org.apache.logging.log4j.core.config.ConfigurationFactory;
 import org.apache.logging.log4j.message.SimpleMessage;
-import org.apache.logging.log4j.spi.AbstractLoggerProvider;
+import org.apache.logging.log4j.spi.AbstractLogger;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -41,6 +41,6 @@ public class AsyncLoggerConfigUseAfterSh
 
         // call the #logMessage() method to bypass the isEnabled check: 
         // before the LOG4J2-639 fix this would throw a NPE
-        ((AbstractLoggerProvider) log).logMessage("com.foo.Bar", Level.INFO, null, new SimpleMessage("msg"), null);
+        ((AbstractLogger) log).logMessage("com.foo.Bar", Level.INFO, null, new SimpleMessage("msg"), null);
    }
 }

Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerUseAfterShutdownTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerUseAfterShutdownTest.java?rev=1600200&r1=1600199&r2=1600200&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerUseAfterShutdownTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerUseAfterShutdownTest.java Wed Jun  4 13:26:46 2014
@@ -23,7 +23,7 @@ import org.apache.logging.log4j.core.Lif
 import org.apache.logging.log4j.core.config.ConfigurationFactory;
 import org.apache.logging.log4j.core.util.Constants;
 import org.apache.logging.log4j.message.SimpleMessage;
-import org.apache.logging.log4j.spi.AbstractLoggerProvider;
+import org.apache.logging.log4j.spi.AbstractLogger;
 import org.apache.logging.log4j.util.Strings;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -56,7 +56,7 @@ public class AsyncLoggerUseAfterShutdown
 
         // call the #logMessage() method to bypass the isEnabled check: 
         // before the LOG4J2-639 fix this would throw a NPE
-        ((AbstractLoggerProvider) log).logMessage("com.foo.Bar", Level.INFO, null, new SimpleMessage("msg"), null);
+        ((AbstractLogger) log).logMessage("com.foo.Bar", Level.INFO, null, new SimpleMessage("msg"), null);
     }
 
 }

Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JsonLayoutTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JsonLayoutTest.java?rev=1600200&r1=1600199&r2=1600200&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JsonLayoutTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JsonLayoutTest.java Wed Jun  4 13:26:46 2014
@@ -32,6 +32,7 @@ import org.apache.logging.log4j.core.jac
 import org.apache.logging.log4j.core.util.Charsets;
 import org.apache.logging.log4j.core.util.Throwables;
 import org.apache.logging.log4j.message.SimpleMessage;
+import org.apache.logging.log4j.spi.AbstractLogger;
 import org.apache.logging.log4j.test.appender.ListAppender;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -196,7 +197,7 @@ public class JsonLayoutTest {
         this.checkAt("{", 1, list);
         this.checkContains("\"level\" : \"DEBUG\",", list);
         this.checkContains("\"message\" : \"Here is a quote ' and then a double quote \\\"\",", list);
-        this.checkContains("\"loggerFqcn\" : \"org.apache.logging.log4j.spi.AbstractLoggerProvider\",", list);
+        this.checkContains("\"loggerFqcn\" : \"" + AbstractLogger.class.getName() + "\",", list);
         for (final Appender app : appenders.values()) {
             this.rootLogger.addAppender(app);
         }
@@ -241,7 +242,7 @@ public class JsonLayoutTest {
 
         this.checkAt("[", 0, list);
         this.checkAt("{", 1, list);
-        this.checkContains("\"loggerFqcn\" : \"org.apache.logging.log4j.spi.AbstractLoggerProvider\",", list);
+        this.checkContains("\"loggerFqcn\" : \"" + AbstractLogger.class.getName() + "\",", list);
         this.checkContains("\"level\" : \"DEBUG\",", list);
         this.checkContains("\"message\" : \"starting mdc pattern test\",", list);
         for (final Appender app : appenders.values()) {

Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/XmlLayoutTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/XmlLayoutTest.java?rev=1600200&r1=1600199&r2=1600200&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/XmlLayoutTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/XmlLayoutTest.java Wed Jun  4 13:26:46 2014
@@ -35,6 +35,7 @@ import org.apache.logging.log4j.core.jac
 import org.apache.logging.log4j.core.util.Charsets;
 import org.apache.logging.log4j.core.util.Throwables;
 import org.apache.logging.log4j.message.SimpleMessage;
+import org.apache.logging.log4j.spi.AbstractLogger;
 import org.apache.logging.log4j.test.appender.ListAppender;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -238,7 +239,7 @@ public class XmlLayoutTest {
         final String string = list.get(0);
         assertTrue("Incorrect header: " + string, string.equals("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"));
         assertTrue("Incorrect footer", list.get(list.size() - 1).equals("</Events>"));
-        this.checkContains("loggerFqcn=\"org.apache.logging.log4j.spi.AbstractLoggerProvider\"", list);
+        this.checkContains("loggerFqcn=\"" + AbstractLogger.class.getName() + "\"", list);
         this.checkContains("level=\"DEBUG\"", list);
         this.checkContains(">starting mdc pattern test</Message>", list);
         // this.checkContains("<Message>starting mdc pattern test</Message>", list);

Modified: logging/log4j/log4j2/trunk/log4j-jcl/src/main/java/org/apache/logging/log4j/jcl/Log4jLog.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-jcl/src/main/java/org/apache/logging/log4j/jcl/Log4jLog.java?rev=1600200&r1=1600199&r2=1600200&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-jcl/src/main/java/org/apache/logging/log4j/jcl/Log4jLog.java (original)
+++ logging/log4j/log4j2/trunk/log4j-jcl/src/main/java/org/apache/logging/log4j/jcl/Log4jLog.java Wed Jun  4 13:26:46 2014
@@ -20,7 +20,7 @@ import java.io.Serializable;
 
 import org.apache.commons.logging.Log;
 import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.spi.LoggerProvider;
+import org.apache.logging.log4j.spi.ExtendedLogger;
 
 /**
  *
@@ -30,9 +30,9 @@ public class Log4jLog implements Log, Se
     private static final long serialVersionUID = 1L;
     private static final String FQCN = Log4jLog.class.getName();
 
-    private final LoggerProvider logger;
+    private final ExtendedLogger logger;
 
-    public Log4jLog(final LoggerProvider logger) {
+    public Log4jLog(final ExtendedLogger logger) {
         this.logger = logger;
     }
 

Modified: logging/log4j/log4j2/trunk/log4j-jcl/src/main/java/org/apache/logging/log4j/jcl/LogFactoryImpl.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-jcl/src/main/java/org/apache/logging/log4j/jcl/LogFactoryImpl.java?rev=1600200&r1=1600199&r2=1600200&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-jcl/src/main/java/org/apache/logging/log4j/jcl/LogFactoryImpl.java (original)
+++ logging/log4j/log4j2/trunk/log4j-jcl/src/main/java/org/apache/logging/log4j/jcl/LogFactoryImpl.java Wed Jun  4 13:26:46 2014
@@ -26,7 +26,7 @@ import org.apache.commons.logging.LogCon
 import org.apache.commons.logging.LogFactory;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.spi.LoggerContext;
-import org.apache.logging.log4j.spi.LoggerProvider;
+import org.apache.logging.log4j.spi.ExtendedLogger;
 
 /**
  *
@@ -108,7 +108,7 @@ public class LogFactoryImpl extends LogF
             return getContext(FQCN, false);
         }
 
-        public static LoggerProvider getLogger(final String name) {
+        public static ExtendedLogger getLogger(final String name) {
             return getContext().getLogger(name);
         }
     }

Modified: logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java?rev=1600200&r1=1600199&r2=1600200&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java (original)
+++ logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java Wed Jun  4 13:26:46 2014
@@ -26,7 +26,7 @@ import org.apache.logging.log4j.LogManag
 import org.apache.logging.log4j.message.Message;
 import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.apache.logging.log4j.message.SimpleMessage;
-import org.apache.logging.log4j.spi.LoggerProvider;
+import org.apache.logging.log4j.spi.ExtendedLogger;
 import org.slf4j.Marker;
 import org.slf4j.MarkerFactory;
 import org.slf4j.spi.LocationAwareLogger;
@@ -41,11 +41,11 @@ public class Log4jLogger implements Loca
     private static final long serialVersionUID = 7869000638091304316L;
     private static final Marker EVENT_MARKER = MarkerFactory.getMarker("EVENT");
     private final boolean eventLogger;
-    private transient LoggerProvider logger;
+    private transient ExtendedLogger logger;
     private final String name;
     private transient EventDataConverter converter;
 
-    public Log4jLogger(final LoggerProvider logger, final String name) {
+    public Log4jLogger(final ExtendedLogger logger, final String name) {
         this.logger = logger;
         this.eventLogger = "EventLogger".equals(name);
         this.name = name;

Modified: logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLoggerFactory.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLoggerFactory.java?rev=1600200&r1=1600199&r2=1600200&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLoggerFactory.java (original)
+++ logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLoggerFactory.java Wed Jun  4 13:26:46 2014
@@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentMa
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.spi.LoggerContext;
-import org.apache.logging.log4j.spi.LoggerProvider;
+import org.apache.logging.log4j.spi.ExtendedLogger;
 import org.slf4j.ILoggerFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -98,7 +98,7 @@ public class Log4jLoggerFactory implemen
             return getContext(fqcn, false);
         }
 
-        public static LoggerProvider getLogger(final String name) {
+        public static ExtendedLogger getLogger(final String name) {
             return getContext(FQCN).getLogger(name);
         }
     }

Modified: logging/log4j/log4j2/trunk/log4j-taglib/src/main/java/org/apache/logging/log4j/taglib/Log4jTaglibLogger.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-taglib/src/main/java/org/apache/logging/log4j/taglib/Log4jTaglibLogger.java?rev=1600200&r1=1600199&r2=1600200&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-taglib/src/main/java/org/apache/logging/log4j/taglib/Log4jTaglibLogger.java (original)
+++ logging/log4j/log4j2/trunk/log4j-taglib/src/main/java/org/apache/logging/log4j/taglib/Log4jTaglibLogger.java Wed Jun  4 13:26:46 2014
@@ -18,8 +18,8 @@ package org.apache.logging.log4j.taglib;
 
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.message.MessageFactory;
-import org.apache.logging.log4j.spi.LoggerProvider;
-import org.apache.logging.log4j.spi.LoggerProviderWrapper;
+import org.apache.logging.log4j.spi.ExtendedLogger;
+import org.apache.logging.log4j.spi.ExtendedLoggerWrapper;
 
 /**
  * The bridge between the tag library and the Log4j API ensures that the source information for log events is
@@ -27,10 +27,10 @@ import org.apache.logging.log4j.spi.Logg
  *
  * @since 2.0
  */
-class Log4jTaglibLogger extends LoggerProviderWrapper {
+class Log4jTaglibLogger extends ExtendedLoggerWrapper {
     private static final long serialVersionUID = 1L;
 
-    public Log4jTaglibLogger(final LoggerProvider logger, final String name, final MessageFactory messageFactory) {
+    public Log4jTaglibLogger(final ExtendedLogger logger, final String name, final MessageFactory messageFactory) {
         super(logger, name, messageFactory);
     }
 

Modified: logging/log4j/log4j2/trunk/log4j-taglib/src/main/java/org/apache/logging/log4j/taglib/Log4jTaglibLoggerContext.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-taglib/src/main/java/org/apache/logging/log4j/taglib/Log4jTaglibLoggerContext.java?rev=1600200&r1=1600199&r2=1600200&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-taglib/src/main/java/org/apache/logging/log4j/taglib/Log4jTaglibLoggerContext.java (original)
+++ logging/log4j/log4j2/trunk/log4j-taglib/src/main/java/org/apache/logging/log4j/taglib/Log4jTaglibLoggerContext.java Wed Jun  4 13:26:46 2014
@@ -22,9 +22,9 @@ import javax.servlet.ServletContext;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.message.MessageFactory;
-import org.apache.logging.log4j.spi.AbstractLoggerProvider;
+import org.apache.logging.log4j.spi.AbstractLogger;
 import org.apache.logging.log4j.spi.LoggerContext;
-import org.apache.logging.log4j.spi.LoggerProvider;
+import org.apache.logging.log4j.spi.ExtendedLogger;
 
 /**
  * This bridge between the tag library and the Log4j API ensures that instances of {@link Log4jTaglibLogger} are
@@ -61,7 +61,7 @@ final class Log4jTaglibLoggerContext imp
     public Log4jTaglibLogger getLogger(final String name, final MessageFactory factory) {
         Log4jTaglibLogger logger = this.loggers.get(name);
         if (logger != null) {
-            AbstractLoggerProvider.checkMessageFactory(logger, factory);
+            AbstractLogger.checkMessageFactory(logger, factory);
             return logger;
         }
 
@@ -69,7 +69,7 @@ final class Log4jTaglibLoggerContext imp
             logger = this.loggers.get(name);
             if (logger == null) {
                 final LoggerContext context = LogManager.getContext(false);
-                final LoggerProvider original = factory == null ?
+                final ExtendedLogger original = factory == null ?
                         context.getLogger(name) : context.getLogger(name, factory);
                 // wrap a logger from an underlying implementation
                 logger = new Log4jTaglibLogger(original, name, original.getMessageFactory());

Modified: logging/log4j/log4j2/trunk/log4j-taglib/src/main/java/org/apache/logging/log4j/taglib/TagUtils.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-taglib/src/main/java/org/apache/logging/log4j/taglib/TagUtils.java?rev=1600200&r1=1600199&r2=1600200&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-taglib/src/main/java/org/apache/logging/log4j/taglib/TagUtils.java (original)
+++ logging/log4j/log4j2/trunk/log4j-taglib/src/main/java/org/apache/logging/log4j/taglib/TagUtils.java Wed Jun  4 13:26:46 2014
@@ -27,7 +27,7 @@ import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LoggingException;
 import org.apache.logging.log4j.Marker;
 import org.apache.logging.log4j.message.MessageFactory;
-import org.apache.logging.log4j.spi.AbstractLoggerProvider;
+import org.apache.logging.log4j.spi.AbstractLogger;
 import org.apache.logging.log4j.status.StatusLogger;
 
 /**
@@ -75,13 +75,13 @@ final class TagUtils {
             if (logger instanceof Log4jTaglibLogger) {
                 return (Log4jTaglibLogger) logger;
             }
-            if (logger instanceof AbstractLoggerProvider) {
+            if (logger instanceof AbstractLogger) {
                 if (LOGGER.isInfoEnabled() && !WARNED_FOR.contains(logger)) {
                     LOGGER.info("Constructing new Log4jTaglibLogger from AbstractLogger {} name and message factory.",
                             logger.getClass().getName());
                     WARNED_FOR.add(logger);
                 }
-                final AbstractLoggerProvider original = (AbstractLoggerProvider) logger;
+                final AbstractLogger original = (AbstractLogger) logger;
                 return getLogger(context, original.getName(), original.getMessageFactory());
             }
             throw new JspException(

Modified: logging/log4j/log4j2/trunk/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/LoggerAwareTagSupportTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/LoggerAwareTagSupportTest.java?rev=1600200&r1=1600199&r2=1600200&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/LoggerAwareTagSupportTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/LoggerAwareTagSupportTest.java Wed Jun  4 13:26:46 2014
@@ -18,7 +18,7 @@ package org.apache.logging.log4j.taglib;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.spi.AbstractLoggerProvider;
+import org.apache.logging.log4j.spi.AbstractLogger;
 import org.junit.Test;
 import org.springframework.mock.web.MockPageContext;
 
@@ -74,7 +74,7 @@ public class LoggerAwareTagSupportTest {
     public void testGetLoggerWithTaglibLogger() throws Exception {
         this.setUp(null);
 
-        final AbstractLoggerProvider wrapped = (AbstractLoggerProvider)LogManager.getLogger("testGetLoggerWithTaglibLogger");
+        final AbstractLogger wrapped = (AbstractLogger)LogManager.getLogger("testGetLoggerWithTaglibLogger");
         final Log4jTaglibLogger logger = new Log4jTaglibLogger(wrapped, wrapped.getName(), wrapped.getMessageFactory());
 
         this.tag.setLogger(logger);

Modified: logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java?rev=1600200&r1=1600199&r2=1600200&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java (original)
+++ logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java Wed Jun  4 13:26:46 2014
@@ -21,14 +21,14 @@ import org.apache.logging.log4j.Marker;
 import org.apache.logging.log4j.message.LoggerNameAwareMessage;
 import org.apache.logging.log4j.message.Message;
 import org.apache.logging.log4j.message.MessageFactory;
-import org.apache.logging.log4j.spi.AbstractLoggerProvider;
+import org.apache.logging.log4j.spi.AbstractLogger;
 import org.slf4j.MarkerFactory;
 import org.slf4j.spi.LocationAwareLogger;
 
 /**
  *
  */
-public class SLF4JLogger extends AbstractLoggerProvider {
+public class SLF4JLogger extends AbstractLogger {
 
     private static final long serialVersionUID = 1L;
     private final org.slf4j.Logger logger;

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=1600200&r1=1600199&r2=1600200&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 Wed Jun  4 13:26:46 2014
@@ -21,7 +21,7 @@ import java.util.concurrent.ConcurrentMa
 
 import org.apache.logging.log4j.message.MessageFactory;
 import org.apache.logging.log4j.spi.LoggerContext;
-import org.apache.logging.log4j.spi.LoggerProvider;
+import org.apache.logging.log4j.spi.ExtendedLogger;
 import org.slf4j.LoggerFactory;
 
 /**
@@ -36,7 +36,7 @@ public class SLF4JLoggerContext implemen
     }
 
     @Override
-    public LoggerProvider getLogger(final String name) {
+    public ExtendedLogger getLogger(final String name) {
         if (!loggers.containsKey(name)) {
             loggers.putIfAbsent(name, new SLF4JLogger(name, LoggerFactory.getLogger(name)));
         }
@@ -44,7 +44,7 @@ public class SLF4JLoggerContext implemen
     }
 
     @Override
-    public LoggerProvider getLogger(final String name, final MessageFactory messageFactory) {
+    public ExtendedLogger getLogger(final String name, final MessageFactory messageFactory) {
         if (!loggers.containsKey(name)) {
             loggers.putIfAbsent(name, new SLF4JLogger(name, messageFactory, LoggerFactory.getLogger(name)));
         }

Modified: logging/log4j/log4j2/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/changes.xml?rev=1600200&r1=1600199&r2=1600200&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/changes/changes.xml (original)
+++ logging/log4j/log4j2/trunk/src/changes/changes.xml Wed Jun  4 13:26:46 2014
@@ -140,7 +140,7 @@
           Make Blocking the default WaitStrategy for Async Loggers.
       </action>
       <action issue="LOG4J2-555" dev="rpopma" type="update" due-to="Bruce Brouwer">
-          Introduce LoggerProvider interface to facilitate implementing and extending Loggers.
+          Introduce ExtendedLogger interface to facilitate implementing and extending Loggers.
       </action>
       <action issue="LOG4J2-560" dev="rgoers" type="fix">
           SyslogAppenderTest and RFC5424LayoutTest were failing in Java 8.



Mime
View raw message