cziegeler 2004/03/17 02:30:09
Modified: merlin/activation/impl/src/java/org/apache/avalon/activation/impl
DefaultLifestyleFactory.java
DefaultServiceManager.java
TransientLifestyleManager.java
AbstractAppliance.java
SingletonLifestyleManager.java
AbstractLifestyleManager.java
DefaultComponentFactory.java
ApplianceInvocationHandler.java
ThreadLifestyleManager.java DefaultAppliance.java
DefaultBlock.java BlockInvocationHandler.java
DefaultRuntimeFactory.java DefaultRuntime.java
merlin/kernel/cli/src/java/org/apache/avalon/merlin/cli
Main.java
logging/spi/src/java/org/apache/avalon/logging/provider
LoggingManager.java LoggingFactory.java
logging/logkit/plugins/syslog/src/java/org/apache/avalon/logging/logkit/factory/syslog
SyslogTarget.java SyslogTargetFactory.java
merlin/composition/api/src/java/org/apache/avalon/composition/data
CertsDirective.java Targets.java
SecurityProfile.java ContainmentProfile.java
ComponentProfile.java TargetDirective.java
logging/test/src/test/org/apache/avalon/logging/log4j/test
AlternateLoggingManagerTestCase.java
DefaultLoggingManagerTestCase.java
merlin/composition/api/src/java/org/apache/avalon/composition/model
ComponentModel.java DeploymentModel.java
ContainmentModel.java
merlin/facilities/finder/ecm/src/java/org/apache/avalon/finder/ecm
ECM.java
logging/test/src/test/org/apache/avalon/logging/logkit/test
DefaultLoggingManagerTestCase.java
merlin/activation/api/src/java/org/apache/avalon/activation
Appliance.java ComponentFactory.java
logging/api/src/test/org/apache/avalon/logging/data/test
CategoriesDirectiveTestCase.java
logging/logkit/plugins/socket/src/java/org/apache/avalon/logging/logkit/factory/socket
SocketTargetFactory.java
logging/logkit/plugins/datagram/src/java/org/apache/avalon/logging/logkit/factory/datagram
DatagramTargetFactory.java
logging/test/src/test/org/apache/avalon/logging
LoggingManagerHelper.java
Log:
Remove unused imports
Revision Changes Path
1.4 +1 -3
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultLifestyleFactory.java
Index: DefaultLifestyleFactory.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultLifestyleFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultLifestyleFactory.java 4 Mar 2004 03:42:30 -0000 1.3
+++ DefaultLifestyleFactory.java 17 Mar 2004 10:30:07 -0000 1.4
@@ -26,8 +26,6 @@
import org.apache.avalon.meta.info.InfoDescriptor;
-import org.apache.avalon.framework.logger.Logger;
-
/**
* A factory enabling the establishment of runtime handlers.
1.6 +0 -4
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultServiceManager.java
Index: DefaultServiceManager.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultServiceManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultServiceManager.java 15 Mar 2004 12:58:43 -0000 1.5
+++ DefaultServiceManager.java 17 Mar 2004 10:30:07 -0000 1.6
@@ -22,13 +22,9 @@
import java.lang.reflect.Proxy;
import java.lang.reflect.InvocationHandler;
-import org.apache.avalon.activation.TransientApplianceException;
-
import org.apache.avalon.composition.model.ComponentModel;
import org.apache.avalon.composition.model.DeploymentModel;
import org.apache.avalon.composition.model.DependencyModel;
-import org.apache.avalon.composition.model.Resolver;
-import org.apache.avalon.composition.model.TransientServiceException;
import org.apache.avalon.composition.model.FatalServiceException;
import org.apache.avalon.framework.logger.Logger;
1.5 +1 -2
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/TransientLifestyleManager.java
Index: TransientLifestyleManager.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/TransientLifestyleManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TransientLifestyleManager.java 10 Mar 2004 10:52:17 -0000 1.4
+++ TransientLifestyleManager.java 17 Mar 2004 10:30:07 -0000 1.5
@@ -25,7 +25,6 @@
import org.apache.avalon.activation.ComponentFactory;
import org.apache.avalon.composition.model.ComponentModel;
-import org.apache.avalon.composition.provider.LifestyleManager;
import org.apache.avalon.meta.info.InfoDescriptor;
1.3 +1 -2
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/AbstractAppliance.java
Index: AbstractAppliance.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/AbstractAppliance.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractAppliance.java 4 Mar 2004 03:42:30 -0000 1.2
+++ AbstractAppliance.java 17 Mar 2004 10:30:07 -0000 1.3
@@ -20,7 +20,6 @@
import org.apache.avalon.activation.Appliance;
import org.apache.avalon.composition.model.DeploymentModel;
-import org.apache.avalon.composition.provider.LifestyleManager;
import org.apache.avalon.framework.logger.Logger;
1.4 +1 -2
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/SingletonLifestyleManager.java
Index: SingletonLifestyleManager.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/SingletonLifestyleManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SingletonLifestyleManager.java 4 Mar 2004 03:42:30 -0000 1.3
+++ SingletonLifestyleManager.java 17 Mar 2004 10:30:07 -0000 1.4
@@ -22,7 +22,6 @@
import org.apache.avalon.activation.ComponentFactory;
import org.apache.avalon.composition.model.ComponentModel;
-import org.apache.avalon.composition.provider.LifestyleManager;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Avalon Development Team</a>
1.7 +1 -2
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/AbstractLifestyleManager.java
Index: AbstractLifestyleManager.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/AbstractLifestyleManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractLifestyleManager.java 11 Mar 2004 18:13:14 -0000 1.6
+++ AbstractLifestyleManager.java 17 Mar 2004 10:30:07 -0000 1.7
@@ -26,7 +26,6 @@
import org.apache.avalon.activation.ComponentFactory;
import org.apache.avalon.composition.model.ComponentModel;
-import org.apache.avalon.composition.model.DeploymentModel;
import org.apache.avalon.composition.model.StageModel;
import org.apache.avalon.composition.provider.LifestyleManager;
1.10 +1 -12
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultComponentFactory.java
Index: DefaultComponentFactory.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultComponentFactory.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultComponentFactory.java 13 Mar 2004 23:26:56 -0000 1.9
+++ DefaultComponentFactory.java 17 Mar 2004 10:30:07 -0000 1.10
@@ -17,19 +17,13 @@
package org.apache.avalon.activation.impl;
-import java.util.Map;
-import java.util.Hashtable;
import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException ;
-import java.lang.reflect.Method ;
-import java.security.AccessControlContext;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.security.PrivilegedExceptionAction;
import org.apache.avalon.activation.ComponentFactory;
-import org.apache.avalon.activation.RuntimeFactory;
import org.apache.avalon.activation.LifecycleException;
import org.apache.avalon.composition.info.DeliveryDescriptor;
@@ -37,12 +31,9 @@
import org.apache.avalon.composition.info.StagedDeliveryDescriptor;
import org.apache.avalon.composition.info.InjectorDeliveryDescriptor;
import org.apache.avalon.composition.info.NullDeliveryDescriptor;
-import org.apache.avalon.composition.model.ModelException;
-import org.apache.avalon.composition.model.ModelRuntimeException;
import org.apache.avalon.composition.model.DeploymentModel;
import org.apache.avalon.composition.model.ComponentModel;
import org.apache.avalon.composition.model.ContextModel;
-import org.apache.avalon.composition.model.ContainmentModel;
import org.apache.avalon.composition.model.StageModel;
import org.apache.avalon.composition.model.ContextualizationHandler;
import org.apache.avalon.composition.model.LifecycleCreateExtension;
@@ -68,8 +59,6 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.lifecycle.Creator;
-
-import org.apache.avalon.repository.Artifact;
import org.apache.avalon.util.i18n.ResourceManager;
import org.apache.avalon.util.i18n.Resources;
1.8 +1 -4
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/ApplianceInvocationHandler.java
Index: ApplianceInvocationHandler.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/ApplianceInvocationHandler.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ApplianceInvocationHandler.java 13 Mar 2004 23:26:56 -0000 1.7
+++ ApplianceInvocationHandler.java 17 Mar 2004 10:30:07 -0000 1.8
@@ -21,19 +21,16 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.UndeclaredThrowableException;
import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
import java.security.PrivilegedActionException;
import java.security.AccessController;
import java.security.PrivilegedExceptionAction;
-import org.apache.avalon.activation.Appliance;
import org.apache.avalon.activation.ApplianceException;
import org.apache.avalon.activation.TransientApplianceException;
import org.apache.avalon.composition.model.ComponentModel;
import org.apache.avalon.composition.model.TransientRuntimeException;
-import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.logger.Logger;
/**
1.4 +1 -2
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/ThreadLifestyleManager.java
Index: ThreadLifestyleManager.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/ThreadLifestyleManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ThreadLifestyleManager.java 4 Mar 2004 03:42:30 -0000 1.3
+++ ThreadLifestyleManager.java 17 Mar 2004 10:30:07 -0000 1.4
@@ -21,7 +21,6 @@
import org.apache.avalon.activation.ComponentFactory;
import org.apache.avalon.composition.model.ComponentModel;
-import org.apache.avalon.composition.provider.LifestyleManager;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Avalon Development Team</a>
1.7 +1 -3
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultAppliance.java
Index: DefaultAppliance.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultAppliance.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultAppliance.java 13 Mar 2004 23:26:56 -0000 1.6
+++ DefaultAppliance.java 17 Mar 2004 10:30:07 -0000 1.7
@@ -20,14 +20,12 @@
import java.lang.reflect.Proxy;
import org.apache.avalon.activation.ApplianceException;
-import org.apache.avalon.activation.TransientApplianceException;
import org.apache.avalon.composition.model.ComponentModel;
import org.apache.avalon.composition.model.TransientRuntimeException;
import org.apache.avalon.composition.provider.LifestyleManager;
import org.apache.avalon.composition.util.DefaultState;
-import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.util.i18n.ResourceManager;
1.4 +1 -9
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultBlock.java
Index: DefaultBlock.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultBlock.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultBlock.java 15 Mar 2004 12:58:43 -0000 1.3
+++ DefaultBlock.java 17 Mar 2004 10:30:07 -0000 1.4
@@ -17,24 +17,16 @@
package org.apache.avalon.activation.impl;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
-import java.lang.reflect.UndeclaredThrowableException;
import java.util.ArrayList;
-import org.apache.avalon.activation.Appliance;
-import org.apache.avalon.activation.ApplianceException;
import org.apache.avalon.activation.ApplianceRuntimeException;
-import org.apache.avalon.composition.model.DeploymentModel;
import org.apache.avalon.composition.model.ContainmentModel;
import org.apache.avalon.composition.model.ServiceModel;
import org.apache.avalon.composition.provider.SystemContext;
import org.apache.avalon.composition.util.DefaultState;
-import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.util.i18n.ResourceManager;
1.2 +0 -2
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/BlockInvocationHandler.java
Index: BlockInvocationHandler.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/BlockInvocationHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BlockInvocationHandler.java 15 Mar 2004 12:58:43 -0000 1.1
+++ BlockInvocationHandler.java 17 Mar 2004 10:30:07 -0000 1.2
@@ -20,11 +20,9 @@
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
import java.lang.reflect.UndeclaredThrowableException;
import org.apache.avalon.activation.ApplianceException;
-import org.apache.avalon.activation.ApplianceRuntimeException;
import org.apache.avalon.composition.model.DeploymentModel;
import org.apache.avalon.composition.model.ContainmentModel;
1.6 +1 -4
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultRuntimeFactory.java
Index: DefaultRuntimeFactory.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultRuntimeFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultRuntimeFactory.java 8 Mar 2004 11:28:35 -0000 1.5
+++ DefaultRuntimeFactory.java 17 Mar 2004 10:30:07 -0000 1.6
@@ -24,11 +24,8 @@
import org.apache.avalon.activation.RuntimeFactory;
import org.apache.avalon.activation.RuntimeFactoryException;
import org.apache.avalon.activation.Appliance;
-import org.apache.avalon.activation.ApplianceException;
import org.apache.avalon.activation.ApplianceRuntimeException;
-import org.apache.avalon.composition.model.Commissionable;
-import org.apache.avalon.composition.model.ModelException;
import org.apache.avalon.composition.model.ModelRuntimeException;
import org.apache.avalon.composition.model.DeploymentModel;
import org.apache.avalon.composition.model.ComponentModel;
1.4 +1 -15
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultRuntime.java
Index: DefaultRuntime.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultRuntime.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultRuntime.java 8 Mar 2004 11:28:35 -0000 1.3
+++ DefaultRuntime.java 17 Mar 2004 10:30:07 -0000 1.4
@@ -17,25 +17,11 @@
package org.apache.avalon.activation.impl;
-import java.io.File;
-import java.net.URL;
-import java.util.Map;
-
import org.apache.avalon.activation.RuntimeFactory;
-import org.apache.avalon.composition.model.ContainmentModel;
import org.apache.avalon.composition.model.DeploymentModel;
-import org.apache.avalon.composition.provider.ModelFactory;
import org.apache.avalon.composition.provider.SystemContext;
import org.apache.avalon.composition.provider.Runtime;
-
-import org.apache.avalon.logging.provider.LoggingManager;
-import org.apache.avalon.logging.data.CategoryDirective;
-
-import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.logger.ConsoleLogger;
-import org.apache.avalon.framework.context.DefaultContext;
-import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.util.i18n.ResourceManager;
import org.apache.avalon.util.i18n.Resources;
1.22 +1 -8
avalon/merlin/kernel/cli/src/java/org/apache/avalon/merlin/cli/Main.java
Index: Main.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/kernel/cli/src/java/org/apache/avalon/merlin/cli/Main.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Main.java 8 Mar 2004 11:28:37 -0000 1.21
+++ Main.java 17 Mar 2004 10:30:07 -0000 1.22
@@ -19,15 +19,9 @@
import java.io.File;
import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
import java.util.Map;
-import java.util.Hashtable;
import java.util.Properties;
-import java.util.Enumeration;
import java.util.Locale;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
import javax.naming.directory.Attributes;
@@ -39,7 +33,6 @@
import org.apache.avalon.repository.provider.InitialContext;
import org.apache.avalon.repository.provider.InitialContextFactory;
import org.apache.avalon.repository.provider.Factory;
-import org.apache.avalon.repository.RepositoryException;
import org.apache.avalon.repository.main.DefaultInitialContextFactory;
import org.apache.avalon.repository.main.DefaultBuilder;
import org.apache.avalon.repository.meta.ArtifactDescriptor;
1.2 +1 -2
avalon/logging/spi/src/java/org/apache/avalon/logging/provider/LoggingManager.java
Index: LoggingManager.java
===================================================================
RCS file:
/home/cvs/avalon/logging/spi/src/java/org/apache/avalon/logging/provider/LoggingManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LoggingManager.java 27 Feb 2004 22:39:35 -0000 1.1
+++ LoggingManager.java 17 Mar 2004 10:30:07 -0000 1.2
@@ -18,7 +18,6 @@
package org.apache.avalon.logging.provider;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.logging.data.CategoryDirective;
import org.apache.avalon.logging.data.CategoriesDirective;
/**
1.2 +1 -5
avalon/logging/spi/src/java/org/apache/avalon/logging/provider/LoggingFactory.java
Index: LoggingFactory.java
===================================================================
RCS file:
/home/cvs/avalon/logging/spi/src/java/org/apache/avalon/logging/provider/LoggingFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LoggingFactory.java 27 Feb 2004 22:39:35 -0000 1.1
+++ LoggingFactory.java 17 Mar 2004 10:30:08 -0000 1.2
@@ -17,10 +17,6 @@
package org.apache.avalon.logging.provider;
-import java.io.File;
-import java.io.IOException;
-import java.util.Map;
-
import org.apache.avalon.repository.provider.Factory;
1.4 +0 -4
avalon/logging/logkit/plugins/syslog/src/java/org/apache/avalon/logging/logkit/factory/syslog/SyslogTarget.java
Index: SyslogTarget.java
===================================================================
RCS file:
/home/cvs/avalon/logging/logkit/plugins/syslog/src/java/org/apache/avalon/logging/logkit/factory/syslog/SyslogTarget.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SyslogTarget.java 13 Mar 2004 04:11:04 -0000 1.3
+++ SyslogTarget.java 17 Mar 2004 10:30:08 -0000 1.4
@@ -18,14 +18,10 @@
package org.apache.avalon.logging.logkit.factory.syslog;
import java.io.IOException;
-import java.net.DatagramPacket;
-import java.net.DatagramSocket;
import java.net.InetAddress;
import org.apache.log.LogEvent;
-import org.apache.log.Priority;
import org.apache.log.format.Formatter;
-import org.apache.log.output.AbstractOutputTarget;
import org.apache.log.output.net.DatagramOutputTarget;
/**
1.4 +1 -3
avalon/logging/logkit/plugins/syslog/src/java/org/apache/avalon/logging/logkit/factory/syslog/SyslogTargetFactory.java
Index: SyslogTargetFactory.java
===================================================================
RCS file:
/home/cvs/avalon/logging/logkit/plugins/syslog/src/java/org/apache/avalon/logging/logkit/factory/syslog/SyslogTargetFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SyslogTargetFactory.java 8 Mar 2004 11:32:01 -0000 1.3
+++ SyslogTargetFactory.java 17 Mar 2004 10:30:08 -0000 1.4
@@ -17,7 +17,6 @@
package org.apache.avalon.logging.logkit.factory.syslog;
-import java.io.IOException;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -33,7 +32,6 @@
import org.apache.log.LogTarget;
import org.apache.log.format.Formatter;
-import org.apache.log.output.net.SocketOutputTarget;
/**
* SyslogTargetFactory
1.2 +1 -3
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/CertsDirective.java
Index: CertsDirective.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/CertsDirective.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CertsDirective.java 23 Feb 2004 13:00:31 -0000 1.1
+++ CertsDirective.java 17 Mar 2004 10:30:08 -0000 1.2
@@ -20,8 +20,6 @@
import java.io.Serializable;
import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
/**
* Description of the Certificates description.
1.7 +1 -4
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/Targets.java
Index: Targets.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/Targets.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Targets.java 11 Mar 2004 01:30:38 -0000 1.6
+++ Targets.java 17 Mar 2004 10:30:08 -0000 1.7
@@ -19,9 +19,6 @@
import java.util.ArrayList;
-import org.apache.avalon.logging.data.CategoriesDirective;
-import org.apache.avalon.logging.data.CategoryDirective;
-
/**
* <p>A target is a tagged configuration fragment. The tag is a path
1.2 +1 -3
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/SecurityProfile.java
Index: SecurityProfile.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/SecurityProfile.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SecurityProfile.java 29 Feb 2004 22:25:26 -0000 1.1
+++ SecurityProfile.java 17 Mar 2004 10:30:08 -0000 1.2
@@ -17,8 +17,6 @@
package org.apache.avalon.composition.data;
-import java.security.cert.Certificate;
-
import java.io.Serializable;
import org.apache.avalon.meta.info.PermissionDescriptor;
1.10 +1 -2
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/ContainmentProfile.java
Index: ContainmentProfile.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/ContainmentProfile.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ContainmentProfile.java 11 Mar 2004 01:30:38 -0000 1.9
+++ ContainmentProfile.java 17 Mar 2004 10:30:08 -0000 1.10
@@ -22,7 +22,6 @@
import org.apache.avalon.meta.info.ServiceDescriptor;
import org.apache.avalon.logging.data.CategoriesDirective;
-import org.apache.avalon.logging.data.CategoryDirective;
/**
* A containment profile describes a containment context including
1.6 +1 -2
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/ComponentProfile.java
Index: ComponentProfile.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/ComponentProfile.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ComponentProfile.java 11 Mar 2004 01:30:38 -0000 1.5
+++ ComponentProfile.java 17 Mar 2004 10:30:08 -0000 1.6
@@ -22,7 +22,6 @@
import org.apache.avalon.meta.info.InfoDescriptor;
import org.apache.avalon.logging.data.CategoriesDirective;
-import org.apache.avalon.logging.data.CategoryDirective;
/**
1.8 +1 -2
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/TargetDirective.java
Index: TargetDirective.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/TargetDirective.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TargetDirective.java 11 Mar 2004 01:30:38 -0000 1.7
+++ TargetDirective.java 17 Mar 2004 10:30:08 -0000 1.8
@@ -22,7 +22,6 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.logging.data.CategoriesDirective;
-import org.apache.avalon.logging.data.CategoryDirective;
/**
* <p>A target is a tagged configuration fragment. The tag is a path
1.3 +0 -14
avalon/logging/test/src/test/org/apache/avalon/logging/log4j/test/AlternateLoggingManagerTestCase.java
Index: AlternateLoggingManagerTestCase.java
===================================================================
RCS file:
/home/cvs/avalon/logging/test/src/test/org/apache/avalon/logging/log4j/test/AlternateLoggingManagerTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AlternateLoggingManagerTestCase.java 29 Feb 2004 22:32:42 -0000 1.2
+++ AlternateLoggingManagerTestCase.java 17 Mar 2004 10:30:08 -0000 1.3
@@ -17,10 +17,6 @@
package org.apache.avalon.logging.log4j.test;
-import java.io.File;
-import java.net.URL;
-import java.util.Map;
-
import junit.framework.TestCase;
import org.apache.avalon.framework.logger.Logger;
@@ -28,16 +24,6 @@
import org.apache.avalon.logging.LoggingManagerHelper;
import org.apache.avalon.logging.provider.LoggingManager;
import org.apache.avalon.logging.provider.LoggingException;
-
-import org.apache.avalon.repository.Artifact;
-import org.apache.avalon.repository.provider.Factory;
-import org.apache.avalon.repository.provider.InitialContext;
-import org.apache.avalon.repository.provider.Builder;
-import org.apache.avalon.repository.main.DefaultInitialContext;
-import org.apache.avalon.repository.main.DefaultBuilder;
-
-import org.apache.avalon.util.env.Env;
-import org.apache.avalon.util.exception.ExceptionHelper;
/**
*
1.4 +1 -15
avalon/logging/test/src/test/org/apache/avalon/logging/log4j/test/DefaultLoggingManagerTestCase.java
Index: DefaultLoggingManagerTestCase.java
===================================================================
RCS file:
/home/cvs/avalon/logging/test/src/test/org/apache/avalon/logging/log4j/test/DefaultLoggingManagerTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultLoggingManagerTestCase.java 29 Feb 2004 22:32:42 -0000 1.3
+++ DefaultLoggingManagerTestCase.java 17 Mar 2004 10:30:08 -0000 1.4
@@ -17,10 +17,6 @@
package org.apache.avalon.logging.log4j.test;
-import java.io.File;
-import java.net.URL;
-import java.util.Map;
-
import junit.framework.TestCase;
import org.apache.avalon.framework.logger.Logger;
@@ -28,16 +24,6 @@
import org.apache.avalon.logging.LoggingManagerHelper;
import org.apache.avalon.logging.provider.LoggingManager;
import org.apache.avalon.logging.provider.LoggingException;
-
-import org.apache.avalon.repository.Artifact;
-import org.apache.avalon.repository.provider.Factory;
-import org.apache.avalon.repository.provider.InitialContext;
-import org.apache.avalon.repository.provider.Builder;
-import org.apache.avalon.repository.main.DefaultInitialContext;
-import org.apache.avalon.repository.main.DefaultBuilder;
-
-import org.apache.avalon.util.env.Env;
-import org.apache.avalon.util.exception.ExceptionHelper;
/**
*
1.9 +1 -2
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ComponentModel.java
Index: ComponentModel.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ComponentModel.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ComponentModel.java 13 Mar 2004 23:26:56 -0000 1.8
+++ ComponentModel.java 17 Mar 2004 10:30:08 -0000 1.9
@@ -17,7 +17,6 @@
package org.apache.avalon.composition.model;
-import org.apache.avalon.logging.data.CategoriesDirective;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.meta.info.DependencyDescriptor;
1.20 +1 -3
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/DeploymentModel.java
Index: DeploymentModel.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/DeploymentModel.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- DeploymentModel.java 13 Mar 2004 23:26:56 -0000 1.19
+++ DeploymentModel.java 17 Mar 2004 10:30:08 -0000 1.20
@@ -17,8 +17,6 @@
package org.apache.avalon.composition.model;
-import java.util.List;
-import java.security.Permissions;
import java.security.AccessControlContext;
import org.apache.avalon.composition.data.Mode;
1.23 +1 -4
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ContainmentModel.java
Index: ContainmentModel.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ContainmentModel.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ContainmentModel.java 13 Mar 2004 23:26:56 -0000 1.22
+++ ContainmentModel.java 17 Mar 2004 10:30:08 -0000 1.23
@@ -21,13 +21,10 @@
import java.util.List;
import org.apache.avalon.composition.data.DeploymentProfile;
-import org.apache.avalon.composition.data.ServiceDirective;
-import org.apache.avalon.logging.data.CategoriesDirective;
import org.apache.avalon.composition.data.TargetDirective;
import org.apache.avalon.composition.event.CompositionListener;
import org.apache.avalon.meta.info.ReferenceDescriptor;
import org.apache.avalon.meta.info.DependencyDescriptor;
-import org.apache.avalon.meta.info.StageDescriptor;
/**
* Containment model is an extended deployment model that aggregates
1.4 +1 -5
avalon/merlin/facilities/finder/ecm/src/java/org/apache/avalon/finder/ecm/ECM.java
Index: ECM.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/facilities/finder/ecm/src/java/org/apache/avalon/finder/ecm/ECM.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ECM.java 12 Mar 2004 08:00:42 -0000 1.3
+++ ECM.java 17 Mar 2004 10:30:08 -0000 1.4
@@ -18,15 +18,11 @@
package org.apache.avalon.finder.ecm;
import org.apache.avalon.finder.Finder;
-import org.apache.avalon.finder.FinderException;
-import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.configuration.Configurable;
/**
* A default implementation of a finder service that provides
1.3 +1 -15
avalon/logging/test/src/test/org/apache/avalon/logging/logkit/test/DefaultLoggingManagerTestCase.java
Index: DefaultLoggingManagerTestCase.java
===================================================================
RCS file:
/home/cvs/avalon/logging/test/src/test/org/apache/avalon/logging/logkit/test/DefaultLoggingManagerTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultLoggingManagerTestCase.java 27 Feb 2004 22:39:36 -0000 1.2
+++ DefaultLoggingManagerTestCase.java 17 Mar 2004 10:30:08 -0000 1.3
@@ -17,10 +17,6 @@
package org.apache.avalon.logging.logkit.test;
-import java.io.File;
-import java.net.URL;
-import java.util.Map;
-
import junit.framework.TestCase;
import org.apache.avalon.framework.logger.Logger;
@@ -28,16 +24,6 @@
import org.apache.avalon.logging.LoggingManagerHelper;
import org.apache.avalon.logging.provider.LoggingManager;
import org.apache.avalon.logging.provider.LoggingException;
-
-import org.apache.avalon.repository.Artifact;
-import org.apache.avalon.repository.provider.Factory;
-import org.apache.avalon.repository.provider.InitialContext;
-import org.apache.avalon.repository.provider.Builder;
-import org.apache.avalon.repository.main.DefaultInitialContext;
-import org.apache.avalon.repository.main.DefaultBuilder;
-
-import org.apache.avalon.util.env.Env;
-import org.apache.avalon.util.exception.ExceptionHelper;
/**
*
1.2 +1 -2
avalon/merlin/activation/api/src/java/org/apache/avalon/activation/Appliance.java
Index: Appliance.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/api/src/java/org/apache/avalon/activation/Appliance.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Appliance.java 10 Feb 2004 16:18:42 -0000 1.1
+++ Appliance.java 17 Mar 2004 10:30:09 -0000 1.2
@@ -18,7 +18,6 @@
package org.apache.avalon.activation;
import org.apache.avalon.composition.model.Commissionable;
-import org.apache.avalon.composition.model.DeploymentModel;
import org.apache.avalon.composition.model.Resolver;
/**
1.2 +1 -3
avalon/merlin/activation/api/src/java/org/apache/avalon/activation/ComponentFactory.java
Index: ComponentFactory.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/api/src/java/org/apache/avalon/activation/ComponentFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ComponentFactory.java 10 Feb 2004 16:18:42 -0000 1.1
+++ ComponentFactory.java 17 Mar 2004 10:30:09 -0000 1.2
@@ -17,8 +17,6 @@
package org.apache.avalon.activation;
-import org.apache.avalon.composition.model.DeploymentModel;
-
/**
* A factory that provides object instantiation. A instance factory will
* typically encapsulate component constuction semantic, lifecycle processing
1.3 +0 -2
avalon/logging/api/src/test/org/apache/avalon/logging/data/test/CategoriesDirectiveTestCase.java
Index: CategoriesDirectiveTestCase.java
===================================================================
RCS file:
/home/cvs/avalon/logging/api/src/test/org/apache/avalon/logging/data/test/CategoriesDirectiveTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CategoriesDirectiveTestCase.java 24 Feb 2004 21:55:38 -0000 1.2
+++ CategoriesDirectiveTestCase.java 17 Mar 2004 10:30:09 -0000 1.3
@@ -17,8 +17,6 @@
package org.apache.avalon.logging.data.test;
-import junit.framework.TestCase;
-
import org.apache.avalon.logging.data.CategoryDirective;
import org.apache.avalon.logging.data.CategoriesDirective;
1.5 +1 -2
avalon/logging/logkit/plugins/socket/src/java/org/apache/avalon/logging/logkit/factory/socket/SocketTargetFactory.java
Index: SocketTargetFactory.java
===================================================================
RCS file:
/home/cvs/avalon/logging/logkit/plugins/socket/src/java/org/apache/avalon/logging/logkit/factory/socket/SocketTargetFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SocketTargetFactory.java 8 Mar 2004 11:32:01 -0000 1.4
+++ SocketTargetFactory.java 17 Mar 2004 10:30:09 -0000 1.5
@@ -17,7 +17,6 @@
package org.apache.avalon.logging.logkit.factory.socket;
-import java.io.IOException;
import java.net.InetAddress;
import java.net.UnknownHostException;
1.5 +1 -6
avalon/logging/logkit/plugins/datagram/src/java/org/apache/avalon/logging/logkit/factory/datagram/DatagramTargetFactory.java
Index: DatagramTargetFactory.java
===================================================================
RCS file:
/home/cvs/avalon/logging/logkit/plugins/datagram/src/java/org/apache/avalon/logging/logkit/factory/datagram/DatagramTargetFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DatagramTargetFactory.java 8 Mar 2004 11:32:01 -0000 1.4
+++ DatagramTargetFactory.java 17 Mar 2004 10:30:09 -0000 1.5
@@ -20,8 +20,6 @@
import java.io.IOException;
import java.net.InetAddress;
import java.net.UnknownHostException;
-import java.util.Map;
-import java.util.HashMap;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -34,10 +32,7 @@
import org.apache.avalon.util.i18n.Resources;
import org.apache.log.LogTarget;
-import org.apache.log.format.ExtendedPatternFormatter;
import org.apache.log.format.Formatter;
-import org.apache.log.format.PatternFormatter;
-import org.apache.log.format.RawFormatter;
import org.apache.log.output.net.DatagramOutputTarget;
/**
1.3 +1 -7
avalon/logging/test/src/test/org/apache/avalon/logging/LoggingManagerHelper.java
Index: LoggingManagerHelper.java
===================================================================
RCS file:
/home/cvs/avalon/logging/test/src/test/org/apache/avalon/logging/LoggingManagerHelper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LoggingManagerHelper.java 4 Mar 2004 03:38:21 -0000 1.2
+++ LoggingManagerHelper.java 17 Mar 2004 10:30:09 -0000 1.3
@@ -18,13 +18,8 @@
package org.apache.avalon.logging;
import java.io.File;
-import java.net.URL;
import java.util.Map;
-import junit.framework.TestCase;
-
-import org.apache.avalon.framework.logger.Logger;
-
import org.apache.avalon.logging.provider.LoggingManager;
import org.apache.avalon.repository.Artifact;
@@ -32,7 +27,6 @@
import org.apache.avalon.repository.provider.InitialContext;
import org.apache.avalon.repository.provider.Builder;
import org.apache.avalon.repository.main.DefaultInitialContextFactory;
-import org.apache.avalon.repository.main.DefaultBuilder;
import org.apache.avalon.util.env.Env;
import org.apache.avalon.util.exception.ExceptionHelper;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
