This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SLF4J: Simple Logging Facade for Java". The branch, master has been updated via 6dd2bd58cffc857d064d0e0ac3017d6aee924bb8 (commit) from d1d27b8d8748190f397b0be72c8d85722f8c5b00 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=slf4j.git;a=commit;h=6dd2bd58cffc857d064d0e0ac30... http://github.com/ceki/slf4j/commit/6dd2bd58cffc857d064d0e0ac3017d6aee924bb8 commit 6dd2bd58cffc857d064d0e0ac3017d6aee924bb8 Author: Ceki Gulcu <ceki@qos.ch> Date: Fri Apr 9 00:21:28 2010 +0200 Fixing http://bugzilla.slf4j.org/show_bug.cgi?id=127 The log method in LocationAwareLogger interface now admits an additional parameter of type Object[] representing additional arguments of the log request. Due to this modification, slf4j-api version 1.6.x will not work with bindings shipping with SLF4J 1.5.x -- bindings shipping with 1.6.x must be used. diff --git a/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLocationAwareLog.java b/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLocationAwareLog.java index 7171784..727951c 100644 --- a/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLocationAwareLog.java +++ b/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLocationAwareLog.java @@ -38,7 +38,7 @@ public class SLF4JLocationAwareLog implements Log, Serializable { private static final long serialVersionUID = -2379157579039314822L; - //used to store this logger's name to recreate it after serialization + // used to store this logger's name to recreate it after serialization protected String name; // in both Log4jLogger and Jdk14Logger classes in the original JCL, the @@ -105,7 +105,7 @@ public class SLF4JLocationAwareLog implements Log, Serializable { */ public void trace(Object message) { logger.log(null, FQCN, LocationAwareLogger.TRACE_INT, String - .valueOf(message), null); + .valueOf(message), null, null); } /** @@ -119,7 +119,7 @@ public class SLF4JLocationAwareLog implements Log, Serializable { */ public void trace(Object message, Throwable t) { logger.log(null, FQCN, LocationAwareLogger.TRACE_INT, String - .valueOf(message), t); + .valueOf(message), null, t); } /** @@ -131,7 +131,7 @@ public class SLF4JLocationAwareLog implements Log, Serializable { */ public void debug(Object message) { logger.log(null, FQCN, LocationAwareLogger.DEBUG_INT, String - .valueOf(message), null); + .valueOf(message), null, null); } /** @@ -145,7 +145,7 @@ public class SLF4JLocationAwareLog implements Log, Serializable { */ public void debug(Object message, Throwable t) { logger.log(null, FQCN, LocationAwareLogger.DEBUG_INT, String - .valueOf(message), t); + .valueOf(message), null, t); } /** @@ -157,7 +157,7 @@ public class SLF4JLocationAwareLog implements Log, Serializable { */ public void info(Object message) { logger.log(null, FQCN, LocationAwareLogger.INFO_INT, String - .valueOf(message), null); + .valueOf(message), null, null); } /** @@ -171,7 +171,7 @@ public class SLF4JLocationAwareLog implements Log, Serializable { */ public void info(Object message, Throwable t) { logger.log(null, FQCN, LocationAwareLogger.INFO_INT, String - .valueOf(message), t); + .valueOf(message), null, t); } /** @@ -183,7 +183,7 @@ public class SLF4JLocationAwareLog implements Log, Serializable { */ public void warn(Object message) { logger.log(null, FQCN, LocationAwareLogger.WARN_INT, String - .valueOf(message), null); + .valueOf(message), null, null); } /** @@ -197,7 +197,7 @@ public class SLF4JLocationAwareLog implements Log, Serializable { */ public void warn(Object message, Throwable t) { logger.log(null, FQCN, LocationAwareLogger.WARN_INT, String - .valueOf(message), t); + .valueOf(message), null, t); } /** @@ -209,7 +209,7 @@ public class SLF4JLocationAwareLog implements Log, Serializable { */ public void error(Object message) { logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String - .valueOf(message), null); + .valueOf(message), null, null); } /** @@ -223,7 +223,7 @@ public class SLF4JLocationAwareLog implements Log, Serializable { */ public void error(Object message, Throwable t) { logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String - .valueOf(message), t); + .valueOf(message), null, t); } /** @@ -235,7 +235,7 @@ public class SLF4JLocationAwareLog implements Log, Serializable { */ public void fatal(Object message) { logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String - .valueOf(message), null); + .valueOf(message), null, null); } /** @@ -249,7 +249,7 @@ public class SLF4JLocationAwareLog implements Log, Serializable { */ public void fatal(Object message, Throwable t) { logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String - .valueOf(message), t); + .valueOf(message), null, t); } /** diff --git a/jul-to-slf4j/src/main/java/org/slf4j/bridge/SLF4JBridgeHandler.java b/jul-to-slf4j/src/main/java/org/slf4j/bridge/SLF4JBridgeHandler.java index 1a3a111..850b989 100644 --- a/jul-to-slf4j/src/main/java/org/slf4j/bridge/SLF4JBridgeHandler.java +++ b/jul-to-slf4j/src/main/java/org/slf4j/bridge/SLF4JBridgeHandler.java @@ -189,7 +189,7 @@ public class SLF4JBridgeHandler extends Handler { slf4jLevel = LocationAwareLogger.ERROR_INT; } String i18nMessage = getMessageI18N(record); - lal.log(null, FQCN, slf4jLevel, i18nMessage, record.getThrown()); + lal.log(null, FQCN, slf4jLevel, i18nMessage, null, record.getThrown()); } protected void callPlainSLF4JLogger(Logger slf4jLogger, LogRecord record) { diff --git a/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java b/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java index 0d5d765..5aaae14 100644 --- a/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java +++ b/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java @@ -45,8 +45,6 @@ public class Category { protected org.slf4j.Logger slf4jLogger; private org.slf4j.spi.LocationAwareLogger locationAwareLogger; - - private static Marker FATAL_MARKER = MarkerFactory.getMarker("FATAL"); Category(String name) { @@ -175,7 +173,7 @@ public class Category { Throwable t) { String m = convertToString(message); if (locationAwareLogger != null) { - locationAwareLogger.log(marker, fqcn, level, m, t); + locationAwareLogger.log(marker, fqcn, level, m, null, t); } else { switch (level) { case LocationAwareLogger.TRACE_INT: diff --git a/slf4j-api/src/main/java/org/slf4j/spi/LocationAwareLogger.java b/slf4j-api/src/main/java/org/slf4j/spi/LocationAwareLogger.java index 9786551..523589d 100644 --- a/slf4j-api/src/main/java/org/slf4j/spi/LocationAwareLogger.java +++ b/slf4j-api/src/main/java/org/slf4j/spi/LocationAwareLogger.java @@ -55,6 +55,6 @@ public interface LocationAwareLogger extends Logger { * @param message * @param t */ - public void log(Marker marker, String fqcn, int level, String message, Throwable t); + public void log(Marker marker, String fqcn, int level, String message, Object[] argArray, Throwable t); } diff --git a/slf4j-ext/src/main/java/org/slf4j/cal10n/LocLogger.java b/slf4j-ext/src/main/java/org/slf4j/cal10n/LocLogger.java index 6cf2075..761143a 100644 --- a/slf4j-ext/src/main/java/org/slf4j/cal10n/LocLogger.java +++ b/slf4j-ext/src/main/java/org/slf4j/cal10n/LocLogger.java @@ -49,9 +49,9 @@ public class LocLogger extends LoggerWrapper implements Logger { final IMessageConveyor imc; - public LocLogger(Logger logger, IMessageConveyor imc) { + public LocLogger(Logger logger, IMessageConveyor imc) { super(logger, LoggerWrapper.class.getName()); - if(imc == null) { + if (imc == null) { throw new IllegalArgumentException("IMessageConveyor cannot be null"); } this.imc = imc; @@ -74,7 +74,7 @@ public class LocLogger extends LoggerWrapper implements Logger { if (instanceofLAL) { ((LocationAwareLogger) logger).log(LOCALIZED, FQCN, - LocationAwareLogger.TRACE_INT, translatedMsg, null); + LocationAwareLogger.TRACE_INT, translatedMsg, args, null); } else { logger.trace(LOCALIZED, translatedMsg, mpo); } @@ -97,7 +97,7 @@ public class LocLogger extends LoggerWrapper implements Logger { if (instanceofLAL) { ((LocationAwareLogger) logger).log(LOCALIZED, FQCN, - LocationAwareLogger.DEBUG_INT, translatedMsg, null); + LocationAwareLogger.DEBUG_INT, translatedMsg, args, null); } else { logger.debug(LOCALIZED, translatedMsg, mpo); } @@ -120,7 +120,7 @@ public class LocLogger extends LoggerWrapper implements Logger { if (instanceofLAL) { ((LocationAwareLogger) logger).log(LOCALIZED, FQCN, - LocationAwareLogger.INFO_INT, translatedMsg, null); + LocationAwareLogger.INFO_INT, translatedMsg, args, null); } else { logger.info(LOCALIZED, translatedMsg, mpo); } @@ -143,7 +143,7 @@ public class LocLogger extends LoggerWrapper implements Logger { if (instanceofLAL) { ((LocationAwareLogger) logger).log(LOCALIZED, FQCN, - LocationAwareLogger.WARN_INT, translatedMsg, null); + LocationAwareLogger.WARN_INT, translatedMsg, args, null); } else { logger.warn(LOCALIZED, translatedMsg, mpo); } @@ -166,7 +166,7 @@ public class LocLogger extends LoggerWrapper implements Logger { if (instanceofLAL) { ((LocationAwareLogger) logger).log(LOCALIZED, FQCN, - LocationAwareLogger.ERROR_INT, translatedMsg, null); + LocationAwareLogger.ERROR_INT, translatedMsg, args, null); } else { logger.error(LOCALIZED, translatedMsg, mpo); } diff --git a/slf4j-ext/src/main/java/org/slf4j/ext/EventLogger.java b/slf4j-ext/src/main/java/org/slf4j/ext/EventLogger.java index e3a26b4..2f77c1b 100755 --- a/slf4j-ext/src/main/java/org/slf4j/ext/EventLogger.java +++ b/slf4j-ext/src/main/java/org/slf4j/ext/EventLogger.java @@ -34,7 +34,7 @@ public class EventLogger { public static void logEvent(EventData data) { if (eventLogger.instanceofLAL) { ((LocationAwareLogger) eventLogger.logger).log(EVENT_MARKER, FQCN, - LocationAwareLogger.INFO_INT, data.toXML(), null); + LocationAwareLogger.INFO_INT, data.toXML(), null, null); } else { eventLogger.logger.info(EVENT_MARKER, data.toXML(), data); } diff --git a/slf4j-ext/src/main/java/org/slf4j/ext/LoggerWrapper.java b/slf4j-ext/src/main/java/org/slf4j/ext/LoggerWrapper.java index 5ca7aeb..75f8e65 100644 --- a/slf4j-ext/src/main/java/org/slf4j/ext/LoggerWrapper.java +++ b/slf4j-ext/src/main/java/org/slf4j/ext/LoggerWrapper.java @@ -6,27 +6,27 @@ import org.slf4j.helpers.MessageFormatter; import org.slf4j.spi.LocationAwareLogger; /** - * A helper class wrapping an {@link org.slf4j.Logger} - * instance preserving location information if the wrapped - * instance supports it. + * A helper class wrapping an {@link org.slf4j.Logger} instance preserving + * location information if the wrapped instance supports it. * * @author Ralph Goers * @author Ceki Gülcü */ public class LoggerWrapper implements Logger { - // To ensure consistency between two instances sharing the same name (homonyms) - // a LoggerWrapper should not contain any state beyond + // To ensure consistency between two instances sharing the same name + // (homonyms) + // a LoggerWrapper should not contain any state beyond // the Logger instance it wraps. // Note that 'instanceofLAL' directly depends on Logger. // fqcn depend on the caller, but its value would not be different // between successive invocations of a factory class - + protected final Logger logger; final String fqcn; // is this logger instance a LocationAwareLogger protected final boolean instanceofLAL; - + public LoggerWrapper(Logger logger, String fqcn) { this.logger = logger; this.fqcn = fqcn; @@ -36,7 +36,7 @@ public class LoggerWrapper implements Logger { instanceofLAL = false; } } - + /** * Delegate to the appropriate method of the underlying logger. */ @@ -60,7 +60,7 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { ((LocationAwareLogger) logger).log(null, fqcn, - LocationAwareLogger.TRACE_INT, msg, null); + LocationAwareLogger.TRACE_INT, msg, null, null); } else { logger.trace(msg); } @@ -76,7 +76,8 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { String formattedMessage = MessageFormatter.format(format, arg); ((LocationAwareLogger) logger).log(null, fqcn, - LocationAwareLogger.TRACE_INT, formattedMessage, null); + LocationAwareLogger.TRACE_INT, formattedMessage, + new Object[] { arg }, null); } else { logger.trace(format, arg); } @@ -92,7 +93,8 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { String formattedMessage = MessageFormatter.format(format, arg1, arg2); ((LocationAwareLogger) logger).log(null, fqcn, - LocationAwareLogger.TRACE_INT, formattedMessage, null); + LocationAwareLogger.TRACE_INT, formattedMessage, new Object[] { arg1, + arg2 }, null); } else { logger.trace(format, arg1, arg2); } @@ -108,7 +110,7 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { String formattedMessage = MessageFormatter.arrayFormat(format, argArray); ((LocationAwareLogger) logger).log(null, fqcn, - LocationAwareLogger.TRACE_INT, formattedMessage, null); + LocationAwareLogger.TRACE_INT, formattedMessage, argArray, null); } else { logger.trace(format, argArray); } @@ -123,7 +125,7 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { ((LocationAwareLogger) logger).log(null, fqcn, - LocationAwareLogger.TRACE_INT, msg, t); + LocationAwareLogger.TRACE_INT, msg, null, t); } else { logger.trace(msg, t); } @@ -137,7 +139,7 @@ public class LoggerWrapper implements Logger { return; if (instanceofLAL) { ((LocationAwareLogger) logger).log(marker, fqcn, - LocationAwareLogger.TRACE_INT, msg, null); + LocationAwareLogger.TRACE_INT, msg, null, null); } else { logger.trace(marker, msg); } @@ -152,7 +154,8 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { String formattedMessage = MessageFormatter.format(format, arg); ((LocationAwareLogger) logger).log(marker, fqcn, - LocationAwareLogger.TRACE_INT, formattedMessage, null); + LocationAwareLogger.TRACE_INT, formattedMessage, + new Object[] { arg }, null); } else { logger.trace(marker, format, arg); } @@ -167,7 +170,8 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { String formattedMessage = MessageFormatter.format(format, arg1, arg2); ((LocationAwareLogger) logger).log(marker, fqcn, - LocationAwareLogger.TRACE_INT, formattedMessage, null); + LocationAwareLogger.TRACE_INT, formattedMessage, new Object[] { arg1, + arg2 }, null); } else { logger.trace(marker, format, arg1, arg2); } @@ -182,7 +186,7 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { String formattedMessage = MessageFormatter.arrayFormat(format, argArray); ((LocationAwareLogger) logger).log(marker, fqcn, - LocationAwareLogger.TRACE_INT, formattedMessage, null); + LocationAwareLogger.TRACE_INT, formattedMessage, argArray, null); } else { logger.trace(marker, format, argArray); } @@ -196,7 +200,7 @@ public class LoggerWrapper implements Logger { return; if (instanceofLAL) { ((LocationAwareLogger) logger).log(marker, fqcn, - LocationAwareLogger.TRACE_INT, msg, t); + LocationAwareLogger.TRACE_INT, msg, null, t); } else { logger.trace(marker, msg, t); } @@ -225,7 +229,7 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { ((LocationAwareLogger) logger).log(null, fqcn, - LocationAwareLogger.DEBUG_INT, msg, null); + LocationAwareLogger.DEBUG_INT, msg, null, null); } else { logger.debug(msg); } @@ -241,7 +245,8 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { String formattedMessage = MessageFormatter.format(format, arg); ((LocationAwareLogger) logger).log(null, fqcn, - LocationAwareLogger.DEBUG_INT, formattedMessage, null); + LocationAwareLogger.DEBUG_INT, formattedMessage, + new Object[] { arg }, null); } else { logger.debug(format, arg); } @@ -257,7 +262,8 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { String formattedMessage = MessageFormatter.format(format, arg1, arg2); ((LocationAwareLogger) logger).log(null, fqcn, - LocationAwareLogger.DEBUG_INT, formattedMessage, null); + LocationAwareLogger.DEBUG_INT, formattedMessage, new Object[] { arg1, + arg2 }, null); } else { logger.debug(format, arg1, arg2); } @@ -273,7 +279,7 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { String formattedMessage = MessageFormatter.arrayFormat(format, argArray); ((LocationAwareLogger) logger).log(null, fqcn, - LocationAwareLogger.DEBUG_INT, formattedMessage, null); + LocationAwareLogger.DEBUG_INT, formattedMessage, argArray, null); } else { logger.debug(format, argArray); } @@ -288,7 +294,7 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { ((LocationAwareLogger) logger).log(null, fqcn, - LocationAwareLogger.DEBUG_INT, msg, t); + LocationAwareLogger.DEBUG_INT, msg, null, t); } else { logger.debug(msg, t); } @@ -302,7 +308,7 @@ public class LoggerWrapper implements Logger { return; if (instanceofLAL) { ((LocationAwareLogger) logger).log(marker, fqcn, - LocationAwareLogger.DEBUG_INT, msg, null); + LocationAwareLogger.DEBUG_INT, msg, null, null); } else { logger.debug(marker, msg); } @@ -317,7 +323,8 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { String formattedMessage = MessageFormatter.format(format, arg); ((LocationAwareLogger) logger).log(marker, fqcn, - LocationAwareLogger.DEBUG_INT, formattedMessage, null); + LocationAwareLogger.DEBUG_INT, formattedMessage, + new Object[] { arg }, null); } else { logger.debug(marker, format, arg); } @@ -332,7 +339,8 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { String formattedMessage = MessageFormatter.format(format, arg1, arg2); ((LocationAwareLogger) logger).log(marker, fqcn, - LocationAwareLogger.DEBUG_INT, formattedMessage, null); + LocationAwareLogger.DEBUG_INT, formattedMessage, new Object[] { arg1, + arg2 }, null); } else { logger.debug(marker, format, arg1, arg2); } @@ -347,7 +355,7 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { String formattedMessage = MessageFormatter.arrayFormat(format, argArray); ((LocationAwareLogger) logger).log(marker, fqcn, - LocationAwareLogger.DEBUG_INT, formattedMessage, null); + LocationAwareLogger.DEBUG_INT, formattedMessage, argArray, null); } else { logger.debug(marker, format, argArray); } @@ -361,7 +369,7 @@ public class LoggerWrapper implements Logger { return; if (instanceofLAL) { ((LocationAwareLogger) logger).log(marker, fqcn, - LocationAwareLogger.DEBUG_INT, msg, t); + LocationAwareLogger.DEBUG_INT, msg, null, t); } else { logger.debug(marker, msg, t); } @@ -390,7 +398,7 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { ((LocationAwareLogger) logger).log(null, fqcn, - LocationAwareLogger.INFO_INT, msg, null); + LocationAwareLogger.INFO_INT, msg, null, null); } else { logger.info(msg); } @@ -406,7 +414,8 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { String formattedMessage = MessageFormatter.format(format, arg); ((LocationAwareLogger) logger).log(null, fqcn, - LocationAwareLogger.INFO_INT, formattedMessage, null); + LocationAwareLogger.INFO_INT, formattedMessage, new Object[] { arg }, + null); } else { logger.info(format, arg); } @@ -422,7 +431,8 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { String formattedMessage = MessageFormatter.format(format, arg1, arg2); ((LocationAwareLogger) logger).log(null, fqcn, - LocationAwareLogger.INFO_INT, formattedMessage, null); + LocationAwareLogger.INFO_INT, formattedMessage, new Object[] { arg1, + arg2 }, null); } else { logger.info(format, arg1, arg2); } @@ -438,7 +448,7 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { String formattedMessage = MessageFormatter.arrayFormat(format, argArray); ((LocationAwareLogger) logger).log(null, fqcn, - LocationAwareLogger.INFO_INT, formattedMessage, null); + LocationAwareLogger.INFO_INT, formattedMessage, argArray, null); } else { logger.info(format, argArray); } @@ -453,7 +463,7 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { ((LocationAwareLogger) logger).log(null, fqcn, - LocationAwareLogger.INFO_INT, msg, t); + LocationAwareLogger.INFO_INT, msg, null, t); } else { logger.info(msg, t); } @@ -467,7 +477,7 @@ public class LoggerWrapper implements Logger { return; if (instanceofLAL) { ((LocationAwareLogger) logger).log(marker, fqcn, - LocationAwareLogger.INFO_INT, msg, null); + LocationAwareLogger.INFO_INT, msg, null, null); } else { logger.info(marker, msg); } @@ -482,7 +492,8 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { String formattedMessage = MessageFormatter.format(format, arg); ((LocationAwareLogger) logger).log(marker, fqcn, - LocationAwareLogger.INFO_INT, formattedMessage, null); + LocationAwareLogger.INFO_INT, formattedMessage, new Object[] { arg }, + null); } else { logger.info(marker, format, arg); } @@ -497,7 +508,8 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { String formattedMessage = MessageFormatter.format(format, arg1, arg2); ((LocationAwareLogger) logger).log(marker, fqcn, - LocationAwareLogger.INFO_INT, formattedMessage, null); + LocationAwareLogger.INFO_INT, formattedMessage, new Object[] { arg1, + arg2 }, null); } else { logger.info(marker, format, arg1, arg2); } @@ -512,7 +524,7 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { String formattedMessage = MessageFormatter.arrayFormat(format, argArray); ((LocationAwareLogger) logger).log(marker, fqcn, - LocationAwareLogger.INFO_INT, formattedMessage, null); + LocationAwareLogger.INFO_INT, formattedMessage, argArray, null); } else { logger.info(marker, format, argArray); } @@ -526,7 +538,7 @@ public class LoggerWrapper implements Logger { return; if (instanceofLAL) { ((LocationAwareLogger) logger).log(marker, fqcn, - LocationAwareLogger.INFO_INT, msg, t); + LocationAwareLogger.INFO_INT, msg, null, t); } else { logger.info(marker, msg, t); } @@ -552,7 +564,7 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { ((LocationAwareLogger) logger).log(null, fqcn, - LocationAwareLogger.WARN_INT, msg, null); + LocationAwareLogger.WARN_INT, msg, null, null); } else { logger.warn(msg); } @@ -568,7 +580,8 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { String formattedMessage = MessageFormatter.format(format, arg); ((LocationAwareLogger) logger).log(null, fqcn, - LocationAwareLogger.WARN_INT, formattedMessage, null); + LocationAwareLogger.WARN_INT, formattedMessage, new Object[] { arg }, + null); } else { logger.warn(format, arg); } @@ -584,7 +597,8 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { String formattedMessage = MessageFormatter.format(format, arg1, arg2); ((LocationAwareLogger) logger).log(null, fqcn, - LocationAwareLogger.WARN_INT, formattedMessage, null); + LocationAwareLogger.WARN_INT, formattedMessage, new Object[] { arg1, + arg2 }, null); } else { logger.warn(format, arg1, arg2); } @@ -600,7 +614,7 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { String formattedMessage = MessageFormatter.arrayFormat(format, argArray); ((LocationAwareLogger) logger).log(null, fqcn, - LocationAwareLogger.WARN_INT, formattedMessage, null); + LocationAwareLogger.WARN_INT, formattedMessage, argArray, null); } else { logger.warn(format, argArray); } @@ -615,7 +629,7 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { ((LocationAwareLogger) logger).log(null, fqcn, - LocationAwareLogger.WARN_INT, msg, t); + LocationAwareLogger.WARN_INT, msg, null, t); } else { logger.warn(msg, t); } @@ -629,7 +643,7 @@ public class LoggerWrapper implements Logger { return; if (instanceofLAL) { ((LocationAwareLogger) logger).log(marker, fqcn, - LocationAwareLogger.WARN_INT, msg, null); + LocationAwareLogger.WARN_INT, msg, null, null); } else { logger.warn(marker, msg); } @@ -644,7 +658,8 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { String formattedMessage = MessageFormatter.format(format, arg); ((LocationAwareLogger) logger).log(marker, fqcn, - LocationAwareLogger.WARN_INT, formattedMessage, null); + LocationAwareLogger.WARN_INT, formattedMessage, new Object[] { arg }, + null); } else { logger.warn(marker, format, arg); } @@ -659,7 +674,8 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { String formattedMessage = MessageFormatter.format(format, arg1, arg2); ((LocationAwareLogger) logger).log(marker, fqcn, - LocationAwareLogger.WARN_INT, formattedMessage, null); + LocationAwareLogger.WARN_INT, formattedMessage, new Object[] { arg1, + arg2 }, null); } else { logger.warn(marker, format, arg1, arg2); } @@ -674,7 +690,7 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { String formattedMessage = MessageFormatter.arrayFormat(format, argArray); ((LocationAwareLogger) logger).log(marker, fqcn, - LocationAwareLogger.WARN_INT, formattedMessage, null); + LocationAwareLogger.WARN_INT, formattedMessage, argArray, null); } else { logger.warn(marker, format, argArray); } @@ -688,7 +704,7 @@ public class LoggerWrapper implements Logger { return; if (instanceofLAL) { ((LocationAwareLogger) logger).log(marker, fqcn, - LocationAwareLogger.WARN_INT, msg, t); + LocationAwareLogger.WARN_INT, msg, null, t); } else { logger.warn(marker, msg, t); } @@ -717,7 +733,7 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { ((LocationAwareLogger) logger).log(null, fqcn, - LocationAwareLogger.ERROR_INT, msg, null); + LocationAwareLogger.ERROR_INT, msg, null, null); } else { logger.error(msg); } @@ -733,7 +749,8 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { String formattedMessage = MessageFormatter.format(format, arg); ((LocationAwareLogger) logger).log(null, fqcn, - LocationAwareLogger.ERROR_INT, formattedMessage, null); + LocationAwareLogger.ERROR_INT, formattedMessage, + new Object[] { arg }, null); } else { logger.error(format, arg); } @@ -749,7 +766,8 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { String formattedMessage = MessageFormatter.format(format, arg1, arg2); ((LocationAwareLogger) logger).log(null, fqcn, - LocationAwareLogger.ERROR_INT, formattedMessage, null); + LocationAwareLogger.ERROR_INT, formattedMessage, new Object[] { arg1, + arg2 }, null); } else { logger.error(format, arg1, arg2); } @@ -765,7 +783,7 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { String formattedMessage = MessageFormatter.arrayFormat(format, argArray); ((LocationAwareLogger) logger).log(null, fqcn, - LocationAwareLogger.ERROR_INT, formattedMessage, null); + LocationAwareLogger.ERROR_INT, formattedMessage, argArray, null); } else { logger.error(format, argArray); } @@ -780,7 +798,7 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { ((LocationAwareLogger) logger).log(null, fqcn, - LocationAwareLogger.ERROR_INT, msg, t); + LocationAwareLogger.ERROR_INT, msg, null, t); } else { logger.error(msg, t); } @@ -794,7 +812,7 @@ public class LoggerWrapper implements Logger { return; if (instanceofLAL) { ((LocationAwareLogger) logger).log(marker, fqcn, - LocationAwareLogger.ERROR_INT, msg, null); + LocationAwareLogger.ERROR_INT, msg, null, null); } else { logger.error(marker, msg); } @@ -809,7 +827,8 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { String formattedMessage = MessageFormatter.format(format, arg); ((LocationAwareLogger) logger).log(marker, fqcn, - LocationAwareLogger.ERROR_INT, formattedMessage, null); + LocationAwareLogger.ERROR_INT, formattedMessage, + new Object[] { arg }, null); } else { logger.error(marker, format, arg); } @@ -824,7 +843,8 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { String formattedMessage = MessageFormatter.format(format, arg1, arg2); ((LocationAwareLogger) logger).log(marker, fqcn, - LocationAwareLogger.ERROR_INT, formattedMessage, null); + LocationAwareLogger.ERROR_INT, formattedMessage, new Object[] { arg1, + arg2 }, null); } else { logger.error(marker, format, arg1, arg2); } @@ -839,7 +859,7 @@ public class LoggerWrapper implements Logger { if (instanceofLAL) { String formattedMessage = MessageFormatter.arrayFormat(format, argArray); ((LocationAwareLogger) logger).log(marker, fqcn, - LocationAwareLogger.ERROR_INT, formattedMessage, null); + LocationAwareLogger.ERROR_INT, formattedMessage, argArray, null); } else { logger.error(marker, format, argArray); } @@ -853,7 +873,7 @@ public class LoggerWrapper implements Logger { return; if (instanceofLAL) { ((LocationAwareLogger) logger).log(marker, fqcn, - LocationAwareLogger.ERROR_INT, msg, t); + LocationAwareLogger.ERROR_INT, msg, null, t); } else { logger.error(marker, msg, t); } diff --git a/slf4j-ext/src/main/java/org/slf4j/ext/XLogger.java b/slf4j-ext/src/main/java/org/slf4j/ext/XLogger.java index 10087de..93510b0 100644 --- a/slf4j-ext/src/main/java/org/slf4j/ext/XLogger.java +++ b/slf4j-ext/src/main/java/org/slf4j/ext/XLogger.java @@ -48,11 +48,11 @@ public class XLogger extends LoggerWrapper implements Logger { } public enum Level { - TRACE("TRACE", LocationAwareLogger.TRACE_INT), - DEBUG("DEBUG", LocationAwareLogger.DEBUG_INT), - INFO("INFO", LocationAwareLogger.INFO_INT), - WARN("WARN", LocationAwareLogger.WARN_INT), - ERROR("ERROR", LocationAwareLogger.ERROR_INT); + TRACE("TRACE", LocationAwareLogger.TRACE_INT), DEBUG("DEBUG", + LocationAwareLogger.DEBUG_INT), INFO("INFO", + LocationAwareLogger.INFO_INT), WARN("WARN", + LocationAwareLogger.WARN_INT), ERROR("ERROR", + LocationAwareLogger.ERROR_INT); private final String name; private final int level; @@ -75,7 +75,7 @@ public class XLogger extends LoggerWrapper implements Logger { * Given an underlying logger, construct an XLogger * * @param logger - * underlying logger + * underlying logger */ public XLogger(Logger logger) { // If class B extends A, assuming B does not override method x(), the caller @@ -88,7 +88,7 @@ public class XLogger extends LoggerWrapper implements Logger { * Log method entry. * * @param argArray - * supplied parameters + * supplied parameters */ public void entry(Object... argArray) { if (instanceofLAL && logger.isTraceEnabled(ENTRY_MARKER)) { @@ -101,7 +101,7 @@ public class XLogger extends LoggerWrapper implements Logger { String formattedMessage = MessageFormatter.arrayFormat(messagePattern, argArray); ((LocationAwareLogger) logger).log(ENTRY_MARKER, FQCN, - LocationAwareLogger.TRACE_INT, formattedMessage, null); + LocationAwareLogger.TRACE_INT, formattedMessage, argArray, null); } } @@ -111,7 +111,7 @@ public class XLogger extends LoggerWrapper implements Logger { public void exit() { if (instanceofLAL && logger.isTraceEnabled(ENTRY_MARKER)) { ((LocationAwareLogger) logger).log(EXIT_MARKER, FQCN, - LocationAwareLogger.TRACE_INT, EXIT_MESSAGE_0, null); + LocationAwareLogger.TRACE_INT, EXIT_MESSAGE_0, null, null); } } @@ -119,13 +119,14 @@ public class XLogger extends LoggerWrapper implements Logger { * Log method exit * * @param result - * The result of the method being exited + * The result of the method being exited */ public void exit(Object result) { if (instanceofLAL && logger.isTraceEnabled(ENTRY_MARKER)) { String formattedMessage = MessageFormatter.format(EXIT_MESSAGE_1, result); ((LocationAwareLogger) logger).log(EXIT_MARKER, FQCN, - LocationAwareLogger.TRACE_INT, formattedMessage, null); + LocationAwareLogger.TRACE_INT, formattedMessage, + new Object[] { result }, null); } } @@ -133,26 +134,27 @@ public class XLogger extends LoggerWrapper implements Logger { * Log an exception being thrown. The generated log event uses Level ERROR. * * @param throwable - * the exception being caught. + * the exception being caught. */ public void throwing(Throwable throwable) { if (instanceofLAL) { ((LocationAwareLogger) logger).log(THROWING_MARKER, FQCN, - LocationAwareLogger.ERROR_INT, "throwing", throwable); + LocationAwareLogger.ERROR_INT, "throwing", null, throwable); } } /** * Log an exception being thrown allowing the log level to be specified. - * - * @param level the logging level to use. + * + * @param level + * the logging level to use. * @param throwable - * the exception being caught. + * the exception being caught. */ public void throwing(Level level, Throwable throwable) { if (instanceofLAL) { - ((LocationAwareLogger) logger).log(THROWING_MARKER, FQCN, - level.level, "throwing", throwable); + ((LocationAwareLogger) logger).log(THROWING_MARKER, FQCN, level.level, + "throwing", null, throwable); } } @@ -160,26 +162,27 @@ public class XLogger extends LoggerWrapper implements Logger { * Log an exception being caught. The generated log event uses Level ERROR. * * @param throwable - * the exception being caught. + * the exception being caught. */ public void catching(Throwable throwable) { if (instanceofLAL) { ((LocationAwareLogger) logger).log(CATCHING_MARKER, FQCN, - LocationAwareLogger.ERROR_INT, "catching", throwable); + LocationAwareLogger.ERROR_INT, "catching", null, throwable); } } /** * Log an exception being caught allowing the log level to be specified. - * - * @param level the logging level to use. + * + * @param level + * the logging level to use. * @param throwable - * the exception being caught. + * the exception being caught. */ public void catching(Level level, Throwable throwable) { if (instanceofLAL) { - ((LocationAwareLogger) logger).log(CATCHING_MARKER, FQCN, - level.level, "catching", throwable); + ((LocationAwareLogger) logger).log(CATCHING_MARKER, FQCN, level.level, + "catching", null, throwable); } } diff --git a/slf4j-jdk14/src/main/java/org/slf4j/impl/JDK14LoggerAdapter.java b/slf4j-jdk14/src/main/java/org/slf4j/impl/JDK14LoggerAdapter.java index 4b6401b..55a8d5e 100644 --- a/slf4j-jdk14/src/main/java/org/slf4j/impl/JDK14LoggerAdapter.java +++ b/slf4j-jdk14/src/main/java/org/slf4j/impl/JDK14LoggerAdapter.java @@ -77,8 +77,8 @@ public final class JDK14LoggerAdapter extends MarkerIgnoringBase implements /** * Log a message object at level FINEST. * - * @param msg - - * the message object to be logged + * @param msg + * - the message object to be logged */ public void trace(String msg) { if (logger.isLoggable(Level.FINEST)) { @@ -177,8 +177,8 @@ public final class JDK14LoggerAdapter extends MarkerIgnoringBase implements /** * Log a message object at level FINE. * - * @param msg - - * the message object to be logged + * @param msg + * - the message object to be logged */ public void debug(String msg) { if (logger.isLoggable(Level.FINE)) { @@ -276,8 +276,8 @@ public final class JDK14LoggerAdapter extends MarkerIgnoringBase implements /** * Log a message object at the INFO level. * - * @param msg - - * the message object to be logged + * @param msg + * - the message object to be logged */ public void info(String msg) { if (logger.isLoggable(Level.INFO)) { @@ -377,8 +377,8 @@ public final class JDK14LoggerAdapter extends MarkerIgnoringBase implements /** * Log a message object at the WARNING level. * - * @param msg - - * the message object to be logged + * @param msg + * - the message object to be logged */ public void warn(String msg) { if (logger.isLoggable(Level.WARNING)) { @@ -478,8 +478,8 @@ public final class JDK14LoggerAdapter extends MarkerIgnoringBase implements /** * Log a message object at the SEVERE level. * - * @param msg - - * the message object to be logged + * @param msg + * - the message object to be logged */ public void error(String msg) { if (logger.isLoggable(Level.SEVERE)) { @@ -626,9 +626,9 @@ public final class JDK14LoggerAdapter extends MarkerIgnoringBase implements record.setSourceMethodName(ste.getMethodName()); } } - + public void log(Marker marker, String callerFQCN, int level, String message, - Throwable t) { + Object[] argArray, Throwable t) { Level julLevel; switch (level) { case LocationAwareLogger.TRACE_INT: @@ -650,12 +650,12 @@ public final class JDK14LoggerAdapter extends MarkerIgnoringBase implements throw new IllegalStateException("Level number " + level + " is not recognized."); } - // the logger.isLoggable check avoids the unconditional + // the logger.isLoggable check avoids the unconditional // construction of location data for disabled log - // statements. As of 2008-07-31, callers of this method - // do not perform this check. See also + // statements. As of 2008-07-31, callers of this method + // do not perform this check. See also // http://bugzilla.slf4j.org/show_bug.cgi?id=90 - if(logger.isLoggable(julLevel)) { + if (logger.isLoggable(julLevel)) { log(callerFQCN, julLevel, message, t); } } diff --git a/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jLoggerAdapter.java b/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jLoggerAdapter.java index 3901675..bfe6444 100644 --- a/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jLoggerAdapter.java +++ b/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jLoggerAdapter.java @@ -22,7 +22,6 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - package org.slf4j.impl; import java.io.Serializable; @@ -36,11 +35,13 @@ import org.slf4j.spi.LocationAwareLogger; /** * A wrapper over {@link org.apache.log4j.Logger org.apache.log4j.Logger} in - * conforming to the {@link Logger} interface. + * conforming to the {@link Logger} interface. * - * <p>Note that the logging levels mentioned in this class refer to those defined in the <a - * href="http://logging.apache.org/log4j/docs/api/org/apache/log4j/Level.html"><code>org.apache.log4j.Level</code></a> - * class. + * <p> + * Note that the logging levels mentioned in this class refer to those defined + * in the <a + * href="http://logging.apache.org/log4j/docs/api/org/apache/log4j/Level.html"> + * <code>org.apache.log4j.Level</code></a> class. * * <p> * The TRACE level was introduced in log4j version 1.2.12. In order to avoid @@ -101,8 +102,8 @@ public final class Log4jLoggerAdapter extends MarkerIgnoringBase implements /** * Log a message object at level TRACE. * - * @param msg - - * the message object to be logged + * @param msg + * - the message object to be logged */ public void trace(String msg) { logger.log(FQCN, traceCapable ? Level.TRACE : Level.DEBUG, msg, null); @@ -118,9 +119,9 @@ public final class Log4jLoggerAdapter extends MarkerIgnoringBase implements * </p> * * @param format - * the format string + * the format string * @param arg - * the argument + * the argument */ public void trace(String format, Object arg) { if (isTraceEnabled()) { @@ -139,11 +140,11 @@ public final class Log4jLoggerAdapter extends MarkerIgnoringBase implements * </p> * * @param format - * the format string + * the format string * @param arg1 - * the first argument + * the first argument * @param arg2 - * the second argument + * the second argument */ public void trace(String format, Object arg1, Object arg2) { if (isTraceEnabled()) { @@ -162,9 +163,9 @@ public final class Log4jLoggerAdapter extends MarkerIgnoringBase implements * </p> * * @param format - * the format string + * the format string * @param argArray - * an array of arguments + * an array of arguments */ public void trace(String format, Object[] argArray) { if (isTraceEnabled()) { @@ -177,9 +178,9 @@ public final class Log4jLoggerAdapter extends MarkerIgnoringBase implements * Log an exception (throwable) at level TRACE with an accompanying message. * * @param msg - * the message accompanying the exception + * the message accompanying the exception * @param t - * the exception (throwable) to log + * the exception (throwable) to log */ public void trace(String msg, Throwable t) { logger.log(FQCN, traceCapable ? Level.TRACE : Level.DEBUG, msg, t); @@ -197,8 +198,8 @@ public final class Log4jLoggerAdapter extends MarkerIgnoringBase implements /** * Log a message object at level DEBUG. * - * @param msg - - * the message object to be logged + * @param msg + * - the message object to be logged */ public void debug(String msg) { logger.log(FQCN, Level.DEBUG, msg, null); @@ -214,9 +215,9 @@ public final class Log4jLoggerAdapter extends MarkerIgnoringBase implements * </p> * * @param format - * the format string + * the format string * @param arg - * the argument + * the argument */ public void debug(String format, Object arg) { if (logger.isDebugEnabled()) { @@ -235,11 +236,11 @@ public final class Log4jLoggerAdapter extends MarkerIgnoringBase implements * </p> * * @param format - * the format string + * the format string * @param arg1 - * the first argument + * the first argument * @param arg2 - * the second argument + * the second argument */ public void debug(String format, Object arg1, Object arg2) { if (logger.isDebugEnabled()) { @@ -258,9 +259,9 @@ public final class Log4jLoggerAdapter extends MarkerIgnoringBase implements * </p> * * @param format - * the format string + * the format string * @param argArray - * an array of arguments + * an array of arguments */ public void debug(String format, Object[] argArray) { if (logger.isDebugEnabled()) { @@ -273,9 +274,9 @@ public final class Log4jLoggerAdapter extends MarkerIgnoringBase implements * Log an exception (throwable) at level DEBUG with an accompanying message. * * @param msg - * the message accompanying the exception + * the message accompanying the exception * @param t - * the exception (throwable) to log + * the exception (throwable) to log */ public void debug(String msg, Throwable t) { logger.log(FQCN, Level.DEBUG, msg, t); @@ -293,8 +294,8 @@ public final class Log4jLoggerAdapter extends MarkerIgnoringBase implements /** * Log a message object at the INFO level. * - * @param msg - - * the message object to be logged + * @param msg + * - the message object to be logged */ public void info(String msg) { logger.log(FQCN, Level.INFO, msg, null); @@ -309,9 +310,9 @@ public final class Log4jLoggerAdapter extends MarkerIgnoringBase implements * </p> * * @param format - * the format string + * the format string * @param arg - * the argument + * the argument */ public void info(String format, Object arg) { if (logger.isInfoEnabled()) { @@ -330,11 +331,11 @@ public final class Log4jLoggerAdapter extends MarkerIgnoringBase implements * </p> * * @param format - * the format string + * the format string * @param arg1 - * the first argument + * the first argument * @param arg2 - * the second argument + * the second argument */ public void info(String format, Object arg1, Object arg2) { if (logger.isInfoEnabled()) { @@ -353,9 +354,9 @@ public final class Log4jLoggerAdapter extends MarkerIgnoringBase implements * </p> * * @param format - * the format string + * the format string * @param argArray - * an array of arguments + * an array of arguments */ public void info(String format, Object[] argArray) { if (logger.isInfoEnabled()) { @@ -369,9 +370,9 @@ public final class Log4jLoggerAdapter extends MarkerIgnoringBase implements * message. * * @param msg - * the message accompanying the exception + * the message accompanying the exception * @param t - * the exception (throwable) to log + * the exception (throwable) to log */ public void info(String msg, Throwable t) { logger.log(FQCN, Level.INFO, msg, t); @@ -389,8 +390,8 @@ public final class Log4jLoggerAdapter extends MarkerIgnoringBase implements /** * Log a message object at the WARN level. * - * @param msg - - * the message object to be logged + * @param msg + * - the message object to be logged */ public void warn(String msg) { logger.log(FQCN, Level.WARN, msg, null); @@ -406,9 +407,9 @@ public final class Log4jLoggerAdapter extends MarkerIgnoringBase implements * </p> * * @param format - * the format string + * the format string * @param arg - * the argument + * the argument */ public void warn(String format, Object arg) { if (logger.isEnabledFor(Level.WARN)) { @@ -427,11 +428,11 @@ public final class Log4jLoggerAdapter extends MarkerIgnoringBase implements * </p> * * @param format - * the format string + * the format string * @param arg1 - * the first argument + * the first argument * @param arg2 - * the second argument + * the second argument */ public void warn(String format, Object arg1, Object arg2) { if (logger.isEnabledFor(Level.WARN)) { @@ -450,9 +451,9 @@ public final class Log4jLoggerAdapter extends MarkerIgnoringBase implements * </p> * * @param format - * the format string + * the format string * @param argArray - * an array of arguments + * an array of arguments */ public void warn(String format, Object[] argArray) { if (logger.isEnabledFor(Level.WARN)) { @@ -466,9 +467,9 @@ public final class Log4jLoggerAdapter extends MarkerIgnoringBase implements * message. * * @param msg - * the message accompanying the exception + * the message accompanying the exception * @param t - * the exception (throwable) to log + * the exception (throwable) to log */ public void warn(String msg, Throwable t) { logger.log(FQCN, Level.WARN, msg, t); @@ -486,8 +487,8 @@ public final class Log4jLoggerAdapter extends MarkerIgnoringBase implements /** * Log a message object at the ERROR level. * - * @param msg - - * the message object to be logged + * @param msg + * - the message object to be logged */ public void error(String msg) { logger.log(FQCN, Level.ERROR, msg, null); @@ -503,9 +504,9 @@ public final class Log4jLoggerAdapter extends MarkerIgnoringBase implements * </p> * * @param format - * the format string + * the format string * @param arg - * the argument + * the argument */ public void error(String format, Object arg) { if (logger.isEnabledFor(Level.ERROR)) { @@ -524,11 +525,11 @@ public final class Log4jLoggerAdapter extends MarkerIgnoringBase implements * </p> * * @param format - * the format string + * the format string * @param arg1 - * the first argument + * the first argument * @param arg2 - * the second argument + * the second argument */ public void error(String format, Object arg1, Object arg2) { if (logger.isEnabledFor(Level.ERROR)) { @@ -547,9 +548,9 @@ public final class Log4jLoggerAdapter extends MarkerIgnoringBase implements * </p> * * @param format - * the format string + * the format string * @param argArray - * an array of arguments + * an array of arguments */ public void error(String format, Object[] argArray) { if (logger.isEnabledFor(Level.ERROR)) { @@ -563,16 +564,16 @@ public final class Log4jLoggerAdapter extends MarkerIgnoringBase implements * message. * * @param msg - * the message accompanying the exception + * the message accompanying the exception * @param t - * the exception (throwable) to log + * the exception (throwable) to log */ public void error(String msg, Throwable t) { logger.log(FQCN, Level.ERROR, msg, t); } public void log(Marker marker, String callerFQCN, int level, String msg, - Throwable t) { + Object[] argArray, Throwable t) { Level log4jLevel; switch (level) { case LocationAwareLogger.TRACE_INT: diff --git a/slf4j-site/src/site/pages/news.html b/slf4j-site/src/site/pages/news.html index 7ff7bab..24b0b39 100644 --- a/slf4j-site/src/site/pages/news.html +++ b/slf4j-site/src/site/pages/news.html @@ -34,6 +34,14 @@ series is expected to require JDK 1.5 or later. </p> + <p>The <code>log</code> method in <code>LocationAwareLogger</code> + interface now admits an additional parameter of type + <code>Object[]</code> representing additional arguments of the log + request. Due to this modification, slf4j-api version 1.6.x will not + work with bindings shipping with SLF4J 1.5.x -- bindings shipping + with 1.6.x must be used. + </p> + <p>Note that as of SLF4J version 1.6.0, in the absence of an SLF4J binding, slf4j-api will default to a no-operation implementation discarding all log requests. Thus, instead of throwing an ----------------------------------------------------------------------- Summary of changes: .../logging/impl/SLF4JLocationAwareLog.java | 26 ++-- .../java/org/slf4j/bridge/SLF4JBridgeHandler.java | 2 +- .../src/main/java/org/apache/log4j/Category.java | 4 +- .../java/org/slf4j/spi/LocationAwareLogger.java | 2 +- .../src/main/java/org/slf4j/cal10n/LocLogger.java | 14 +- .../src/main/java/org/slf4j/ext/EventLogger.java | 2 +- .../src/main/java/org/slf4j/ext/LoggerWrapper.java | 136 +++++++++++--------- slf4j-ext/src/main/java/org/slf4j/ext/XLogger.java | 53 ++++---- .../java/org/slf4j/impl/JDK14LoggerAdapter.java | 32 +++--- .../java/org/slf4j/impl/Log4jLoggerAdapter.java | 123 +++++++++--------- slf4j-site/src/site/pages/news.html | 8 + 11 files changed, 216 insertions(+), 186 deletions(-) hooks/post-receive -- SLF4J: Simple Logging Facade for Java