Author: mattsicker Date: Sun Mar 30 04:55:23 2014 New Revision: 1583105 URL: http://svn.apache.org/r1583105 Log: Rename to Log4jLogger.
Added: logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java - copied, changed from r1583104, logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4j2Logger.java Removed: logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4j2Logger.java Modified: logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLoggerFactory.java logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java Copied: logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java (from r1583104, logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4j2Logger.java) URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java?p2=logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java&p1=logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4j2Logger.java&r1=1583104&r2=1583105&rev=1583105&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4j2Logger.java (original) +++ logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java Sun Mar 30 04:55:23 2014 @@ -34,9 +34,9 @@ import org.slf4j.spi.LocationAwareLogger /** * SLF4J logger implementation that uses Log4j. */ -public class Log4j2Logger implements LocationAwareLogger, Serializable { +public class Log4jLogger implements LocationAwareLogger, Serializable { - public static final String FQCN = Log4j2Logger.class.getName(); + public static final String FQCN = Log4jLogger.class.getName(); private static final long serialVersionUID = 7869000638091304316L; private static final Marker EVENT_MARKER = MarkerFactory.getMarker("EVENT"); @@ -45,7 +45,7 @@ public class Log4j2Logger implements Loc private final String name; private transient EventDataConverter converter; - public Log4j2Logger(final LoggerProvider logger, final String name) { + public Log4jLogger(final LoggerProvider 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=1583105&r1=1583104&r2=1583105&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 Sun Mar 30 04:55:23 2014 @@ -48,7 +48,7 @@ public class Log4jLoggerFactory implemen return loggers.get(name); } final String key = Logger.ROOT_LOGGER_NAME.equals(name) ? LogManager.ROOT_LOGGER_NAME : name; - loggers.putIfAbsent(name, new Log4j2Logger(context.getLogger(key), name)); + loggers.putIfAbsent(name, new Log4jLogger(context.getLogger(key), name)); return loggers.get(name); } Modified: logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java?rev=1583105&r1=1583104&r2=1583105&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java (original) +++ logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java Sun Mar 30 04:55:23 2014 @@ -113,7 +113,7 @@ public class LoggerTest { verify("List", "o.a.l.s.LoggerTest Debug message {} MDC{}" + Constants.LINE_SEP); logger.debug("Debug message {}", (Object[]) null); verify("List", "o.a.l.s.LoggerTest Debug message {} MDC{}" + Constants.LINE_SEP); - ((LocationAwareLogger)logger).log(null, Log4j2Logger.class.getName(), LocationAwareLogger.DEBUG_INT, + ((LocationAwareLogger)logger).log(null, Log4jLogger.class.getName(), LocationAwareLogger.DEBUG_INT, "Debug message {}", null, null); verify("List", "o.a.l.s.LoggerTest Debug message {} MDC{}" + Constants.LINE_SEP); }