From 85cb60fc4387e8a8ce2c1e80a81a951e1a659204 Mon Sep 17 00:00:00 2001 From: Morgan James Delagrange Date: Thu, 9 Aug 2001 14:54:42 +0000 Subject: [PATCH] no message git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk@138813 13f79535-47bb-0310-9956-ffa450edef68 --- PROPOSAL.html | 84 ------- build.properties.sample | 2 - build.xml | 217 ------------------ src/java/org/apache/commons/logging/Log.java | 29 --- .../commons/logging/Log4JCategoryLog.java | 75 ------ .../org/apache/commons/logging/LogSource.java | 95 -------- .../org/apache/commons/logging/NoOpLog.java | 30 --- .../org/apache/commons/logging/SimpleLog.java | 169 -------------- 8 files changed, 701 deletions(-) delete mode 100644 PROPOSAL.html delete mode 100644 build.properties.sample delete mode 100644 build.xml delete mode 100644 src/java/org/apache/commons/logging/Log.java delete mode 100644 src/java/org/apache/commons/logging/Log4JCategoryLog.java delete mode 100644 src/java/org/apache/commons/logging/LogSource.java delete mode 100644 src/java/org/apache/commons/logging/NoOpLog.java delete mode 100644 src/java/org/apache/commons/logging/SimpleLog.java diff --git a/PROPOSAL.html b/PROPOSAL.html deleted file mode 100644 index 84319a8..0000000 --- a/PROPOSAL.html +++ /dev/null @@ -1,84 +0,0 @@ - - -Proposal for Logging Library Package - - - -
-

Proposal for Logging Package

-
- -

(0) Rationale

- -

There is a great need for debugging and logging information inside of Commons components such as HTTPClient and dbcp. However, there are many logging APIs out there and it is difficult to choose among them. -

- -

The Logging package will be an ultra-thin bridge between different logging libraries. Commons components may use the Logging JAR to remove compile-time/runtime dependencies on any particular logging package, and contributors may write Log implementations for the library of their choice. -

- -

(1) Scope of the Package

- -

The package shall create and maintain a package that provides extremely basic logging functionality and bridges to other, more sophisticated logging implementations. -

- -

-The package should : -

-

- -

-Non-goals: -

-

- -

(1.5) Interaction With Other Packages

- -

Logging relies on: -

- - - -

(2) Required Jakarta-Commons Resources

- - - - -

(4) Initial Committers

- -

The initial committers on the Digester component shall be:

- - - - - diff --git a/build.properties.sample b/build.properties.sample deleted file mode 100644 index 736b6c2..0000000 --- a/build.properties.sample +++ /dev/null @@ -1,2 +0,0 @@ -# log4j.jar - log4j classes (see http://jakarta.apache.org/log4j) -log4j.jar=/java/log4j/log4j.jar diff --git a/build.xml b/build.xml deleted file mode 100644 index 4b570d8..0000000 --- a/build.xml +++ /dev/null @@ -1,217 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/java/org/apache/commons/logging/Log.java b/src/java/org/apache/commons/logging/Log.java deleted file mode 100644 index 4307baa..0000000 --- a/src/java/org/apache/commons/logging/Log.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) The Apache Software Foundation. All rights reserved. - * - * This software is published under the terms of the Apache Software License - * version 1.1, a copy of which has been included with this distribution in - * the LICENSE file. - */ - -package org.apache.commons.logging; - -/** - * A simple logging interface abstracting log4j. - * @author Rod Waldhoff - * @version $Id: Log.java,v 1.4 2001/08/08 20:35:22 morgand Exp $ - */ -public interface Log { - public void debug(Object message); - public void debug(Object message, Throwable t); - public void info(Object message); - public void info(Object message, Throwable t); - public void warn(Object message); - public void warn(Object message, Throwable t); - public void error(Object message); - public void error(Object message, Throwable t); - public void fatal(Object message); - public void fatal(Object message, Throwable t); - public boolean isDebugEnabled(); - public boolean isInfoEnabled(); -} diff --git a/src/java/org/apache/commons/logging/Log4JCategoryLog.java b/src/java/org/apache/commons/logging/Log4JCategoryLog.java deleted file mode 100644 index 4ad8173..0000000 --- a/src/java/org/apache/commons/logging/Log4JCategoryLog.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (C) The Apache Software Foundation. All rights reserved. - * - * This software is published under the terms of the Apache Software License - * version 1.1, a copy of which has been included with this distribution in - * the LICENSE file. - */ - -package org.apache.commons.logging; - -import org.apache.log4j.Category; -import org.apache.log4j.Priority; - -/** - * @author Rod Waldhoff - * @version $Id: Log4JCategoryLog.java,v 1.4 2001/08/08 20:35:22 morgand Exp $ - */ -public class Log4JCategoryLog implements Log { - Category _category = null; - - public Log4JCategoryLog(String name) { - _category = Category.getInstance(name); - } - - public final void debug(Object message) { - _category.debug(message); - } - - public final void debug(Object message, Throwable t) { - _category.debug(message,t); - } - - public final void info(Object message) { - _category.info(message); - } - - public final void info(Object message, Throwable t) { - _category.info(message,t); - } - - public final void warn(Object message) { - _category.warn(message); - } - public final void warn(Object message, Throwable t) { - _category.warn(message,t); - } - - public final void error(Object message) { - _category.error(message); - } - - public final void error(Object message, Throwable t) { - _category.error(message,t); - } - - public final void fatal(Object message) { - _category.fatal(message); - } - - public final void fatal(Object message, Throwable t) { - _category.fatal(message,t); - } - - public final boolean isDebugEnabled() { - return _category.isDebugEnabled(); - } - - public final boolean isInfoEnabled() { - return _category.isInfoEnabled(); - } - - public final boolean isEnabledFor(Priority p) { - return _category.isEnabledFor(p); - } -} diff --git a/src/java/org/apache/commons/logging/LogSource.java b/src/java/org/apache/commons/logging/LogSource.java deleted file mode 100644 index 8ebf816..0000000 --- a/src/java/org/apache/commons/logging/LogSource.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright (C) The Apache Software Foundation. All rights reserved. - * - * This software is published under the terms of the Apache Software License - * version 1.1, a copy of which has been included with this distribution in - * the LICENSE file. - */ - -package org.apache.commons.logging; - -import java.util.HashMap; -import java.lang.reflect.Constructor; - -/** - * @author Rod Waldhoff - * @version $Id: LogSource.java,v 1.2 2001/08/08 20:35:22 morgand Exp $ - */ -public class LogSource { - static protected HashMap _logs = new HashMap(); - static protected boolean _log4jIsAvailable = false; - static { - try { - if(null != Class.forName("org.apache.log4j.Category")) { - _log4jIsAvailable = true; - } else { - _log4jIsAvailable = false; - } - } catch(ClassNotFoundException e) { - _log4jIsAvailable = false; - } - } - - private LogSource() { - } - - static public Log getInstance(String name) { - Log log = (Log)(_logs.get(name)); - if(null == log) { - log = makeNewLogInstance(name); - _logs.put(name,log); - } - return log; - } - - static public Log getInstance(Class clazz) { - return getInstance(clazz.getName()); - } - - /** - * Create a new {@link Log} implementation, based - * on the given name - *

