logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggreg...@apache.org
Subject svn commit: r1580759 - in /logging/log4j/log4j2/trunk: 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/logging/log4j/status/ log4j-api/src/test/java/org/a...
Date Mon, 24 Mar 2014 05:58:25 GMT
Author: ggregory
Date: Mon Mar 24 05:58:25 2014
New Revision: 1580759

URL: http://svn.apache.org/r1580759
Log:
Rename AbstractLogger to AbstractLoggerProvider since it now implements LoggerProvider.

Added:
    logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLoggerProvider.java
      - copied, changed from r1580671, logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
Removed:
    logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
Modified:
    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/AbstractLoggerWrapper.java
    logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerStream.java
    logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerWriter.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-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-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

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=1580759&r1=1580758&r2=1580759&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
Mon Mar 24 05:58:25 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.AbstractLogger;
+import org.apache.logging.log4j.spi.AbstractLoggerProvider;
 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 AbstractLogger {
+public class SimpleLogger extends AbstractLoggerProvider {
 
     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=1580759&r1=1580758&r2=1580759&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
Mon Mar 24 05:58:25 2014
@@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentMa
 
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.message.MessageFactory;
-import org.apache.logging.log4j.spi.AbstractLogger;
+import org.apache.logging.log4j.spi.AbstractLoggerProvider;
 import org.apache.logging.log4j.spi.LoggerContext;
 import org.apache.logging.log4j.spi.LoggerProvider;
 import org.apache.logging.log4j.util.PropertiesUtil;
@@ -105,7 +105,7 @@ public class SimpleLoggerContext impleme
     public LoggerProvider getLogger(final String name, final MessageFactory messageFactory)
{
         if (loggers.containsKey(name)) {
             final LoggerProvider logger = loggers.get(name);
-            AbstractLogger.checkMessageFactory(logger, messageFactory);
+            AbstractLoggerProvider.checkMessageFactory(logger, messageFactory);
             return logger;
         }
 

Copied: logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLoggerProvider.java
(from r1580671, logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLoggerProvider.java?p2=logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLoggerProvider.java&p1=logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java&r1=1580671&r2=1580759&rev=1580759&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
(original)
+++ logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLoggerProvider.java
Mon Mar 24 05:58:25 2014
@@ -31,7 +31,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 AbstractLogger implements LoggerProvider, Serializable {
+public abstract class AbstractLoggerProvider implements LoggerProvider, Serializable {
 
     private static final long serialVersionUID = 2L;
 
@@ -70,7 +70,7 @@ public abstract class AbstractLogger imp
      */
     public static final Class<? extends MessageFactory> DEFAULT_MESSAGE_FACTORY_CLASS
= ParameterizedMessageFactory.class;
 
-    private static final String FQCN = AbstractLogger.class.getName();
+    private static final String FQCN = AbstractLoggerProvider.class.getName();
 
     private static final String THROWING = "throwing";
 
@@ -108,7 +108,7 @@ public abstract class AbstractLogger imp
     /**
      * Creates a new logger named after the class (or subclass).
      */
-    public AbstractLogger() {
+    public AbstractLoggerProvider() {
         this.name = getClass().getName();
         this.messageFactory = createDefaultMessageFactory();
     }
@@ -118,7 +118,7 @@ public abstract class AbstractLogger imp
      * 
      * @param name the logger name
      */
-    public AbstractLogger(final String name) {
+    public AbstractLoggerProvider(final String name) {
         this.name = name;
         this.messageFactory = createDefaultMessageFactory();
     }
@@ -129,7 +129,7 @@ public abstract class AbstractLogger imp
      * @param name the logger name
      * @param messageFactory the message factory, if null then use the default message factory.
      */
-    public AbstractLogger(final String name, final MessageFactory messageFactory) {
+    public AbstractLoggerProvider(final String name, final MessageFactory messageFactory)
{
         this.name = name;
         this.messageFactory = messageFactory == null ? createDefaultMessageFactory() : messageFactory;
     }

Modified: logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLoggerWrapper.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLoggerWrapper.java?rev=1580759&r1=1580758&r2=1580759&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLoggerWrapper.java
(original)
+++ logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLoggerWrapper.java
Mon Mar 24 05:58:25 2014
@@ -24,7 +24,7 @@ import org.apache.logging.log4j.message.
 /**
  * Wrapper class that exposes the protected AbstractLogger methods to support wrapped loggers.
  */
-public class AbstractLoggerWrapper extends AbstractLogger {
+public class AbstractLoggerWrapper extends AbstractLoggerProvider {
 
     private static final long serialVersionUID = 1L;
     

Modified: logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerStream.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerStream.java?rev=1580759&r1=1580758&r2=1580759&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerStream.java
(original)
+++ logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerStream.java
Mon Mar 24 05:58:25 2014
@@ -37,12 +37,12 @@ public class LoggerStream extends PrintS
 
     final PrintStream stream;
 
-    public LoggerStream(final AbstractLogger logger, final Level level) {
+    public LoggerStream(final AbstractLoggerProvider logger, final Level level) {
         super(System.out);
         stream = new PrintStream(new HelperStream(logger, null, level), true);
     }
 
-    public LoggerStream(final AbstractLogger logger, final Marker marker, final Level level)
{
+    public LoggerStream(final AbstractLoggerProvider logger, final Marker marker, final Level
level) {
         super(System.out);
         stream = new PrintStream(new HelperStream(logger, marker, level), true);
     }
@@ -235,11 +235,11 @@ public class LoggerStream extends PrintS
 
     private static class HelperStream extends ByteArrayOutputStream {
         private static final String FQCN = LoggerStream.class.getName();
-        private final AbstractLogger logger;
+        private final AbstractLoggerProvider logger;
         private final Level level;
         private final Marker marker;
 
-        private HelperStream(AbstractLogger logger, Marker marker, Level level) {
+        private HelperStream(AbstractLoggerProvider logger, Marker marker, Level level) {
             this.logger = logger;
             this.marker = marker;
             this.level = level;

Modified: logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerWriter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerWriter.java?rev=1580759&r1=1580758&r2=1580759&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerWriter.java
(original)
+++ logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerWriter.java
Mon Mar 24 05:58:25 2014
@@ -25,12 +25,12 @@ import org.apache.logging.log4j.message.
 
 public class LoggerWriter extends Writer {
     private static final String FQCN = LoggerWriter.class.getName();
-    private final AbstractLogger logger;
+    private final AbstractLoggerProvider logger;
     private final Level level;
     private final Marker marker;
     private final StringBuilder buf = new StringBuilder();
 
-    public LoggerWriter(AbstractLogger logger, Marker marker, Level level) {
+    public LoggerWriter(AbstractLoggerProvider logger, Marker marker, Level level) {
         this.logger = logger;
         this.marker = marker;
         this.level = level;

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=1580759&r1=1580758&r2=1580759&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
Mon Mar 24 05:58:25 2014
@@ -31,13 +31,13 @@ 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.AbstractLogger;
+import org.apache.logging.log4j.spi.AbstractLoggerProvider;
 import org.apache.logging.log4j.util.PropertiesUtil;
 
 /**
  * Mechanism to record events that occur in the logging system.
  */
-public final class StatusLogger extends AbstractLogger {
+public final class StatusLogger extends AbstractLoggerProvider {
 
     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=1580759&r1=1580758&r2=1580759&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
Mon Mar 24 05:58:25 2014
@@ -23,13 +23,13 @@ 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.AbstractLogger;
+import org.apache.logging.log4j.spi.AbstractLoggerProvider;
 import org.junit.Test;
 
 /**
  *
  */
-public class AbstractLoggerTest extends AbstractLogger {
+public class AbstractLoggerTest extends AbstractLoggerProvider {
 
     private static class LogEvent {
 
@@ -52,7 +52,7 @@ public class AbstractLoggerTest extends 
 
     private static Throwable t = new UnsupportedOperationException("Test");
 
-    private static Class<AbstractLogger> obj = AbstractLogger.class;
+    private static Class<AbstractLoggerProvider> obj = AbstractLoggerProvider.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=1580759&r1=1580758&r2=1580759&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
Mon Mar 24 05:58:25 2014
@@ -18,7 +18,7 @@ package org.apache.logging.log4j;
 
 import org.apache.logging.log4j.message.Message;
 import org.apache.logging.log4j.message.MessageFactory;
-import org.apache.logging.log4j.spi.AbstractLogger;
+import org.apache.logging.log4j.spi.AbstractLoggerProvider;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
@@ -29,7 +29,7 @@ import java.util.Map;
 /**
  *
  */
-public class TestLogger extends AbstractLogger {
+public class TestLogger extends AbstractLoggerProvider {
 
     private static final long serialVersionUID = 1L;
 

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=1580759&r1=1580758&r2=1580759&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
Mon Mar 24 05:58:25 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.AbstractLogger;
+import org.apache.logging.log4j.spi.AbstractLoggerProvider;
 
 /**
  * @doubt All the isEnabled methods could be pushed into a filter interface.  Not sure of
the utility of having
@@ -37,7 +37,7 @@ import org.apache.logging.log4j.spi.Abst
  * Logger noticeably impacts performance. The message pattern and parameters are required
so that they can be
  * used in global filters.
  */
-public class Logger extends AbstractLogger {
+public class Logger extends AbstractLoggerProvider {
 
     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=1580759&r1=1580758&r2=1580759&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
Mon Mar 24 05:58:25 2014
@@ -41,7 +41,7 @@ import org.apache.logging.log4j.core.hel
 import org.apache.logging.log4j.core.helpers.NetUtils;
 import org.apache.logging.log4j.core.jmx.Server;
 import org.apache.logging.log4j.message.MessageFactory;
-import org.apache.logging.log4j.spi.AbstractLogger;
+import org.apache.logging.log4j.spi.AbstractLoggerProvider;
 import org.apache.logging.log4j.status.StatusLogger;
 
 /**
@@ -299,7 +299,7 @@ public class LoggerContext implements or
     public Logger getLogger(final String name, final MessageFactory messageFactory) {
         Logger logger = loggers.get(name);
         if (logger != null) {
-            AbstractLogger.checkMessageFactory(logger, messageFactory);
+            AbstractLoggerProvider.checkMessageFactory(logger, messageFactory);
             return logger;
         }
 

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=1580759&r1=1580758&r2=1580759&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
Mon Mar 24 05:58:25 2014
@@ -21,7 +21,7 @@ import javax.servlet.ServletContext;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.message.MessageFactory;
-import org.apache.logging.log4j.spi.AbstractLogger;
+import org.apache.logging.log4j.spi.AbstractLoggerProvider;
 import org.apache.logging.log4j.spi.LoggerContext;
 import org.apache.logging.log4j.spi.LoggerProvider;
 
@@ -60,7 +60,7 @@ final class Log4jTaglibLoggerContext imp
     public Log4jTaglibLogger getLogger(final String name, final MessageFactory factory) {
         Log4jTaglibLogger logger = this.loggers.get(name);
         if (logger != null) {
-            AbstractLogger.checkMessageFactory(logger, factory);
+            AbstractLoggerProvider.checkMessageFactory(logger, factory);
             return logger;
         }
 

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=1580759&r1=1580758&r2=1580759&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
Mon Mar 24 05:58:25 2014
@@ -26,7 +26,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.AbstractLogger;
+import org.apache.logging.log4j.spi.AbstractLoggerProvider;
 import org.apache.logging.log4j.status.StatusLogger;
 
 /**
@@ -74,13 +74,13 @@ final class TagUtils {
             if (logger instanceof Log4jTaglibLogger) {
                 return (Log4jTaglibLogger) logger;
             }
-            if (logger instanceof AbstractLogger) {
+            if (logger instanceof AbstractLoggerProvider) {
                 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 AbstractLogger original = (AbstractLogger) logger;
+                final AbstractLoggerProvider original = (AbstractLoggerProvider) 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=1580759&r1=1580758&r2=1580759&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
Mon Mar 24 05:58:25 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.AbstractLogger;
+import org.apache.logging.log4j.spi.AbstractLoggerProvider;
 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 AbstractLogger wrapped = (AbstractLogger)LogManager.getLogger("testGetLoggerWithTaglibLogger");
+        final AbstractLoggerProvider wrapped = (AbstractLoggerProvider)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=1580759&r1=1580758&r2=1580759&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
Mon Mar 24 05:58:25 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.AbstractLogger;
+import org.apache.logging.log4j.spi.AbstractLoggerProvider;
 import org.slf4j.MarkerFactory;
 import org.slf4j.spi.LocationAwareLogger;
 
 /**
  *
  */
-public class SLF4JLogger extends AbstractLogger {
+public class SLF4JLogger extends AbstractLoggerProvider {
 
     private static final long serialVersionUID = 1L;
     private final org.slf4j.Logger logger;



Mime
View raw message