Author: ceki Date: Mon Nov 28 11:30:09 2005 New Revision: 438 Added: slf4j/trunk/src/java/org/slf4j/impl/JCLLoggerAdapter.java slf4j/trunk/src/java/org/slf4j/impl/JCLLoggerFactory.java Log: Added a SLF4J binding for JCL ensuring transparent use of SLF4J
Added: slf4j/trunk/src/java/org/slf4j/impl/JCLLoggerAdapter.java ============================================================================== --- (empty file) +++ slf4j/trunk/src/java/org/slf4j/impl/JCLLoggerAdapter.java Mon Nov 28 11:30:09 2005 @@ -0,0 +1,218 @@ +/* + * Copyright (c) 2004-2005 SLF4J.ORG + * Copyright (c) 2004-2005 QOS.ch + * + * All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, and/or sell copies of the Software, and to permit persons + * to whom the Software is furnished to do so, provided that the above + * copyright notice(s) and this permission notice appear in all copies of + * the Software and that both the above copyright notice(s) and this + * permission notice appear in supporting documentation. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT + * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY + * SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER + * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF + * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * Except as contained in this notice, the name of a copyright holder + * shall not be used in advertising or otherwise to promote the sale, use + * or other dealings in this Software without prior written authorization + * of the copyright holder. + * + */ + +package org.slf4j.impl; + +import org.apache.commons.logging.Log; +import org.slf4j.Logger; + +/** + * A wrapper over [EMAIL PROTECTED] org.apache.commons.logging.Log + * org.apache.commons.logging.Log} in conformance with the [EMAIL PROTECTED] Logger} + * interface. + * + * @author <a href="http://www.qos.ch/log4j/";>Ceki Gülcü</a> + */ +public final class JCLLoggerAdapter implements Logger { + final Log logger; + final String name; + + // WARN: JCLLoggerAdapter constructor should have only package access so + // that + // only JCLLoggerFactory be able to create one. + JCLLoggerAdapter(Log logger, String name) { + this.logger = logger; + this.name = name; + } + + public String getName() { + return name; + } + + /** + * Delegates to the [EMAIL PROTECTED] Log#isDebugEnabled} method of the underlying + * [EMAIL PROTECTED] Log} instance. + * + */ + public boolean isDebugEnabled() { + return logger.isDebugEnabled(); + } + + // + + /** + * Delegates to the [EMAIL PROTECTED] Log#debug(java.lang.Object)} method of the underlying + * [EMAIL PROTECTED] Log} instance. + * + * @param msg - the message object to be logged + */ + public void debug(String msg) { + logger.debug(msg); + } + + /** + * Delegates to the [EMAIL PROTECTED] Log#debug(java.lang.Object)} method of the underlying + * [EMAIL PROTECTED] Log} instance. + * + * <p> + * However, this form avoids superfluous object creation when the logger is disabled + * for level DEBUG. + * </p> + * + * @param format + * the format string + * @param arg + * the argument + */ + public void debug(String format, Object arg) { + if (logger.isDebugEnabled()) { + String msgStr = MessageFormatter.format(format, arg); + logger.debug(msgStr); + } + } + + /** + * Delegates to the [EMAIL PROTECTED] Log#debug(java.lang.Object)} method of the underlying + * [EMAIL PROTECTED] Log} instance. + * + * <p> + * However, this form avoids superfluous object creation when the logger is disabled + * for level DEBUG. + * </p> + * + * @param format + * the format string + * @param arg1 + * the first argument + * @param arg2 + * the second argument + */ + public void debug(String format, Object arg1, Object arg2) { + if (logger.isDebugEnabled()) { + String msgStr = MessageFormatter.format(format, arg1, arg2); + logger.debug(msgStr); + } + } + + /** + * Delegates to the [EMAIL PROTECTED] Log#debug(java.lang.Object, java.lang.Throwable)} method of + * the underlying [EMAIL PROTECTED] Log} instance. + * + * @param msg + * the message accompanying the exception + * @param t + * the exception (throwable) to log + */ + public void debug(String msg, Throwable t) { + logger.debug(msg, t); + } + + public boolean isInfoEnabled() { + return logger.isInfoEnabled(); + } + + public void info(String msg) { + logger.info(msg); + } + + public void info(String format, Object arg) { + if (logger.isInfoEnabled()) { + String msgStr = MessageFormatter.format(format, arg); + logger.info(msgStr); + } + } + + public void info(String format, Object arg1, Object arg2) { + if (logger.isInfoEnabled()) { + String msgStr = MessageFormatter.format(format, arg1, arg2); + logger.info(msgStr); + } + } + + public void info(String msg, Throwable t) { + logger.info(msg, t); + } + + public boolean isWarnEnabled() { + return logger.isWarnEnabled(); + } + + public void warn(String msg) { + logger.warn(msg); + } + + public void warn(String format, Object arg) { + if (logger.isWarnEnabled()) { + String msgStr = MessageFormatter.format(format, arg); + logger.warn(msgStr); + } + } + + public void warn(String format, Object arg1, Object arg2) { + if (logger.isWarnEnabled()) { + String msgStr = MessageFormatter.format(format, arg1, arg2); + logger.warn(msgStr); + } + } + + public void warn(String msg, Throwable t) { + logger.warn(msg, t); + } + + public boolean isErrorEnabled() { + return logger.isErrorEnabled(); + } + + public void error(String msg) { + logger.error(msg); + } + + public void error(String format, Object arg) { + if (logger.isErrorEnabled()) { + String msgStr = MessageFormatter.format(format, arg); + logger.error(msgStr); + } + } + + public void error(String format, Object arg1, Object arg2) { + if (logger.isErrorEnabled()) { + String msgStr = MessageFormatter.format(format, arg1, arg2); + logger.error(msgStr); + } + } + + public void error(String msg, Throwable t) { + logger.error(msg, t); + } + +} Added: slf4j/trunk/src/java/org/slf4j/impl/JCLLoggerFactory.java ============================================================================== --- (empty file) +++ slf4j/trunk/src/java/org/slf4j/impl/JCLLoggerFactory.java Mon Nov 28 11:30:09 2005 @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2004-2005 SLF4J.ORG + * Copyright (c) 2004-2005 QOS.ch + * + * All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, and/or sell copies of the Software, and to permit persons + * to whom the Software is furnished to do so, provided that the above + * copyright notice(s) and this permission notice appear in all copies of + * the Software and that both the above copyright notice(s) and this + * permission notice appear in supporting documentation. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT + * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY + * SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER + * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF + * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * Except as contained in this notice, the name of a copyright holder + * shall not be used in advertising or otherwise to promote the sale, use + * or other dealings in this Software without prior written authorization + * of the copyright holder. + * + */ + +package org.slf4j.impl; + +import java.util.HashMap; +import java.util.Map; + +import org.apache.commons.logging.LogFactory; +import org.slf4j.ILoggerFactory; +import org.slf4j.Logger; + +/** + * JCLLoggerFactory is an implementation of [EMAIL PROTECTED] ILoggerFactory} + * returning the appropriately named [EMAIL PROTECTED] JCLLoggerAdapter} instance. + * + * @author <a href="http://www.qos.ch/log4j/";>Ceki Gülcü</a> + */ +public class JCLLoggerFactory implements ILoggerFactory { + + // key: name (String), value: a JCLLoggerAdapter; + Map loggerMap; + + public JCLLoggerFactory() { + loggerMap = new HashMap(); + } + + /* (non-Javadoc) + * @see org.slf4j.ILoggerFactory#getLogger(java.lang.String) + */ + public Logger getLogger(String name) { + Logger logger = (Logger) loggerMap.get(name); + if (logger == null) { + org.apache.commons.logging.Log jclLogger = LogFactory.getLog(name); + logger = new JCLLoggerAdapter(jclLogger, name); + loggerMap.put(name, logger); + } + return logger; + } +} _______________________________________________ dev mailing list [email protected] http://slf4j.org/mailman/listinfo/dev
