A simple logging interface abstracting logging APIs. In order to be - * instantiated successfully by {@link LogFactory}, classes that implement - * this interface must have a constructor that takes a single String - * parameter representing the "name" of this Log.
- * - * The six logging levels used by Log are (in order):
- *
Performance is often a logging concern. - * By examining the appropriate property, - * a component can avoid expensive operations (producing information - * to be logged).
- * - *For example, - *
- * if (log.isDebugEnabled()) {
- * ... do something expensive ...
- * log.debug(theResult);
- * }
- *
- *
- * Configuration of the underlying logging system will generally be done - * external to the Logging APIs, through whatever mechanism is supported by - * that system.
- * - * @author Scott Sanders - * @author Rod Waldhoff - * @version $Id: Log.java,v 1.19 2004/06/06 21:16:04 rdonkin Exp $ - */ -public interface Log -{ - - /** - *Is debug logging currently enabled?
- * - * Call this method to prevent having to perform expensive operations
- * (for example, String concatenation)
- * when the log level is more than debug.
Is error logging currently enabled?
- * - * Call this method to prevent having to perform expensive operations
- * (for example, String concatenation)
- * when the log level is more than error.
Is fatal logging currently enabled?
- * - * Call this method to prevent having to perform expensive operations
- * (for example, String concatenation)
- * when the log level is more than fatal.
Is info logging currently enabled?
- * - * Call this method to prevent having to perform expensive operations
- * (for example, String concatenation)
- * when the log level is more than info.
Is trace logging currently enabled?
- * - * Call this method to prevent having to perform expensive operations
- * (for example, String concatenation)
- * when the log level is more than trace.
Is warn logging currently enabled?
- * - * Call this method to prevent having to perform expensive operations
- * (for example, String concatenation)
- * when the log level is more than warn.
Log a message with trace log level.
- * - * @param message log this message - */ - void trace( Object message ); - - /** - *Log an error with trace log level.
- * - * @param message log this message - * @param t log this cause - */ - void trace( Object message, Throwable t ); - - /** - *Log a message with debug log level.
- * - * @param message log this message - */ - void debug( Object message ); - - /** - *Log an error with debug log level.
- * - * @param message log this message - * @param t log this cause - */ - void debug( Object message, Throwable t ); - - /** - *Log a message with info log level.
- * - * @param message log this message - */ - void info( Object message ); - - /** - *Log an error with info log level.
- * - * @param message log this message - * @param t log this cause - */ - void info( Object message, Throwable t ); - - /** - *Log a message with warn log level.
- * - * @param message log this message - */ - void warn( Object message ); - - /** - *Log an error with warn log level.
- * - * @param message log this message - * @param t log this cause - */ - void warn( Object message, Throwable t ); - - /** - *Log a message with error log level.
- * - * @param message log this message - */ - void error( Object message ); - - /** - *Log an error with error log level.
- * - * @param message log this message - * @param t log this cause - */ - void error( Object message, Throwable t ); - - /** - *Log a message with fatal log level.
- * - * @param message log this message - */ - void fatal( Object message ); - - /** - *Log an error with fatal log level.
- * - * @param message log this message - * @param t log this cause - */ - void fatal( Object message, Throwable t ); - - /** - * Returns the LogLevel of the Logger. - * The LogLevels are - *- * Integer.MAX_INT = OFF - * FATAL = 50000 - * ERROR = 40000 - * WARN = 30000 - * INFO = 20000 - * DEBUG = 10000 - * TRACE = 5000 - * ALL = Integer.MIN_VALUE - *- * - * @return the numeric value of the current level. - */ - int getLogLevel(); - -} diff --git a/pax-swissbox-optional-jcl/src/main/java/org/apache/commons/logging/LogConfigurationException.java b/pax-swissbox-optional-jcl/src/main/java/org/apache/commons/logging/LogConfigurationException.java deleted file mode 100644 index a331344..0000000 --- a/pax-swissbox-optional-jcl/src/main/java/org/apache/commons/logging/LogConfigurationException.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright 2001-2004 The Apache Software Foundation. - * Copyright 2005 Niclas Hedhman - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/* NOTE!!!! This is NOT the original Jakarta Commons Logging, but an adaption - of its interface so that this Log4J OSGi bundle can export the JCL interface - but redirect permananently to the Log4J implementation -*/ - -package org.apache.commons.logging; - -/** - *
An exception that is thrown only if a suitable LogFactory
- * or Log instance cannot be created by the corresponding
- * factory methods.
null as its detail message.
- */
- public LogConfigurationException()
- {
- super();
- }
-
- /**
- * Construct a new exception with the specified detail message.
- *
- * @param message The detail message
- */
- public LogConfigurationException( String message )
- {
- super( message );
- }
-
- /**
- * Construct a new exception with the specified cause and a derived
- * detail message.
- *
- * @param cause The underlying cause
- */
- public LogConfigurationException( Throwable cause )
- {
- this( ( cause == null ) ? null : cause.toString(), cause );
- }
-
- /**
- * Construct a new exception with the specified detail message and cause.
- *
- * @param message The detail message
- * @param cause The underlying cause
- */
- public LogConfigurationException( String message, Throwable cause )
- {
- super( message + " (Caused by " + cause + ")" );
- this.cause = cause; // Two-argument version requires JDK 1.4 or later
- }
-
- /**
- * The underlying cause of this exception.
- */
- protected Throwable cause = null;
-
- /**
- * Return the underlying cause of this exception (if any).
- */
- public Throwable getCause()
- {
- return ( this.cause );
- }
-}
-
diff --git a/pax-swissbox-optional-jcl/src/main/java/org/apache/commons/logging/LogFactory.java b/pax-swissbox-optional-jcl/src/main/java/org/apache/commons/logging/LogFactory.java
deleted file mode 100644
index e58a46d..0000000
--- a/pax-swissbox-optional-jcl/src/main/java/org/apache/commons/logging/LogFactory.java
+++ /dev/null
@@ -1,342 +0,0 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * Copyright 2005 Niclas Hedhman
- * Copyright 2008 Alin Dreghiciu
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* NOTE!!!! This is NOT the original Jakarta Commons Logging, but an adaption
- of its interface so that this Log4J OSGi bundle can export the JCL interface
- but redirect to the Log4J implementation. There is nothing here that is useful
- outside an OSGi environment.
- */
-
-package org.apache.commons.logging;
-
-/**
- * This is an adaptation of the Jakarta Commons Logging API that returns a logger that does nothing.
- *
- * @author Alin Dreghiciu
- * @author Craig R. McClanahan
- * @author Costin Manolache
- * @author Richard A. Sitze
- */
-
-public class LogFactory
-{
-
- /**
- * Log factory in use.
- */
- private static LogFactory m_logFactory;
-
- /**
- * Logger in use.
- */
- private Log m_log;
-
- /**
- * @return the LogFactory instance to use.
- *
- * @throws LogConfigurationException if the implementation class is not available or cannot be
- * instantiated.
- */
- public static LogFactory getFactory()
- throws LogConfigurationException
- {
- synchronized( LogFactory.class )
- {
- if( m_logFactory == null )
- {
- m_logFactory = new LogFactory();
- }
- }
- return m_logFactory;
- }
-
- /**
- * Convenience method to return a named logger, without the application
- * having to care about factories.
- *
- * @param clazz Class from which a log name will be derived
- *
- * @return the Log instance to use for the class
- *
- * @throws LogConfigurationException if a suitable Log instance cannot be returned
- */
- public static Log getLog( Class clazz )
- throws LogConfigurationException
- {
- return getFactory().getInstance( clazz.getName() );
- }
-
- /**
- * Convenience method to return a named logger, without the application
- * having to care about factories.
- *
- * @param name Logical name of the Log instance to be returned
- * (the meaning of this name is only known to the underlying
- * logging implementation that is being wrapped)
- *
- * @return the Log instance to use for the class of the given name
- *
- * @throws LogConfigurationException if a suitable Log instance cannot be returned
- */
- public static Log getLog( String name )
- throws LogConfigurationException
- {
- return getFactory().getInstance( name );
- }
-
- /**
- * Release any internal references to previously created {@link LogFactory}
- * instances that have been associated with the specified class loader (if
- * any), after calling the instance method release() on each
- * of them.
- *
- * @param classLoader ClassLoader for which to release the LogFactory
- */
- public static void release( ClassLoader classLoader )
- {
- }
-
- /**
- * Release any internal references to previously created {@link LogFactory}
- * instances, after calling the instance method release() on
- * each of them. This is useful in environments like servlet containers,
- * which implement application reloading by throwing away a ClassLoader.
- * Dangling references to objects in that class loader would prevent garbage
- * collection.
- */
- public static void releaseAll()
- {
- release();
- }
-
- private LogFactory()
- {
- }
-
- /**
- * Return the configuration attribute with the specified name (if any), or
- * null if there is no such attribute.
- *
- * @param name Name of the attribute to return
- *
- * @return always return null. This method is not supported in Pax Logging.
- */
- public Object getAttribute( String name )
- {
- return null;
- }
-
- /**
- * Return an array containing the names of all currently defined
- * configuration attributes. If there are no such attributes, a zero length
- * array is returned.
- *
- * @return always returns an emtpy String array. This method is not supported in Pax Logging.
- */
- public String[] getAttributeNames()
- {
- return new String[0];
- }
-
- /**
- * Convenience method to derive a name from the specified class and call
- * getInstance(String) with it.
- *
- * @param clazz Class for which a suitable Log name will be derived
- *
- * @return the Log instance to use for the given class.
- *
- * @throws LogConfigurationException if a suitable Log instance cannot be returned
- */
- public Log getInstance( Class clazz )
- throws LogConfigurationException
- {
- return getInstance( clazz.getName() );
- }
-
- /**
- *
- * Construct (if necessary) and return a Log instance, using
- * the factory's current set of configuration attributes.
- *
- * NOTE - Depending upon the implementation of the
- * LogFactory you are using, the Log instance
- * you are returned may or may not be local to the current application, and
- * may or may not be returned again on a subsequent call with the same name
- * argument.
- *
Log instance to be returned
- * (the meaning of this name is only known to the underlying
- * logging implementation that is being wrapped)
- *
- * @return the Log instance of the class with the given name.
- *
- * @throws LogConfigurationException if a suitable Log instance cannot be returned
- */
- public Log getInstance( String name )
- throws LogConfigurationException
- {
- if( m_log == null )
- {
- m_log = new NullLog();
- }
- return m_log;
- }
-
- /**
- * Release any internal references to previously created {@link Log}
- * instances returned by this factory. This is useful in environments like
- * servlet containers, which implement application reloading by throwing
- * away a ClassLoader. Dangling references to objects in that class loader
- * would prevent garbage collection.
- */
- static public void release()
- {
- m_logFactory = null;
- }
-
- /**
- * Remove any configuration attribute associated with the specified name. If
- * there is no such attribute, no action is taken.
- *
- * @param name Name of the attribute to remove
- */
- public void removeAttribute( String name )
- {
- }
-
- /**
- * Set the configuration attribute with the specified name. Calling this
- * with a null value is equivalent to calling
- * removeAttribute(name).
- *
- * @param name Name of the attribute to set
- * @param value Value of the attribute to set, or null to
- * remove any setting for this attribute
- */
- public void setAttribute( String name, Object value )
- {
- }
-
- /**
- * JCL Log implementation that does nothing.
- */
- private static class NullLog
- implements Log
- {
-
- public boolean isDebugEnabled()
- {
- return false;
- }
-
- public boolean isErrorEnabled()
- {
- return false;
- }
-
- public boolean isFatalEnabled()
- {
- return false;
- }
-
- public boolean isInfoEnabled()
- {
- return false;
- }
-
- public boolean isTraceEnabled()
- {
- return false;
- }
-
- public boolean isWarnEnabled()
- {
- return false;
- }
-
- public void trace( Object message )
- {
- // does nothing
- }
-
- public void trace( Object message, Throwable t )
- {
- // does nothing
- }
-
- public void debug( Object message )
- {
- // does nothing
- }
-
- public void debug( Object message, Throwable t )
- {
- // does nothing
- }
-
- public void info( Object message )
- {
- // does nothing
- }
-
- public void info( Object message, Throwable t )
- {
- // does nothing
- }
-
- public void warn( Object message )
- {
- // does nothing
- }
-
- public void warn( Object message, Throwable t )
- {
- // does nothing
- }
-
- public void error( Object message )
- {
- // does nothing
- }
-
- public void error( Object message, Throwable t )
- {
- // does nothing
- }
-
- public void fatal( Object message )
- {
- // does nothing
- }
-
- public void fatal( Object message, Throwable t )
- {
- // does nothing
- }
-
- public int getLogLevel()
- {
- return Integer.MAX_VALUE;
- }
-
- }
-}
diff --git a/pom.xml b/pom.xml
index e0f24f9..4f708f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -195,7 +195,6 @@