You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@excalibur.apache.org by cz...@apache.org on 2004/07/14 11:01:01 UTC
svn commit: rev 22903 - in excalibur/trunk/containerkit/logger/src/java/org/apache/avalon/excalibur/logger: . decorator logkit util
Author: cziegeler
Date: Wed Jul 14 02:01:01 2004
New Revision: 22903
Modified:
excalibur/trunk/containerkit/logger/src/java/org/apache/avalon/excalibur/logger/DefaultLogKitManager.java
excalibur/trunk/containerkit/logger/src/java/org/apache/avalon/excalibur/logger/LogKitLoggerManager.java
excalibur/trunk/containerkit/logger/src/java/org/apache/avalon/excalibur/logger/decorator/OverrideDefaultDecorator.java
excalibur/trunk/containerkit/logger/src/java/org/apache/avalon/excalibur/logger/logkit/LogKitConfHelper.java
excalibur/trunk/containerkit/logger/src/java/org/apache/avalon/excalibur/logger/util/LoggerSwitch.java
Log:
Clean up code and javadocs
Modified: excalibur/trunk/containerkit/logger/src/java/org/apache/avalon/excalibur/logger/DefaultLogKitManager.java
==============================================================================
--- excalibur/trunk/containerkit/logger/src/java/org/apache/avalon/excalibur/logger/DefaultLogKitManager.java (original)
+++ excalibur/trunk/containerkit/logger/src/java/org/apache/avalon/excalibur/logger/DefaultLogKitManager.java Wed Jul 14 02:01:01 2004
@@ -250,10 +250,7 @@
throw new ConfigurationException( message, ce );
}
- if( targetManager instanceof LogTargetFactoryManageable )
- {
- targetManager.setLogTargetFactoryManager( targetFactoryManager );
- }
+ targetManager.setLogTargetFactoryManager( targetFactoryManager );
ContainerUtil.configure( targetManager, configuration );
return targetManager;
Modified: excalibur/trunk/containerkit/logger/src/java/org/apache/avalon/excalibur/logger/LogKitLoggerManager.java
==============================================================================
--- excalibur/trunk/containerkit/logger/src/java/org/apache/avalon/excalibur/logger/LogKitLoggerManager.java (original)
+++ excalibur/trunk/containerkit/logger/src/java/org/apache/avalon/excalibur/logger/LogKitLoggerManager.java Wed Jul 14 02:01:01 2004
@@ -310,7 +310,7 @@
* <p>There is nothing wrong with passing <code>fallbackLogger</code>
* via this constructor, but as this constructor is not convinient to
* be invoked (too many arguments, some of them likely to be null) and the
- * {@link #LogKitLogger(java.lang.String,org.apache.log.Hierarchy,org.apache.framework.logger.Logger}
+ * {@link #LogKitLoggerManager(String,Hierarchy,Logger)}
* constructor is broken
* in using its <code>Logger</code> argument both as
* <code>fallbackLogger</code> (which is okay) and as
@@ -452,10 +452,7 @@
ContainerUtil.enableLogging( targetManager, getLogger() );
- if( targetManager instanceof LogTargetFactoryManageable )
- {
- targetManager.setLogTargetFactoryManager( targetFactoryManager );
- }
+ targetManager.setLogTargetFactoryManager( targetFactoryManager );
ContainerUtil.configure( targetManager, configuration );
Modified: excalibur/trunk/containerkit/logger/src/java/org/apache/avalon/excalibur/logger/decorator/OverrideDefaultDecorator.java
==============================================================================
--- excalibur/trunk/containerkit/logger/src/java/org/apache/avalon/excalibur/logger/decorator/OverrideDefaultDecorator.java (original)
+++ excalibur/trunk/containerkit/logger/src/java/org/apache/avalon/excalibur/logger/decorator/OverrideDefaultDecorator.java Wed Jul 14 02:01:01 2004
@@ -36,7 +36,7 @@
/**
* Creates an <code>OverrideDecorator</code> instance.
- * @param <code>OverrideDecorator</code> is unique in that
+ * @param defaultLogger <code>OverrideDecorator</code> is unique in that
* it won't tolerate a null extra argument: if this
* argument is <code>null</code> a NullPointerException will
* be thrown. This ensures that no logging surprises will occur.
Modified: excalibur/trunk/containerkit/logger/src/java/org/apache/avalon/excalibur/logger/logkit/LogKitConfHelper.java
==============================================================================
--- excalibur/trunk/containerkit/logger/src/java/org/apache/avalon/excalibur/logger/logkit/LogKitConfHelper.java (original)
+++ excalibur/trunk/containerkit/logger/src/java/org/apache/avalon/excalibur/logger/logkit/LogKitConfHelper.java Wed Jul 14 02:01:01 2004
@@ -22,7 +22,6 @@
import org.apache.avalon.excalibur.logger.DefaultLogTargetFactoryManager;
import org.apache.avalon.excalibur.logger.DefaultLogTargetManager;
-import org.apache.avalon.excalibur.logger.LogTargetFactoryManageable;
import org.apache.avalon.excalibur.logger.LogTargetFactoryManager;
import org.apache.avalon.excalibur.logger.LogTargetManager;
import org.apache.avalon.excalibur.logger.util.LoggerUtil;
@@ -149,10 +148,7 @@
ContainerUtil.enableLogging( targetManager, getLogger() );
- if( targetManager instanceof LogTargetFactoryManageable )
- {
- targetManager.setLogTargetFactoryManager( targetFactoryManager );
- }
+ targetManager.setLogTargetFactoryManager( targetFactoryManager );
ContainerUtil.configure( targetManager, configuration );
@@ -162,7 +158,7 @@
/**
* Setup Loggers
*
- * @param categories [] The array object of configurations for categories.
+ * @param parentElement The array object of configurations for categories.
* @param root shows if we're processing the root of the configuration
* @throws ConfigurationException if the configuration is malformed
*/
Modified: excalibur/trunk/containerkit/logger/src/java/org/apache/avalon/excalibur/logger/util/LoggerSwitch.java
==============================================================================
--- excalibur/trunk/containerkit/logger/src/java/org/apache/avalon/excalibur/logger/util/LoggerSwitch.java (original)
+++ excalibur/trunk/containerkit/logger/src/java/org/apache/avalon/excalibur/logger/util/LoggerSwitch.java Wed Jul 14 02:01:01 2004
@@ -37,7 +37,7 @@
public class LoggerSwitch
{
- private final static Logger SHARED_NULL = new NullLogger();
+ protected final static Logger SHARED_NULL = new NullLogger();
private final static class BooleanThreadLocal extends ThreadLocal
{
---------------------------------------------------------------------
To unsubscribe, e-mail: scm-unsubscribe@excalibur.apache.org
For additional commands, e-mail: scm-help@excalibur.apache.org