You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@avalon.apache.org by do...@apache.org on 2001/04/19 04:32:20 UTC
cvs commit: jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/store Repository.java Store.java
donaldp 01/04/18 19:32:20
Modified: lib avalonapi.jar phoenix-client.jar
src/java/org/apache/cornerstone/blocks/connection
Connection.java DefaultConnectionManager.java
src/java/org/apache/cornerstone/blocks/datasource
DefaultDataSourceSelector.java
src/java/org/apache/cornerstone/blocks/masterstore
AbstractFileRepository.java RepositoryManager.java
src/java/org/apache/cornerstone/blocks/packet Acceptor.java
DefaultPacketManager.java
src/java/org/apache/cornerstone/blocks/scheduler
DefaultTimeScheduler.java
src/java/org/apache/cornerstone/blocks/sockets
DefaultServerSocketFactory.java
DefaultSocketManager.java
TLSServerSocketFactory.java
src/java/org/apache/cornerstone/demos/helloworldserver
HelloWorldHandler.java HelloWorldServerImpl.java
src/java/org/apache/cornerstone/demos/httpproxy
AbstractHttpProxyServer.java HttpProxyHandler.java
src/java/org/apache/cornerstone/demos/simpleserver
SimpleServer.java
src/java/org/apache/cornerstone/demos/xcommander
XCommanderHandler.java XCommanderServer.java
src/java/org/apache/cornerstone/services/connection
AbstractHandlerFactory.java AbstractService.java
ConnectionHandler.java
src/java/org/apache/cornerstone/services/datasource
DataSourceSelector.java
src/java/org/apache/cornerstone/services/packet
PacketHandler.java
src/java/org/apache/cornerstone/services/scheduler
Target.java
src/java/org/apache/cornerstone/services/sockets
ServerSocketFactory.java SocketFactory.java
SocketManager.java
src/java/org/apache/cornerstone/services/store
Repository.java Store.java
Log:
Update to latest avalonapi.
Revision Changes Path
1.13 +436 -429 jakarta-avalon-cornerstone/lib/avalonapi.jar
<<Binary file>>
1.3 +16 -22 jakarta-avalon-cornerstone/lib/phoenix-client.jar
<<Binary file>>
1.4 +3 -3 jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/connection/Connection.java
Index: Connection.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/connection/Connection.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Connection.java 2001/04/17 03:11:33 1.3
+++ Connection.java 2001/04/19 02:32:06 1.4
@@ -12,11 +12,11 @@
import java.net.Socket;
import java.util.ArrayList;
import java.util.Iterator;
-import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.Component;
-import org.apache.excalibur.thread.ThreadPool;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.logger.AbstractLoggable;
import org.apache.cornerstone.services.connection.ConnectionHandler;
import org.apache.cornerstone.services.connection.ConnectionHandlerFactory;
+import org.apache.excalibur.thread.ThreadPool;
/**
* Support class for the DefaultConnectionManager.
1.4 +4 -4 jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/connection/DefaultConnectionManager.java
Index: DefaultConnectionManager.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/connection/DefaultConnectionManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultConnectionManager.java 2001/04/17 03:11:33 1.3
+++ DefaultConnectionManager.java 2001/04/19 02:32:06 1.4
@@ -12,14 +12,14 @@
import java.net.Socket;
import java.util.HashMap;
import java.util.Iterator;
-import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.Context;
-import org.apache.avalon.Contextualizable;
import org.apache.avalon.Disposable;
-import org.apache.excalibur.thread.ThreadPool;
+import org.apache.avalon.context.Context;
+import org.apache.avalon.context.Contextualizable;
+import org.apache.avalon.logger.AbstractLoggable;
import org.apache.cornerstone.services.connection.ConnectionHandler;
import org.apache.cornerstone.services.connection.ConnectionHandlerFactory;
import org.apache.cornerstone.services.connection.ConnectionManager;
+import org.apache.excalibur.thread.ThreadPool;
import org.apache.phoenix.Block;
import org.apache.phoenix.BlockContext;
1.4 +3 -3 jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/datasource/DefaultDataSourceSelector.java
Index: DefaultDataSourceSelector.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/datasource/DefaultDataSourceSelector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultDataSourceSelector.java 2001/04/17 03:11:34 1.3
+++ DefaultDataSourceSelector.java 2001/04/19 02:32:06 1.4
@@ -10,15 +10,15 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.Component;
import org.apache.avalon.Disposable;
import org.apache.avalon.Initializable;
+import org.apache.avalon.component.Component;
import org.apache.avalon.component.ComponentException;
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
-import org.apache.excalibur.datasource.DataSourceComponent;
+import org.apache.avalon.logger.AbstractLoggable;
import org.apache.cornerstone.services.datasource.DataSourceSelector;
+import org.apache.excalibur.datasource.DataSourceComponent;
import org.apache.phoenix.Block;
/**
1.7 +9 -9 jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/masterstore/AbstractFileRepository.java
Index: AbstractFileRepository.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/masterstore/AbstractFileRepository.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractFileRepository.java 2001/04/17 03:11:35 1.6
+++ AbstractFileRepository.java 2001/04/19 02:32:07 1.7
@@ -17,19 +17,19 @@
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Iterator;
-import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.ComponentManagerException;
-import org.apache.avalon.Composer;
-import org.apache.avalon.Context;
-import org.apache.avalon.Contextualizable;
import org.apache.avalon.Initializable;
import org.apache.avalon.component.ComponentException;
+import org.apache.avalon.component.ComponentException;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.component.Composable;
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.excalibur.io.ExtensionFileFilter;
+import org.apache.avalon.context.Context;
+import org.apache.avalon.context.Contextualizable;
+import org.apache.avalon.logger.AbstractLoggable;
import org.apache.cornerstone.services.store.Repository;
+import org.apache.excalibur.io.ExtensionFileFilter;
import org.apache.phoenix.Block;
import org.apache.phoenix.BlockContext;
@@ -41,7 +41,7 @@
*/
public abstract class AbstractFileRepository
extends AbstractLoggable
- implements Block, Repository, Contextualizable, Composer, Configurable, Initializable
+ implements Block, Repository, Contextualizable, Composable, Configurable, Initializable
{
protected static final boolean DEBUG = false;
@@ -143,7 +143,7 @@
}
try { child.compose( m_componentManager ); }
- catch( final ComponentManagerException cme )
+ catch( final ComponentException cme )
{
throw new RuntimeException( "Cannot compose child " +
"repository " + childName +
1.6 +9 -9 jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/masterstore/RepositoryManager.java
Index: RepositoryManager.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/masterstore/RepositoryManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RepositoryManager.java 2001/04/16 09:51:55 1.5
+++ RepositoryManager.java 2001/04/19 02:32:07 1.6
@@ -11,17 +11,17 @@
import java.net.URL;
import java.util.HashMap;
import java.util.Iterator;
-import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.Component;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.Composer;
-import org.apache.avalon.Context;
-import org.apache.avalon.Contextualizable;
import org.apache.avalon.Initializable;
+import org.apache.avalon.component.Component;
import org.apache.avalon.component.ComponentException;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.component.Composable;
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
+import org.apache.avalon.context.Context;
+import org.apache.avalon.context.Contextualizable;
+import org.apache.avalon.logger.AbstractLoggable;
import org.apache.cornerstone.services.store.Repository;
import org.apache.cornerstone.services.store.Store;
import org.apache.phoenix.Block;
@@ -32,7 +32,7 @@
*/
public class RepositoryManager
extends AbstractLoggable
- implements Block, Store, Contextualizable, Composer, Configurable
+ implements Block, Store, Contextualizable, Composable, Configurable
{
private static final String REPOSITORY_NAME = "Repository";
private static long id = 0;
@@ -168,9 +168,9 @@
((Contextualizable)reply).contextualize( m_context );
}
- if( reply instanceof Composer )
+ if( reply instanceof Composable )
{
- ((Composer)reply).compose( m_componentManager );
+ ((Composable)reply).compose( m_componentManager );
}
if( reply instanceof Configurable )
1.4 +3 -3 jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/packet/Acceptor.java
Index: Acceptor.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/packet/Acceptor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Acceptor.java 2001/04/17 03:11:38 1.3
+++ Acceptor.java 2001/04/19 02:32:08 1.4
@@ -12,11 +12,11 @@
import java.net.DatagramSocket;
import java.util.ArrayList;
import java.util.Iterator;
-import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.Component;
-import org.apache.excalibur.thread.ThreadPool;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.logger.AbstractLoggable;
import org.apache.cornerstone.services.packet.PacketHandler;
import org.apache.cornerstone.services.packet.PacketHandlerFactory;
+import org.apache.excalibur.thread.ThreadPool;
/**
* Support class for the DefaultPacketManager.
1.3 +4 -4 jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/packet/DefaultPacketManager.java
Index: DefaultPacketManager.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/packet/DefaultPacketManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultPacketManager.java 2001/04/17 03:11:39 1.2
+++ DefaultPacketManager.java 2001/04/19 02:32:08 1.3
@@ -11,14 +11,14 @@
import java.net.DatagramSocket;
import java.util.HashMap;
import java.util.Iterator;
-import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.Context;
-import org.apache.avalon.Contextualizable;
import org.apache.avalon.Disposable;
-import org.apache.excalibur.thread.ThreadPool;
+import org.apache.avalon.context.Context;
+import org.apache.avalon.context.Contextualizable;
+import org.apache.avalon.logger.AbstractLoggable;
import org.apache.cornerstone.services.packet.PacketHandler;
import org.apache.cornerstone.services.packet.PacketHandlerFactory;
import org.apache.cornerstone.services.packet.PacketManager;
+import org.apache.excalibur.thread.ThreadPool;
import org.apache.phoenix.Block;
import org.apache.phoenix.BlockContext;
1.7 +4 -4 jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/scheduler/DefaultTimeScheduler.java
Index: DefaultTimeScheduler.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/scheduler/DefaultTimeScheduler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultTimeScheduler.java 2001/04/17 03:11:40 1.6
+++ DefaultTimeScheduler.java 2001/04/19 02:32:09 1.7
@@ -9,18 +9,18 @@
import java.util.Hashtable;
import java.util.NoSuchElementException;
-import org.apache.avalon.AbstractLoggable;
import org.apache.avalon.Disposable;
import org.apache.avalon.Initializable;
import org.apache.avalon.Startable;
import org.apache.avalon.Stoppable;
+import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.cornerstone.services.scheduler.Target;
+import org.apache.cornerstone.services.scheduler.TimeScheduler;
+import org.apache.cornerstone.services.scheduler.TimeTrigger;
import org.apache.excalibur.collections.BinaryHeap;
import org.apache.excalibur.collections.PriorityQueue;
import org.apache.excalibur.collections.SynchronizedPriorityQueue;
import org.apache.excalibur.thread.ThreadContext;
-import org.apache.cornerstone.services.scheduler.Target;
-import org.apache.cornerstone.services.scheduler.TimeScheduler;
-import org.apache.cornerstone.services.scheduler.TimeTrigger;
import org.apache.log.Logger;
import org.apache.phoenix.Block;
1.3 +1 -1 jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/sockets/DefaultServerSocketFactory.java
Index: DefaultServerSocketFactory.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/sockets/DefaultServerSocketFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultServerSocketFactory.java 2001/04/17 03:11:43 1.2
+++ DefaultServerSocketFactory.java 2001/04/19 02:32:09 1.3
@@ -10,7 +10,7 @@
import java.io.IOException;
import java.net.InetAddress;
import java.net.ServerSocket;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Component;
import org.apache.cornerstone.services.sockets.ServerSocketFactory;
/**
1.5 +4 -4 jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/sockets/DefaultSocketManager.java
Index: DefaultSocketManager.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/sockets/DefaultSocketManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultSocketManager.java 2001/04/17 03:11:44 1.4
+++ DefaultSocketManager.java 2001/04/19 02:32:09 1.5
@@ -9,15 +9,15 @@
import java.util.HashMap;
import java.util.Iterator;
-import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.Component;
-import org.apache.avalon.Context;
-import org.apache.avalon.Contextualizable;
import org.apache.avalon.Initializable;
+import org.apache.avalon.component.Component;
import org.apache.avalon.component.ComponentException;
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
+import org.apache.avalon.context.Context;
+import org.apache.avalon.context.Contextualizable;
+import org.apache.avalon.logger.AbstractLoggable;
import org.apache.cornerstone.services.sockets.ServerSocketFactory;
import org.apache.cornerstone.services.sockets.SocketFactory;
import org.apache.cornerstone.services.sockets.SocketManager;
1.3 +4 -4 jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/sockets/TLSServerSocketFactory.java
Index: TLSServerSocketFactory.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/sockets/TLSServerSocketFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TLSServerSocketFactory.java 2001/04/17 03:11:44 1.2
+++ TLSServerSocketFactory.java 2001/04/19 02:32:09 1.3
@@ -18,14 +18,14 @@
import javax.net.ssl.SSLServerSocket;
import javax.net.ssl.SSLServerSocketFactory;
import javax.security.cert.X509Certificate;
-import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.Component;
-import org.apache.avalon.Context;
-import org.apache.avalon.Contextualizable;
import org.apache.avalon.Initializable;
+import org.apache.avalon.component.Component;
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
+import org.apache.avalon.context.Context;
+import org.apache.avalon.context.Contextualizable;
+import org.apache.avalon.logger.AbstractLoggable;
import org.apache.cornerstone.services.sockets.ServerSocketFactory;
import org.apache.phoenix.BlockContext;
1.3 +2 -2 jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/helloworldserver/HelloWorldHandler.java
Index: HelloWorldHandler.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/helloworldserver/HelloWorldHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HelloWorldHandler.java 2001/04/17 03:11:47 1.2
+++ HelloWorldHandler.java 2001/04/19 02:32:11 1.3
@@ -12,8 +12,8 @@
import java.io.PrintWriter;
import java.net.Socket;
import java.net.SocketException;
-import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.logger.AbstractLoggable;
import org.apache.cornerstone.services.connection.ConnectionHandler;
/**
1.3 +8 -8 jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/helloworldserver/HelloWorldServerImpl.java
Index: HelloWorldServerImpl.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/helloworldserver/HelloWorldServerImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HelloWorldServerImpl.java 2001/04/17 03:11:47 1.2
+++ HelloWorldServerImpl.java 2001/04/19 02:32:11 1.3
@@ -10,16 +10,16 @@
import java.net.InetAddress;
import java.net.ServerSocket;
import java.net.UnknownHostException;
-import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.ComponentManagerException;
-import org.apache.avalon.Composer;
-import org.apache.avalon.Context;
-import org.apache.avalon.Contextualizable;
import org.apache.avalon.Initializable;
+import org.apache.avalon.component.ComponentException;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.component.Composable;
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
+import org.apache.avalon.context.Context;
+import org.apache.avalon.context.Contextualizable;
+import org.apache.avalon.logger.AbstractLoggable;
import org.apache.cornerstone.services.connection.ConnectionHandler;
import org.apache.cornerstone.services.connection.ConnectionHandlerFactory;
import org.apache.cornerstone.services.connection.ConnectionManager;
@@ -36,7 +36,7 @@
public class HelloWorldServerImpl
extends AbstractLoggable
implements Block, HelloWorldServer,
- Contextualizable, Composer, Configurable, Initializable, ConnectionHandlerFactory
+ Contextualizable, Composable, Configurable, Initializable, ConnectionHandlerFactory
{
protected SocketManager m_socketManager;
protected ConnectionManager m_connectionManager;
@@ -73,7 +73,7 @@
}
public void compose( final ComponentManager componentManager )
- throws ComponentManagerException
+ throws ComponentException
{
getLogger().info("HelloWorldServer.compose()");
1.3 +15 -15 jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/httpproxy/AbstractHttpProxyServer.java
Index: AbstractHttpProxyServer.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/httpproxy/AbstractHttpProxyServer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractHttpProxyServer.java 2001/04/17 03:11:49 1.2
+++ AbstractHttpProxyServer.java 2001/04/19 02:32:12 1.3
@@ -10,16 +10,16 @@
import java.net.InetAddress;
import java.net.ServerSocket;
import java.net.UnknownHostException;
-import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.ComponentManagerException;
-import org.apache.avalon.Composer;
-import org.apache.avalon.Context;
-import org.apache.avalon.Contextualizable;
import org.apache.avalon.Initializable;
+import org.apache.avalon.component.ComponentException;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.component.Composable;
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
+import org.apache.avalon.context.Context;
+import org.apache.avalon.context.Contextualizable;
+import org.apache.avalon.logger.AbstractLoggable;
import org.apache.cornerstone.services.connection.ConnectionHandler;
import org.apache.cornerstone.services.connection.ConnectionHandlerFactory;
import org.apache.cornerstone.services.connection.ConnectionManager;
@@ -35,7 +35,7 @@
*/
public abstract class AbstractHttpProxyServer
extends AbstractLoggable
- implements Block, Contextualizable, Composer, Configurable, Service,
+ implements Block, Contextualizable, Composable, Configurable, Service,
Initializable, ConnectionHandlerFactory
{
protected SocketManager m_socketManager;
@@ -62,12 +62,12 @@
{
m_port = configuration.getChild( "listen-port" ).getValueAsInt( 8000 );
- try
- {
+ try
+ {
final String bindAddress = configuration.getChild( "bind" ).getValue();
- m_bindTo = InetAddress.getByName( bindAddress );
+ m_bindTo = InetAddress.getByName( bindAddress );
}
- catch( final UnknownHostException unhe )
+ catch( final UnknownHostException unhe )
{
throw new ConfigurationException( "Malformed bind parameter", unhe );
}
@@ -76,8 +76,8 @@
m_forwardToAnotherProxy = forward.getValue("");
}
- public void compose( final ComponentManager componentManager )
- throws ComponentManagerException
+ public void compose( final ComponentManager componentManager )
+ throws ComponentException
{
getLogger().info( "HttpProxyServer-" + m_name + ".compose()" );
@@ -87,14 +87,14 @@
m_connectionManager = (ConnectionManager)componentManager.
lookup( "org.apache.cornerstone.services.connection.ConnectionManager" );
}
-
+
public void init()
throws Exception
{
final ServerSocketFactory factory =
m_socketManager.getServerSocketFactory( "plain" );
final ServerSocket serverSocket = factory.createServerSocket( m_port, 5, m_bindTo );
-
+
m_connectionManager.connect( "HttpProxyListener-" + m_name, serverSocket, this );
}
1.3 +2 -2 jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/httpproxy/HttpProxyHandler.java
Index: HttpProxyHandler.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/httpproxy/HttpProxyHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HttpProxyHandler.java 2001/04/17 03:11:52 1.2
+++ HttpProxyHandler.java 2001/04/19 02:32:12 1.3
@@ -12,8 +12,8 @@
import java.net.Socket;
import java.net.SocketException;
import java.net.UnknownHostException;
-import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.logger.AbstractLoggable;
import org.apache.cornerstone.services.connection.ConnectionHandler;
/**
1.4 +7 -7 jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/simpleserver/SimpleServer.java
Index: SimpleServer.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/simpleserver/SimpleServer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SimpleServer.java 2001/04/17 03:12:01 1.3
+++ SimpleServer.java 2001/04/19 02:32:13 1.4
@@ -14,15 +14,15 @@
import java.net.SocketException;
import java.util.Iterator;
import java.util.StringTokenizer;
-import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.Component;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.ComponentManagerException;
-import org.apache.avalon.Composer;
import org.apache.avalon.Initializable;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.component.ComponentException;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.component.Composable;
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
+import org.apache.avalon.logger.AbstractLoggable;
import org.apache.cornerstone.services.connection.ConnectionHandler;
import org.apache.cornerstone.services.connection.ConnectionHandlerFactory;
import org.apache.cornerstone.services.connection.ConnectionManager;
@@ -51,7 +51,7 @@
*/
public class SimpleServer
extends AbstractLoggable
- implements Block, SimpleService, Composer, Configurable, Initializable,
+ implements Block, SimpleService, Composable, Configurable, Initializable,
ConnectionHandlerFactory, ConnectionHandler, Target
{
protected TimeScheduler m_timeScheduler;
@@ -65,7 +65,7 @@
protected int m_count;
public void compose( final ComponentManager componentManager )
- throws ComponentManagerException
+ throws ComponentException
{
m_testStore =
(Store)componentManager.lookup( "org.apache.cornerstone.services.store.Store" );
1.2 +9 -9 jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/xcommander/XCommanderHandler.java
Index: XCommanderHandler.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/xcommander/XCommanderHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XCommanderHandler.java 2001/03/16 13:16:45 1.1
+++ XCommanderHandler.java 2001/04/19 02:32:13 1.2
@@ -16,9 +16,9 @@
import java.io.StringReader;
import java.net.Socket;
import java.net.SocketException;
-import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.Component;
import org.apache.avalon.Initializable;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.logger.AbstractLoggable;
import org.apache.cornerstone.services.connection.ConnectionHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -66,21 +66,21 @@
}
}
- public void handleCommand( String type, String identifier, Object result )
+ public void handleCommand( String type, String identifier, Object result )
{
if(result instanceof GlobalResult)
{
System.out.println( "Sending result " + result + " to main server." );
m_parent.handleCommand( type, identifier, result );
- }
+ }
else
{
- getLogger().info( "handling command: " + identifier +
+ getLogger().info( "handling command: " + identifier +
" - sending results: " + result.toString() );
if( m_out != null )
{
String results = "<?xml version=\"1.0\" ?>\n";
- results +=
+ results +=
"<results type=\"" + type + "\" identifier=\"" + identifier + "\">\n";
results += result.toString() + "\n</results>";
@@ -108,7 +108,7 @@
{
getLogger().warn( "Exception on socket: " + e.getMessage(), e );
}
- }
+ }
else
{
getLogger().info( "Exception: Socket not available." );
@@ -162,7 +162,7 @@
{
streamResult = m_in.read( buf, 0, 1 );
inputLine += buf[0];
- }
+ }
while( buf[0] != '\u0000' );
inputLine = inputLine.substring(0,(inputLine.length()-1));
@@ -214,7 +214,7 @@
}
try { m_parent.removeClient( this ); }
- catch( final Exception e )
+ catch( final Exception e )
{
}
}
1.3 +17 -17 jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/xcommander/XCommanderServer.java
Index: XCommanderServer.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/xcommander/XCommanderServer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XCommanderServer.java 2001/04/12 11:15:12 1.2
+++ XCommanderServer.java 2001/04/19 02:32:13 1.3
@@ -14,15 +14,15 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
-import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.Component;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.ComponentManagerException;
-import org.apache.avalon.Composer;
+import org.apache.avalon.Initializable;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.component.ComponentException;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.component.Composable;
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.Initializable;
+import org.apache.avalon.logger.AbstractLoggable;
import org.apache.cornerstone.demos.xcommander.xcommands.Chat;
import org.apache.cornerstone.demos.xcommander.xcommands.Echo;
import org.apache.cornerstone.services.connection.ConnectionHandler;
@@ -43,8 +43,8 @@
*/
public class XCommanderServer
extends AbstractLoggable
- implements Block, Composer, Configurable, Initializable,
- ConnectionHandlerFactory, XCommanderService, CommandHandler
+ implements Block, Composable, Configurable, Initializable,
+ ConnectionHandlerFactory, XCommanderService, CommandHandler
{
// block stuff
protected Configuration m_configuration;
@@ -56,7 +56,7 @@
// BLOCK METHODS
public void compose( final ComponentManager componentManager )
- throws ComponentManagerException
+ throws ComponentException
{
m_socketManager = (SocketManager)componentManager.
lookup( "org.apache.cornerstone.services.sockets.SocketManager" );
@@ -83,7 +83,7 @@
this.addCommand("org.apache.cornerstone.demos.xcommander.roles.Echo", Echo.class );
this.addCommand("xcommander.Chat", Chat.class );
this.addCommand("org.apache.cornerstone.demos.xcommander.roles.Chat", Chat.class );
- }
+ }
catch( final Exception e )
{
// never happens...
@@ -120,18 +120,18 @@
return handler;
}
- void addClient( final XCommanderHandler handler )
+ void addClient( final XCommanderHandler handler )
{
m_clients.add( handler );
}
- void removeClient( final XCommanderHandler handler )
+ void removeClient( final XCommanderHandler handler )
{
m_clients.remove( handler );
}
- public void handleCommand( final String type,
- final String identifier,
+ public void handleCommand( final String type,
+ final String identifier,
final Object result )
{
if( result instanceof GlobalResult )
@@ -157,14 +157,14 @@
* @throws IllegalArgumentException if the specified command is not
* an instance of XCommand.
*/
- public Object addCommand ( final String commandName,
- final Class command )
+ public Object addCommand ( final String commandName,
+ final Class command )
throws IllegalArgumentException
{
if( XCommand.class.isAssignableFrom( command ) )
{
return m_xcommands.put( commandName, command );
- }
+ }
else
{
throw new IllegalArgumentException();
1.6 +11 -11 jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/connection/AbstractHandlerFactory.java
Index: AbstractHandlerFactory.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/connection/AbstractHandlerFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractHandlerFactory.java 2001/04/17 03:12:03 1.5
+++ AbstractHandlerFactory.java 2001/04/19 02:32:14 1.6
@@ -7,17 +7,17 @@
*/
package org.apache.cornerstone.services.connection;
-import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.Component;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.ComponentManagerException;
-import org.apache.avalon.Composer;
-import org.apache.avalon.Context;
-import org.apache.avalon.Contextualizable;
import org.apache.avalon.Initializable;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.component.ComponentException;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.component.Composable;
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
+import org.apache.avalon.context.Context;
+import org.apache.avalon.context.Contextualizable;
+import org.apache.avalon.logger.AbstractLoggable;
/**
* Helper class to extend to create handler factorys.
@@ -26,7 +26,7 @@
*/
public abstract class AbstractHandlerFactory
extends AbstractLoggable
- implements Component, Contextualizable, Composer, Configurable, ConnectionHandlerFactory
+ implements Component, Contextualizable, Composable, Configurable, ConnectionHandlerFactory
{
protected Context m_context;
protected ComponentManager m_componentManager;
@@ -38,7 +38,7 @@
}
public void compose( final ComponentManager componentManager )
- throws ComponentManagerException
+ throws ComponentException
{
m_componentManager = componentManager;
}
@@ -67,9 +67,9 @@
((Contextualizable)handler).contextualize( m_context );
}
- if( handler instanceof Composer )
+ if( handler instanceof Composable )
{
- ((Composer)handler).compose( m_componentManager );
+ ((Composable)handler).compose( m_componentManager );
}
if( handler instanceof Configurable )
1.4 +13 -13 jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/connection/AbstractService.java
Index: AbstractService.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/connection/AbstractService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractService.java 2001/04/17 03:12:03 1.3
+++ AbstractService.java 2001/04/19 02:32:14 1.4
@@ -9,22 +9,22 @@
import java.net.InetAddress;
import java.net.ServerSocket;
-import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.Component;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.ComponentManagerException;
-import org.apache.avalon.Composer;
-import org.apache.avalon.Context;
-import org.apache.avalon.Contextualizable;
import org.apache.avalon.Disposable;
import org.apache.avalon.Initializable;
-import org.apache.avalon.Loggable;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.component.ComponentException;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.component.Composable;
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.excalibur.thread.ThreadPool;
+import org.apache.avalon.context.Context;
+import org.apache.avalon.context.Contextualizable;
+import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.avalon.logger.Loggable;
import org.apache.cornerstone.services.sockets.ServerSocketFactory;
import org.apache.cornerstone.services.sockets.SocketManager;
+import org.apache.excalibur.thread.ThreadPool;
import org.apache.log.Logger;
import org.apache.phoenix.Block;
import org.apache.phoenix.BlockContext;
@@ -36,7 +36,7 @@
*/
public abstract class AbstractService
extends AbstractLoggable
- implements Block, Contextualizable, Composer, Configurable, Initializable, Disposable
+ implements Block, Contextualizable, Composable, Configurable, Initializable, Disposable
{
protected ConnectionManager m_connectionManager;
protected SocketManager m_socketManager;
@@ -87,7 +87,7 @@
}
public void compose( final ComponentManager componentManager )
- throws ComponentManagerException
+ throws ComponentException
{
m_connectionManager = (ConnectionManager)componentManager.
lookup( "org.apache.cornerstone.services.connection.ConnectionManager" );
@@ -95,9 +95,9 @@
m_socketManager = (SocketManager)componentManager.
lookup( "org.apache.cornerstone.services.sockets.SocketManager" );
- if( m_factory instanceof Composer )
+ if( m_factory instanceof Composable )
{
- ((Composer)m_factory).compose( componentManager );
+ ((Composable)m_factory).compose( componentManager );
}
}
1.3 +1 -1 jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/connection/ConnectionHandler.java
Index: ConnectionHandler.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/connection/ConnectionHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConnectionHandler.java 2001/04/17 03:12:04 1.2
+++ ConnectionHandler.java 2001/04/19 02:32:15 1.3
@@ -10,7 +10,7 @@
import java.io.IOException;
import java.net.ProtocolException;
import java.net.Socket;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Component;
/**
* This interface is the way in which handlers are created.
1.3 +3 -3 jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/datasource/DataSourceSelector.java
Index: DataSourceSelector.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/datasource/DataSourceSelector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DataSourceSelector.java 2001/04/17 03:12:06 1.2
+++ DataSourceSelector.java 2001/04/19 02:32:16 1.3
@@ -7,8 +7,8 @@
*/
package org.apache.cornerstone.services.datasource;
-import org.apache.avalon.ComponentManagerException;
-import org.apache.avalon.ComponentSelector;
+import org.apache.avalon.component.ComponentException;
+import org.apache.avalon.component.ComponentSelector;
import org.apache.excalibur.datasource.DataSourceComponent;
import org.apache.phoenix.Service;
@@ -26,5 +26,5 @@
* @return data source
*/
DataSourceComponent selectDataSource( Object hint )
- throws ComponentManagerException;
+ throws ComponentException;
}
1.3 +1 -1 jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/packet/PacketHandler.java
Index: PacketHandler.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/packet/PacketHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PacketHandler.java 2001/04/17 03:12:07 1.2
+++ PacketHandler.java 2001/04/19 02:32:16 1.3
@@ -10,7 +10,7 @@
import java.io.IOException;
import java.net.DatagramPacket;
import java.net.ProtocolException;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Component;
/**
* This interface is the way in which handlers are created.
1.2 +0 -2 jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/scheduler/Target.java
Index: Target.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/scheduler/Target.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Target.java 2001/02/22 07:51:35 1.1
+++ Target.java 2001/04/19 02:32:17 1.2
@@ -7,8 +7,6 @@
*/
package org.apache.cornerstone.services.scheduler;
-import org.apache.avalon.configuration.Configuration;
-
/**
* This is the interface to implement to receive notification trigger.
*
1.3 +1 -1 jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/sockets/ServerSocketFactory.java
Index: ServerSocketFactory.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/sockets/ServerSocketFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServerSocketFactory.java 2001/04/17 03:12:15 1.2
+++ ServerSocketFactory.java 2001/04/19 02:32:18 1.3
@@ -10,7 +10,7 @@
import java.io.IOException;
import java.net.InetAddress;
import java.net.ServerSocket;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Component;
/**
* The interface used to create server sockets.
1.3 +1 -1 jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/sockets/SocketFactory.java
Index: SocketFactory.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/sockets/SocketFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SocketFactory.java 2001/04/17 03:12:16 1.2
+++ SocketFactory.java 2001/04/19 02:32:18 1.3
@@ -10,7 +10,7 @@
import java.io.IOException;
import java.net.InetAddress;
import java.net.Socket;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Component;
/**
* The interface used to create client sockets.
1.5 +2 -2 jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/sockets/SocketManager.java
Index: SocketManager.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/sockets/SocketManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SocketManager.java 2001/04/17 03:12:16 1.4
+++ SocketManager.java 2001/04/19 02:32:18 1.5
@@ -23,7 +23,7 @@
*
* @param name the name of server socket factory
* @return the ServerSocketFactory
- * @exception ComponentNotFoundException if server socket factory is not available
+ * @exception ComponentException if server socket factory is not available
*/
ServerSocketFactory getServerSocketFactory( String name )
throws ComponentException;
@@ -33,7 +33,7 @@
*
* @param name the name of client socket factory
* @return the SocketFactory
- * @exception ComponentNotFoundException if socket factory is not available
+ * @exception ComponentException if socket factory is not available
*/
SocketFactory getSocketFactory( String name )
throws ComponentException;
1.3 +1 -1 jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/store/Repository.java
Index: Repository.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/store/Repository.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Repository.java 2001/04/17 03:12:18 1.2
+++ Repository.java 2001/04/19 02:32:20 1.3
@@ -7,7 +7,7 @@
*/
package org.apache.cornerstone.services.store;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Component;
/**
* Generic Repository interface
1.3 +4 -4 jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/store/Store.java
Index: Store.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/store/Store.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Store.java 2001/04/17 03:12:18 1.2
+++ Store.java 2001/04/19 02:32:20 1.3
@@ -7,9 +7,9 @@
*/
package org.apache.cornerstone.services.store;
-import org.apache.avalon.Component;
-import org.apache.avalon.ComponentManagerException;
-import org.apache.avalon.ComponentSelector;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.component.ComponentException;
+import org.apache.avalon.component.ComponentSelector;
import org.apache.phoenix.Service;
/**
@@ -29,5 +29,5 @@
* </repository>
*/
Component select( Object hint )
- throws ComponentManagerException;
+ throws ComponentException;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: avalon-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: avalon-dev-help@jakarta.apache.org