donaldp 2002/08/16 19:24:25
Modified: src/java/org/apache/avalon/cornerstone/blocks/connection
Connection.java DefaultConnectionManager.java
src/java/org/apache/avalon/cornerstone/blocks/datasource
DefaultDataSourceSelector.java
src/java/org/apache/avalon/cornerstone/blocks/masterstore
RepositoryManager.java
src/java/org/apache/avalon/cornerstone/blocks/scheduler
DefaultTimeScheduler.java
src/java/org/apache/avalon/cornerstone/blocks/sockets
DefaultServerSocketFactory.java
DefaultSocketFactory.java DefaultSocketManager.java
TLSServerSocketFactory.java TLSSocketFactory.java
src/java/org/apache/avalon/cornerstone/blocks/threads
DefaultThreadManager.java
Log:
Revert some changes that were -1'ed.
Revision Changes Path
1.19 +2 -3
jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/connection/Connection.java
Index: Connection.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/connection/Connection.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Connection.java 5 Aug 2002 14:12:13 -0000 1.18
+++ Connection.java 17 Aug 2002 02:24:24 -0000 1.19
@@ -17,7 +17,6 @@
import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
import org.apache.avalon.cornerstone.services.connection.ConnectionHandlerFactory;
import org.apache.avalon.excalibur.thread.ThreadPool;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
/**
@@ -28,7 +27,7 @@
*/
class Connection
extends AbstractLogEnabled
- implements Component, Runnable
+ implements Runnable
{
private final ServerSocket m_serverSocket;
private final ConnectionHandlerFactory m_handlerFactory;
@@ -121,7 +120,7 @@
class ConnectionRunner
extends AbstractLogEnabled
- implements Runnable, Component
+ implements Runnable
{
private Socket m_socket;
private Thread m_thread;
1.22 +1 -2
jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/connection/DefaultConnectionManager.java
Index: DefaultConnectionManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/connection/DefaultConnectionManager.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- DefaultConnectionManager.java 16 Aug 2002 04:14:31 -0000 1.21
+++ DefaultConnectionManager.java 17 Aug 2002 02:24:24 -0000 1.22
@@ -18,7 +18,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.Component; // backward compatibility
/**
* This is the service through which ConnectionManagement occurs.
@@ -30,7 +29,7 @@
*/
public class DefaultConnectionManager
extends AbstractLogEnabled
- implements ConnectionManager, Serviceable, Disposable, Component
+ implements ConnectionManager, Serviceable, Disposable
{
private final HashMap m_connections = new HashMap();
private ThreadManager m_threadManager;
1.23 +1 -1
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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- DefaultDataSourceSelector.java 16 Aug 2002 04:14:31 -0000 1.22
+++ DefaultDataSourceSelector.java 17 Aug 2002 02:24:24 -0000 1.23
@@ -48,7 +48,7 @@
*/
public class DefaultDataSourceSelector
extends AbstractLogEnabled
- implements DataSourceSelector, Configurable, Initializable, Disposable,
Component
+ implements DataSourceSelector, Configurable, Initializable, Disposable
{
private Configuration m_configuration;
private Map m_dataSources;
1.10 +1 -1
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- RepositoryManager.java 16 Aug 2002 04:14:32 -0000 1.9
+++ RepositoryManager.java 17 Aug 2002 02:24:24 -0000 1.10
@@ -32,7 +32,7 @@
*/
public class RepositoryManager
extends AbstractLogEnabled
- implements Store, Contextualizable, Composable, Configurable, Component
+ implements Store, Contextualizable, Composable, Configurable
{
private static final String REPOSITORY_NAME = "Repository";
private static long id = 0;
1.21 +1 -2
jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/scheduler/DefaultTimeScheduler.java
Index: DefaultTimeScheduler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/scheduler/DefaultTimeScheduler.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- DefaultTimeScheduler.java 16 Aug 2002 04:14:32 -0000 1.20
+++ DefaultTimeScheduler.java 17 Aug 2002 02:24:25 -0000 1.21
@@ -19,7 +19,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.Component; // for backward
compatibility
/**
* Default implementation of TimeScheduler service.
@@ -32,7 +31,7 @@
*/
public class DefaultTimeScheduler
extends AbstractLogEnabled
- implements TimeScheduler, Serviceable, Startable, Disposable, Runnable,
Component
+ implements TimeScheduler, Serviceable, Startable, Disposable, Runnable
{
private final Hashtable m_entries = new Hashtable();
private final PriorityQueue m_priorityQueue =
1.8 +1 -2
jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/sockets/DefaultServerSocketFactory.java
Index: DefaultServerSocketFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/sockets/DefaultServerSocketFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultServerSocketFactory.java 16 Aug 2002 04:14:32 -0000 1.7
+++ DefaultServerSocketFactory.java 17 Aug 2002 02:24:25 -0000 1.8
@@ -11,7 +11,6 @@
import java.net.InetAddress;
import java.net.ServerSocket;
import org.apache.avalon.cornerstone.services.sockets.ServerSocketFactory;
-import org.apache.avalon.framework.component.Component;
/**
* Factory implementation for vanilla TCP sockets.
@@ -20,7 +19,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Federico Barbieri</a>
*/
public class DefaultServerSocketFactory
- implements ServerSocketFactory, Component
+ implements ServerSocketFactory
{
/**
* Creates a socket on specified port.
1.6 +1 -2
jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/sockets/DefaultSocketFactory.java
Index: DefaultSocketFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/sockets/DefaultSocketFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultSocketFactory.java 16 Aug 2002 04:14:32 -0000 1.5
+++ DefaultSocketFactory.java 17 Aug 2002 02:24:25 -0000 1.6
@@ -11,7 +11,6 @@
import java.net.InetAddress;
import java.net.Socket;
import org.apache.avalon.cornerstone.services.sockets.SocketFactory;
-import org.apache.avalon.framework.component.Component;
/**
* The vanilla implementation of SocketFactory.
@@ -19,7 +18,7 @@
* @author <a href="mailto:peter at apache.org">Peter Donald</a>
*/
public class DefaultSocketFactory
- implements SocketFactory, Component
+ implements SocketFactory
{
/**
* Create a socket and connect to remote address specified.
1.14 +1 -2
jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/sockets/DefaultSocketManager.java
Index: DefaultSocketManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/sockets/DefaultSocketManager.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DefaultSocketManager.java 16 Aug 2002 04:14:32 -0000 1.13
+++ DefaultSocketManager.java 17 Aug 2002 02:24:25 -0000 1.14
@@ -16,7 +16,6 @@
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.component.Component; // backward compatibility
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.Contextualizable;
@@ -33,7 +32,7 @@
*/
public class DefaultSocketManager
extends AbstractLogEnabled
- implements SocketManager, Contextualizable, Configurable, Initializable,
Component
+ implements SocketManager, Contextualizable, Configurable, Initializable
{
protected final HashMap m_serverSockets = new HashMap();
protected final HashMap m_sockets = new HashMap();
1.12 +1 -2
jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/sockets/TLSServerSocketFactory.java
Index: TLSServerSocketFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/sockets/TLSServerSocketFactory.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TLSServerSocketFactory.java 16 Aug 2002 04:14:32 -0000 1.11
+++ TLSServerSocketFactory.java 17 Aug 2002 02:24:25 -0000 1.12
@@ -26,7 +26,6 @@
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.component.Component;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.phoenix.BlockContext;
@@ -43,7 +42,7 @@
*/
public class TLSServerSocketFactory
extends AbstractLogEnabled
- implements ServerSocketFactory, Contextualizable, Configurable, Initializable,
Component
+ implements ServerSocketFactory, Contextualizable, Configurable, Initializable
{
protected SSLServerSocketFactory m_factory;
protected File m_baseDirectory;
1.5 +1 -2
jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/sockets/TLSSocketFactory.java
Index: TLSSocketFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/sockets/TLSSocketFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TLSSocketFactory.java 16 Aug 2002 04:14:32 -0000 1.4
+++ TLSSocketFactory.java 17 Aug 2002 02:24:25 -0000 1.5
@@ -28,7 +28,6 @@
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.component.Component; // for backward
compatibility
import org.apache.avalon.phoenix.BlockContext;
/**
@@ -44,7 +43,7 @@
*/
public class TLSSocketFactory
extends AbstractLogEnabled
- implements SocketFactory, Contextualizable, Configurable, Initializable,
Component
+ implements SocketFactory, Contextualizable, Configurable, Initializable
{
private SSLSocketFactory m_factory;
1.15 +1 -2
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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DefaultThreadManager.java 16 Aug 2002 04:14:32 -0000 1.14
+++ DefaultThreadManager.java 17 Aug 2002 02:24:25 -0000 1.15
@@ -15,7 +15,6 @@
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.component.Component; // backward compatibility
import org.apache.avalon.framework.logger.AbstractLogEnabled;
/**
@@ -28,7 +27,7 @@
*/
public class DefaultThreadManager
extends AbstractLogEnabled
- implements ThreadManager, Configurable, Component
+ implements ThreadManager, Configurable
{
///Map of thread pools for application
private HashMap m_threadPools = new HashMap();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
