donaldp 2002/10/01 18:52:16
Modified: src/java/org/apache/avalon/cornerstone/blocks/channels
DefaultServerChannelFactory.java
src/java/org/apache/avalon/cornerstone/blocks/datasource
DefaultDataSourceSelector.java
src/java/org/apache/avalon/cornerstone/blocks/masterstore
AbstractFileRepository.java RepositoryManager.java
src/java/org/apache/avalon/cornerstone/blocks/soapification/glue
Glue.java
src/java/org/apache/avalon/cornerstone/blocks/threads
DefaultThreadManager.java
src/java/org/apache/avalon/cornerstone/blocks/transport/autopublishing
AutoPublisher.java
src/java/org/apache/avalon/cornerstone/blocks/transport/publishing
AbstractPublisher.java
src/java/org/apache/avalon/cornerstone/services/channels
ServerChannelFactory.java
src/java/org/apache/avalon/cornerstone/services/connection
AbstractService.java AdaptingComponentManager.java
Log:
cleanup imports and code using idea
Revision Changes Path
1.2 +0 -2
jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/channels/DefaultServerChannelFactory.java
Index: DefaultServerChannelFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/channels/DefaultServerChannelFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultServerChannelFactory.java 13 Jul 2002 06:47:14 -0000 1.1
+++ DefaultServerChannelFactory.java 2 Oct 2002 01:52:15 -0000 1.2
@@ -9,8 +9,6 @@
import java.io.IOException;
import java.net.InetSocketAddress;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.Selector;
import java.nio.channels.ServerSocketChannel;
import org.apache.avalon.cornerstone.services.channels.ServerChannelFactory;
1.25 +3 -3
jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/datasource/DefaultDataSourceSelector.java
Index: DefaultDataSourceSelector.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/datasource/DefaultDataSourceSelector.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- DefaultDataSourceSelector.java 10 Sep 2002 10:24:28 -0000 1.24
+++ DefaultDataSourceSelector.java 2 Oct 2002 01:52:15 -0000 1.25
@@ -18,11 +18,11 @@
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.LogEnabled;
-import org.apache.avalon.framework.context.Contextualizable;
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.avalon.framework.logger.LogEnabled;
import org.apache.avalon.phoenix.BlockContext;
/**
1.9 +3 -3
jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/masterstore/AbstractFileRepository.java
Index: AbstractFileRepository.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/masterstore/AbstractFileRepository.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractFileRepository.java 24 Sep 2002 12:16:56 -0000 1.8
+++ AbstractFileRepository.java 2 Oct 2002 01:52:16 -0000 1.9
@@ -19,15 +19,15 @@
import org.apache.avalon.cornerstone.services.store.Repository;
import org.apache.avalon.excalibur.io.ExtensionFileFilter;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.Serviceable;
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.context.Context;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.phoenix.BlockContext;
/**
1.12 +4 -5
jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/masterstore/RepositoryManager.java
Index: RepositoryManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/masterstore/RepositoryManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- RepositoryManager.java 24 Sep 2002 12:16:56 -0000 1.11
+++ RepositoryManager.java 2 Oct 2002 01:52:16 -0000 1.12
@@ -12,17 +12,16 @@
import java.util.HashMap;
import org.apache.avalon.cornerstone.services.store.Repository;
import org.apache.avalon.cornerstone.services.store.Store;
-import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.Serviceable;
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.container.ContainerUtil;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.container.ContainerUtil;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
/**
* @phoenix:block
1.16 +1 -1
jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/soapification/glue/Glue.java
Index: Glue.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/soapification/glue/Glue.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Glue.java 1 Sep 2002 20:31:09 -0000 1.15
+++ Glue.java 2 Oct 2002 01:52:16 -0000 1.16
@@ -13,12 +13,12 @@
import java.io.IOException;
import org.apache.avalon.cornerstone.services.soapification.SOAPification;
import
org.apache.avalon.cornerstone.services.soapification.SOAPificationException;
+import org.apache.avalon.framework.CascadingRuntimeException;
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.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.CascadingRuntimeException;
/**
* Default implementation of SOAPification service.
1.18 +1 -1
jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/threads/DefaultThreadManager.java
Index: DefaultThreadManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/threads/DefaultThreadManager.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- DefaultThreadManager.java 18 Aug 2002 02:51:56 -0000 1.17
+++ DefaultThreadManager.java 2 Oct 2002 01:52:16 -0000 1.18
@@ -9,13 +9,13 @@
import java.util.HashMap;
import org.apache.avalon.cornerstone.services.threads.ThreadManager;
-import org.apache.excalibur.threadcontext.ThreadContext;
import org.apache.avalon.excalibur.thread.ThreadPool;
import org.apache.avalon.excalibur.thread.impl.DefaultThreadPool;
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.logger.AbstractLogEnabled;
+import org.apache.excalibur.threadcontext.ThreadContext;
/**
* Default implementation of ThreadManager.
1.15 +2 -2
jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/transport/autopublishing/AutoPublisher.java
Index: AutoPublisher.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/transport/autopublishing/AutoPublisher.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AutoPublisher.java 5 Sep 2002 21:15:46 -0000 1.14
+++ AutoPublisher.java 2 Oct 2002 01:52:16 -0000 1.15
@@ -11,10 +11,10 @@
import java.util.Map;
import java.util.Vector;
import org.apache.avalon.framework.CascadingRuntimeException;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
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.logger.AbstractLogEnabled;
import org.apache.avalon.phoenix.ApplicationEvent;
import org.apache.avalon.phoenix.ApplicationListener;
import org.apache.avalon.phoenix.BlockEvent;
1.21 +5 -5
jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/transport/publishing/AbstractPublisher.java
Index: AbstractPublisher.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/transport/publishing/AbstractPublisher.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- AbstractPublisher.java 5 Sep 2002 21:15:46 -0000 1.20
+++ AbstractPublisher.java 2 Oct 2002 01:52:16 -0000 1.21
@@ -20,9 +20,9 @@
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.service.Serviceable;
-import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.phoenix.BlockContext;
import org.apache.excalibur.altrmi.common.MethodRequest;
import org.apache.excalibur.altrmi.server.AltrmiAuthenticator;
@@ -32,10 +32,10 @@
import org.apache.excalibur.altrmi.server.PublicationDescription;
import org.apache.excalibur.altrmi.server.PublicationException;
import org.apache.excalibur.altrmi.server.impl.AbstractServer;
-import
org.apache.excalibur.altrmi.server.impl.classretrievers.JarFileClassRetriever;
-import
org.apache.excalibur.altrmi.server.impl.classretrievers.NoClassRetriever;
import
org.apache.excalibur.altrmi.server.impl.classretrievers.AbstractDynamicGeneratorClassRetriever;
import
org.apache.excalibur.altrmi.server.impl.classretrievers.BcelDynamicGeneratorClassRetriever;
+import
org.apache.excalibur.altrmi.server.impl.classretrievers.JarFileClassRetriever;
+import
org.apache.excalibur.altrmi.server.impl.classretrievers.NoClassRetriever;
/**
* Abstract Publisher.
1.2 +0 -1
jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/services/channels/ServerChannelFactory.java
Index: ServerChannelFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/services/channels/ServerChannelFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServerChannelFactory.java 13 Jul 2002 06:47:14 -0000 1.1
+++ ServerChannelFactory.java 2 Oct 2002 01:52:16 -0000 1.2
@@ -9,7 +9,6 @@
import java.io.IOException;
import java.net.InetSocketAddress;
-import java.nio.channels.Selector;
import java.nio.channels.ServerSocketChannel;
/**
1.14 +1 -1
jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/services/connection/AbstractService.java
Index: AbstractService.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/services/connection/AbstractService.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- AbstractService.java 5 Aug 2002 14:12:14 -0000 1.13
+++ AbstractService.java 2 Oct 2002 01:52:16 -0000 1.14
@@ -16,6 +16,7 @@
import org.apache.avalon.excalibur.thread.ThreadPool;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -28,7 +29,6 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
-import org.apache.avalon.framework.component.ComponentException;
/**
* Helper class to create protocol services.
1.4 +2 -2
jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/services/connection/AdaptingComponentManager.java
Index: AdaptingComponentManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/services/connection/AdaptingComponentManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AdaptingComponentManager.java 16 Aug 2002 04:14:32 -0000 1.3
+++ AdaptingComponentManager.java 2 Oct 2002 01:52:16 -0000 1.4
@@ -10,8 +10,8 @@
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
/**
* A simple component manager that adapts from a [EMAIL PROTECTED]
ServiceManager}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
