From 3de4f334c83d5a22ceb73baa1a3ebdd6e22a16ba Mon Sep 17 00:00:00 2001 From: Robert Burrell Donkin Date: Wed, 7 May 2003 16:23:36 +0000 Subject: [PATCH] Added AvalonLogger which wraps the logger used by the Avalon framework. Also added an optional dependency on avalon-framework.jar. Added better warnings to build about which loggers are going to be created. Submitted by Neeme Praks. git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk@138981 13f79535-47bb-0310-9956-ffa450edef68 --- .../commons/logging/impl/AvalonLogger.java | 233 ++++++++++++++++++ 1 file changed, 233 insertions(+) create mode 100644 src/java/org/apache/commons/logging/impl/AvalonLogger.java diff --git a/src/java/org/apache/commons/logging/impl/AvalonLogger.java b/src/java/org/apache/commons/logging/impl/AvalonLogger.java new file mode 100644 index 0000000..423e313 --- /dev/null +++ b/src/java/org/apache/commons/logging/impl/AvalonLogger.java @@ -0,0 +1,233 @@ +/* + * /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/avalon/src/java/org/apache/commons/jelly/avalon/JellyService.java,v 1.1 2003/01/22 09:19:30 jstrachan Exp + * 1.1 + * 2003/01/22 09:19:30 + * + * ==================================================================== + * + * The Apache Software License, Version 1.1 + * + * Copyright (c) 2003 The Apache Software Foundation. All rights + * reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The end-user documentation included with the redistribution, if + * any, must include the following acknowlegement: + * "This product includes software developed by the + * Apache Software Foundation (http://www.apache.org/)." + * Alternately, this acknowlegement may appear in the software itself, + * if and wherever such third-party acknowlegements normally appear. + * + * 4. The names "The Jakarta Project", "Commons", and "Apache Software + * Foundation" must not be used to endorse or promote products derived + * from this software without prior written permission. For written + * permission, please contact apache@apache.org. + * + * 5. Products derived from this software may not be called "Apache" + * nor may "Apache" appear in their names without prior written + * permission of the Apache Group. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + * + * JellyServiceImpl.java,v 1.1 2003/01/22 09:19:30 jstrachan Exp + */ + +package org.apache.commons.logging.impl; + +import org.apache.avalon.framework.logger.Logger; +import org.apache.commons.logging.Log; + +/** + * Implementation of commons-logging Log interface that delegates all + * logging calls to Avalon logging abstraction: the Logger interface. + * + * @author Neeme Praks + */ +public class AvalonLogger implements Log { + + private static Logger defaultLogger = null; + private Logger logger = null; + + /** + * @param logger the avalon logger implementation to delegate to + */ + public AvalonLogger(Logger logger) { + this.logger = logger; + } + + /** + * @param logger the avalon logger implementation to delegate to + */ + public AvalonLogger(String name) { + this.logger = defaultLogger.getChildLogger(name); + } + + /** + * @return avalon logger implementation + */ + public Logger getLogger() { + return logger; + } + + /** + * @param logger the default avalon logger, in case there is no logger instance supplied in constructor + */ + public static void setDefaultLogger(Logger logger) { + defaultLogger = logger; + } + + /** + * @see org.apache.commons.logging.Log#debug(java.lang.Object, java.lang.Throwable) + */ + public void debug(Object o, Throwable t) { + if (this.logger.isDebugEnabled()) this.logger.debug(o.toString(), t); + } + + /** + * @see org.apache.commons.logging.Log#debug(java.lang.Object) + */ + public void debug(Object o) { + if (this.logger.isDebugEnabled()) this.logger.debug(o.toString()); + } + + /** + * @see org.apache.commons.logging.Log#error(java.lang.Object, java.lang.Throwable) + */ + public void error(Object o, Throwable t) { + if (this.logger.isErrorEnabled()) this.logger.error(o.toString(), t); + } + + /** + * @see org.apache.commons.logging.Log#error(java.lang.Object) + */ + public void error(Object o) { + if (this.logger.isErrorEnabled()) this.logger.error(o.toString()); + } + + /** + * @see org.apache.commons.logging.Log#fatal(java.lang.Object, java.lang.Throwable) + */ + public void fatal(Object o, Throwable t) { + if (this.logger.isFatalErrorEnabled()) this.logger.fatalError(o.toString(), t); + } + + /** + * @see org.apache.commons.logging.Log#fatal(java.lang.Object) + */ + public void fatal(Object o) { + if (this.logger.isFatalErrorEnabled()) this.logger.fatalError(o.toString()); + } + + /** + * @see org.apache.commons.logging.Log#info(java.lang.Object, java.lang.Throwable) + */ + public void info(Object o, Throwable t) { + if (this.logger.isInfoEnabled()) this.logger.info(o.toString(), t); + } + + /** + * @see org.apache.commons.logging.Log#info(java.lang.Object) + */ + public void info(Object o) { + if (this.logger.isInfoEnabled()) this.logger.info(o.toString()); + } + + /** + * @see org.apache.commons.logging.Log#isDebugEnabled() + */ + public boolean isDebugEnabled() { + return this.logger.isDebugEnabled(); + } + + /** + * @see org.apache.commons.logging.Log#isErrorEnabled() + */ + public boolean isErrorEnabled() { + return this.logger.isErrorEnabled(); + } + + /** + * @see org.apache.commons.logging.Log#isFatalEnabled() + */ + public boolean isFatalEnabled() { + return this.logger.isFatalErrorEnabled(); + } + + /** + * @see org.apache.commons.logging.Log#isInfoEnabled() + */ + public boolean isInfoEnabled() { + return this.logger.isInfoEnabled(); + } + + /** + * @see org.apache.commons.logging.Log#isTraceEnabled() + */ + public boolean isTraceEnabled() { + return this.logger.isDebugEnabled(); + } + + /** + * @see org.apache.commons.logging.Log#isWarnEnabled() + */ + public boolean isWarnEnabled() { + return this.logger.isWarnEnabled(); + } + + /** + * @see org.apache.commons.logging.Log#trace(java.lang.Object, java.lang.Throwable) + */ + public void trace(Object o, Throwable t) { + if (this.logger.isDebugEnabled()) this.logger.debug(o.toString(), t); + } + + /** + * @see org.apache.commons.logging.Log#trace(java.lang.Object) + */ + public void trace(Object o) { + if (this.logger.isDebugEnabled()) this.logger.debug(o.toString()); + } + + /** + * @see org.apache.commons.logging.Log#warn(java.lang.Object, java.lang.Throwable) + */ + public void warn(Object o, Throwable t) { + if (this.logger.isWarnEnabled()) this.logger.warn(o.toString(), t); + } + + /** + * @see org.apache.commons.logging.Log#warn(java.lang.Object) + */ + public void warn(Object o) { + if (this.logger.isWarnEnabled()) this.logger.warn(o.toString()); + } + +}