- * The specific {@link Log} implementation returned - * is determined by the value of the - * httpclient.log property. - * The value of httpclient.log may be set to - * the fully specified name of a class that implements - * the {@link Log} interface. This class must also - * have a public constructor that takes a single - * {@link String} argument (containing the name - * of the {@link Log} to be constructed. - *

- * When httpclient.log is not set, - * or when no corresponding class can be found, - * this method will return a {@link Log4JCategoryLog} - * if the log4j {@link org.apache.log4j.Category} class is - * available in the {@link LogSource}'s classpath, or - * a {@link NoOpLog} if it is not. - * - * @param name the log name (or category) - */ - static public Log makeNewLogInstance(String name) { - Log log = null; - String logclassname = System.getProperty("httpclient.log","org.apache.commons.httpclient.log.NoOpLog"); - try { - Class logclass = Class.forName(logclassname); - Class[] argtypes = new Class[1]; - argtypes[0] = "".getClass(); - Constructor ctor = logclass.getConstructor(argtypes); - Object[] args = new Object[1]; - args[0] = name; - log = (Log)(ctor.newInstance(args)); - } catch(Exception e) { - log = null; - } - if(null == log) { - if(_log4jIsAvailable) { - return new Log4JCategoryLog(name); - } else { - log = new NoOpLog(name); - } - } - return log; - } -} diff --git a/src/java/org/apache/commons/logging/NoOpLog.java b/src/java/org/apache/commons/logging/NoOpLog.java deleted file mode 100644 index 3af9d35..0000000 --- a/src/java/org/apache/commons/logging/NoOpLog.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (C) The Apache Software Foundation. All rights reserved. - * - * This software is published under the terms of the Apache Software License - * version 1.1, a copy of which has been included with this distribution in - * the LICENSE file. - */ - -package org.apache.commons.logging; - -/** - * @author Rod Waldhoff - * @version $Id: NoOpLog.java,v 1.4 2001/08/08 20:35:22 morgand Exp $ - */ -public final class NoOpLog implements Log { - public NoOpLog() { } - public NoOpLog(String name) { } - public void debug(Object message) { } - public void debug(Object message, Throwable t) { } - public void info(Object message) { } - public void info(Object message, Throwable t) { } - public void warn(Object message) { } - public void warn(Object message, Throwable t) { } - public void error(Object message) { } - public void error(Object message, Throwable t) { } - public void fatal(Object message) { } - public void fatal(Object message, Throwable t) { } - public final boolean isDebugEnabled() { return false; } - public final boolean isInfoEnabled() { return false; } -} diff --git a/src/java/org/apache/commons/logging/SimpleLog.java b/src/java/org/apache/commons/logging/SimpleLog.java deleted file mode 100644 index f1ada19..0000000 --- a/src/java/org/apache/commons/logging/SimpleLog.java +++ /dev/null @@ -1,169 +0,0 @@ -/* - * Copyright (C) The Apache Software Foundation. All rights reserved. - * - * This software is published under the terms of the Apache Software License - * version 1.1, a copy of which has been included with this distribution in - * the LICENSE file. - */ - -package org.apache.commons.logging; - -import java.util.Properties; -import java.util.Enumeration; -import java.io.InputStream; -import java.text.SimpleDateFormat; -import java.text.DateFormat; -import java.util.Date; - -/** - * @author Rod Waldhoff - * @version $Id: SimpleLog.java,v 1.4 2001/08/08 20:35:22 morgand Exp $ - */ -public class SimpleLog implements Log { - static protected final Properties _simplelogProps = new Properties(); - static protected boolean _showlogname = false; - static protected boolean _showtime = false; - static protected DateFormat _df = null; - - static { - // add all system props that start with "httpclient." - Enumeration enum = System.getProperties().propertyNames(); - while(enum.hasMoreElements()) { - String name = (String)(enum.nextElement()); - if(null != name && name.startsWith("httpclient.")) { - _simplelogProps.setProperty(name,System.getProperty(name)); - } - } - - // add props from the resource simplelog.properties - InputStream in = ClassLoader.getSystemResourceAsStream("simplelog.properties"); - if(null != in) { - try { - _simplelogProps.load(in); - in.close(); - } catch(java.io.IOException e) { - // ignored - } - } - try { - } catch(Throwable t) { - // ignored - } - _showlogname = "true".equalsIgnoreCase(_simplelogProps.getProperty("httpclient.simplelog.showlogname","true")); - _showtime = "true".equalsIgnoreCase(_simplelogProps.getProperty("httpclient.simplelog.showdate","true")); - if(_showtime) { - _df = new SimpleDateFormat(_simplelogProps.getProperty("httpclient.simplelog.dateformat","yyyy/MM/dd HH:mm:ss:SSS zzz")); - } - } - - protected static final int DEBUG = 5; - protected static final int INFO = 4; - protected static final int WARN = 3; - protected static final int ERROR = 2; - protected static final int FATAL = 1; - protected int _logLevel = 2; - - protected String _name = null; - - public SimpleLog(String name) { - _name = name; - - String lvl = _simplelogProps.getProperty("httpclient.simplelog.log." + _name); - int i = String.valueOf(name).lastIndexOf("."); - while(null == lvl && i > -1) { - name = name.substring(0,i); - lvl = _simplelogProps.getProperty("httpclient.simplelog.log." + name); - i = String.valueOf(name).lastIndexOf("."); - } - if(null == lvl) { - lvl = _simplelogProps.getProperty("httpclient.simplelog.defaultlog"); - } - - if("debug".equalsIgnoreCase(lvl)) { - _logLevel = DEBUG; - } else if("info".equalsIgnoreCase(lvl)) { - _logLevel = INFO; - } else if("warn".equalsIgnoreCase(lvl)) { - _logLevel = WARN; - } else if("error".equalsIgnoreCase(lvl)) { - _logLevel = ERROR; - } else if("fatal".equalsIgnoreCase(lvl)) { - _logLevel = FATAL; - } - } - - protected void log(int type, Object message, Throwable t) { - if(_logLevel >= type) { - StringBuffer buf = new StringBuffer(); - if(_showtime) { - buf.append(_df.format(new Date())); - buf.append(" "); - } - switch(type) { - case DEBUG: buf.append("[DEBUG] "); break; - case INFO: buf.append("[INFO] "); break; - case WARN: buf.append("[WARN] "); break; - case ERROR: buf.append("[ERROR] "); break; - case FATAL: buf.append("[FATAL] "); break; - } - if(_showlogname) { - buf.append(String.valueOf(_name)).append(" - "); - } - buf.append(String.valueOf(message)); - if(t != null) { - buf.append(" <"); - buf.append(t.toString()); - buf.append(">"); - t.printStackTrace(); - } - System.out.println(buf.toString()); - } - } - - public final void debug(Object message) { - log(DEBUG,message,null); - } - - public final void debug(Object message, Throwable t) { - log(DEBUG,message,t); - } - - public final void info(Object message) { - log(INFO,message,null); - } - - public final void info(Object message, Throwable t) { - log(INFO,message,t); - } - - public final void warn(Object message) { - log(WARN,message,null); - } - public final void warn(Object message, Throwable t) { - log(WARN,message,t); - } - - public final void error(Object message) { - log(ERROR,message,null); - } - - public final void error(Object message, Throwable t) { - log(ERROR,message,t); - } - - public final void fatal(Object message) { - log(FATAL,message,null); - } - - public final void fatal(Object message, Throwable t) { - log(FATAL,message,t); - } - - public final boolean isDebugEnabled() { - return (_logLevel >= DEBUG); - } - - public final boolean isInfoEnabled() { - return (_logLevel >= INFO); - } -}