diff --git a/build.properties.sample b/build.properties.sample index 196f764..11b88d4 100644 --- a/build.properties.sample +++ b/build.properties.sample @@ -1,6 +1,10 @@ # log4j.jar - log4j classes (see http://jakarta.apache.org/log4j) log4j.jar=/java/log4j/log4j.jar +# logkit.jar - Avalon LogKit classes (see http://jakarta.apache.org/jakarta-avalon) +logkit.jar=/java/logkit/logkit.jar + + # # if you want to run the test cases, junit needs to be in the classpath. # the build.xml uses a default value so you might not need to set this property. diff --git a/build.xml b/build.xml index c868222..cba9a52 100644 --- a/build.xml +++ b/build.xml @@ -3,7 +3,7 @@ @@ -20,6 +20,7 @@ + @@ -27,6 +28,8 @@ + + @@ -73,6 +76,7 @@ + diff --git a/src/java/org/apache/commons/logging/LogKitLogger.java b/src/java/org/apache/commons/logging/LogKitLogger.java new file mode 100644 index 0000000..2d57ec3 --- /dev/null +++ b/src/java/org/apache/commons/logging/LogKitLogger.java @@ -0,0 +1,199 @@ +/* + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//logging/src/java/org/apache/commons/logging/Attic/LogKitLogger.java,v 1.1 2002/01/07 23:06:10 rdonkin Exp $ + * $Revision: 1.1 $ + * $Date: 2002/01/07 23:06:10 $ + * + * ==================================================================== + * + * The Apache Software License, Version 1.1 + * + * Copyright (c) 1999-2001 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 + * . + * + */ + + +package org.apache.commons.logging; + +import org.apache.log.Logger; +import org.apache.log.Hierarchy; + +/** + *

Wrapper for jakarta-avalon-logkit logging system.

+ * + * @author Robert Burrell Donkin + * + * @version $Id: LogKitLogger.java,v 1.1 2002/01/07 23:06:10 rdonkin Exp $ + */ +public class LogKitLogger extends AbstractLog { + + // --------------------------------------------------------- Attributes + + /** Logging goes to this LogKit logger */ + protected Logger logger = null; + + + // --------------------------------------------------------- Constructor + + /** + * Constructor LogKitLogger which wrappers LogKit category with given name. + * + * @param name log name + */ + public LogKitLogger(String name) { + logger = Hierarchy.getDefaultHierarchy().getLoggerFor(name); + } + + // --------------------------------------------------------- Log Implementation + + /** + * Log to LogKit logger. + */ + protected final void debugImpl(Object message) { + if (message != null) { + logger.debug(message.toString()); + } + } + + /** + * Log to LogKit logger. + */ + protected final void debugImpl(Object message, Throwable t) { + if (message != null) { + logger.debug(message.toString(), t); + } + } + + /** + * Log to LogKit logger. + */ + protected final void infoImpl(Object message) { + if (message != null) { + logger.info(message.toString()); + } + } + + /** + * Log to LogKit logger. + */ + protected final void infoImpl(Object message, Throwable t) { + if (message != null) { + logger.info(message.toString(), t); + } + } + + /** + * Log to LogKit logger. + */ + protected final void warnImpl(Object message) { + if (message != null) { + logger.warn(message.toString()); + } + } + + /** + * Log to LogKit logger. + */ + protected final void warnImpl(Object message, Throwable t) { + if (message != null) { + logger.warn(message.toString(), t); + } + } + + /** + * Log to LogKit logger. + */ + protected final void errorImpl(Object message) { + if (message != null) { + logger.error(message.toString()); + } + } + + /** + * Log to LogKit logger. + */ + protected final void errorImpl(Object message, Throwable t) { + if (message != null) { + logger.error(message.toString(), t); + } + } + + /** + * Log to LogKit logger. + */ + protected final void fatalImpl(Object message) { + if (message != null) { + logger.fatalError(message.toString()); + } + } + + /** + * Log to LogKit logger. + */ + protected final void fatalImpl(Object message, Throwable t) { + if (message != null) { + logger.fatalError(message.toString(), t); + } + } + + /** + * Check that info is enabled for LogKit logger. + */ + protected boolean isInfoEnabledImpl() { + return logger.isInfoEnabled(); + } + + /** + * Check that debug is enabled for LogKit logger. + */ + protected boolean isDebugEnabledImpl() { + return logger.isDebugEnabled(); + } +}