cziegeler 2003/06/12 11:57:45
Modified: logger/src/java/org/apache/avalon/excalibur/logger/decorator
LoggerManagerDecorator.java
logger/src/java/org/apache/avalon/excalibur/logger/logkit
LogKitConfHelper.java
logger/src/java/org/apache/avalon/excalibur/logger
Log4JLoggerManager.java AbstractLoggerManager.java
LogKitLoggerManager.java
logger/src/java/org/apache/avalon/excalibur/logger/log4j
Log4JConfAdapter.java
monitor/src/java/org/apache/avalon/excalibur/monitor/impl
AbstractMonitor.java
Log:
Organizing imports
Revision Changes Path
1.2 +8 -9
avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/decorator/LoggerManagerDecorator.java
Index: LoggerManagerDecorator.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/decorator/LoggerManagerDecorator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LoggerManagerDecorator.java 11 Jun 2003 10:52:10 -0000 1.1
+++ LoggerManagerDecorator.java 12 Jun 2003 18:57:45 -0000 1.2
@@ -50,18 +50,17 @@
package org.apache.avalon.excalibur.logger.decorator;
import org.apache.avalon.excalibur.logger.LoggerManager;
-import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.activity.Startable;
import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.activity.Startable;
-import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.container.ContainerUtil;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.logger.LogEnabled;
+import org.apache.avalon.framework.logger.Logger;
/**
* This is the base class to create LoggerManager decorators.
1.4 +13 -15
avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/logkit/LogKitConfHelper.java
Index: LogKitConfHelper.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/logkit/LogKitConfHelper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LogKitConfHelper.java 11 Jun 2003 13:32:06 -0000 1.3
+++ LogKitConfHelper.java 12 Jun 2003 18:57:45 -0000 1.4
@@ -49,31 +49,29 @@
*/
package org.apache.avalon.excalibur.logger.logkit;
-import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.excalibur.logger.LogTargetFactory;
-import org.apache.avalon.excalibur.logger.LogTargetFactoryManager;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
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.DefaultLogTargetManager;
import org.apache.avalon.excalibur.logger.LogTargetManager;
import org.apache.avalon.excalibur.logger.util.LoggerUtil;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.container.ContainerUtil;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.log.Hierarchy;
import org.apache.log.LogTarget;
import org.apache.log.Priority;
import org.apache.log.util.Closeable;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Iterator;
-import org.apache.log.Hierarchy;
/**
* Tie this object to a LoggerManagerTee, give it the Hierachy
1.18 +1 -3
avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/Log4JLoggerManager.java
Index: Log4JLoggerManager.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/Log4JLoggerManager.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Log4JLoggerManager.java 11 Jun 2003 10:52:10 -0000 1.17
+++ Log4JLoggerManager.java 12 Jun 2003 18:57:45 -0000 1.18
@@ -49,8 +49,6 @@
*/
package org.apache.avalon.excalibur.logger;
-import java.util.HashMap;
-import java.util.Map;
import org.apache.avalon.framework.logger.Log4JLogger;
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Logger;
1.3 +5 -5
avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/AbstractLoggerManager.java
Index: AbstractLoggerManager.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/AbstractLoggerManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractLoggerManager.java 11 Jun 2003 10:52:10 -0000 1.2
+++ AbstractLoggerManager.java 12 Jun 2003 18:57:45 -0000 1.3
@@ -49,13 +49,13 @@
*/
package org.apache.avalon.excalibur.logger;
-import java.util.Map;
import java.util.HashMap;
-import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.logger.LogEnabled;
-import org.apache.avalon.framework.activity.Startable;
+import java.util.Map;
+
import org.apache.avalon.excalibur.logger.util.LoggerSwitch;
import org.apache.avalon.excalibur.logger.util.LoggerUtil;
+import org.apache.avalon.framework.logger.LogEnabled;
+import org.apache.avalon.framework.logger.Logger;
/**
*
1.19 +5 -5
avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/LogKitLoggerManager.java
Index: LogKitLoggerManager.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/LogKitLoggerManager.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- LogKitLoggerManager.java 11 Jun 2003 10:52:10 -0000 1.18
+++ LogKitLoggerManager.java 12 Jun 2003 18:57:45 -0000 1.19
@@ -52,6 +52,8 @@
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
+
+import org.apache.avalon.excalibur.logger.util.LoggerUtil;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
@@ -60,16 +62,14 @@
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.LogKitLogger;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.excalibur.logger.util.LoggerUtil;
+import org.apache.log.ErrorHandler;
import org.apache.log.Hierarchy;
+import org.apache.log.LogEvent;
import org.apache.log.LogTarget;
import org.apache.log.Priority;
import org.apache.log.util.Closeable;
-import org.apache.log.ErrorHandler;
-import org.apache.log.LogEvent;
/**
* LogKitLoggerManager implementation. It populates the LoggerManager
1.2 +2 -4
avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/log4j/Log4JConfAdapter.java
Index: Log4JConfAdapter.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/log4j/Log4JConfAdapter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Log4JConfAdapter.java 11 Jun 2003 10:52:10 -0000 1.1
+++ Log4JConfAdapter.java 12 Jun 2003 18:57:45 -0000 1.2
@@ -49,11 +49,9 @@
*/
package org.apache.avalon.excalibur.logger.log4j;
-import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.log4j.spi.LoggerRepository;
import org.apache.avalon.framework.configuration.ConfigurationUtil;
import org.apache.log4j.Hierarchy;
import org.apache.log4j.Level;
1.12 +1 -2
avalon-excalibur/monitor/src/java/org/apache/avalon/excalibur/monitor/impl/AbstractMonitor.java
Index: AbstractMonitor.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/monitor/src/java/org/apache/avalon/excalibur/monitor/impl/AbstractMonitor.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AbstractMonitor.java 23 May 2003 17:41:04 -0000 1.11
+++ AbstractMonitor.java 12 Jun 2003 18:57:45 -0000 1.12
@@ -55,7 +55,6 @@
import org.apache.avalon.excalibur.monitor.Monitor;
import org.apache.avalon.excalibur.monitor.Resource;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
/**
* The AbstractMonitor class is a useful base class which all Monitors
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
