hammant 2003/02/04 23:32:08
Modified: altrmi/src/java/org/apache/excalibur/altrmi/client/impl
AbstractClientInvocationHandler.java
AbstractConnectionPinger.java
altrmi/src/java/org/apache/excalibur/altrmi/client/impl/callback/socket
CallbackEnabledSocketCustomStreamInvocationHandler.java
altrmi/src/java/org/apache/excalibur/altrmi/client/impl/callback/stream
CallbackEnabledClientCustomStreamReadWriter.java
altrmi/src/java/org/apache/excalibur/altrmi/client/impl/multiple
RotatingMultipleInvocationHandler.java
altrmi/src/java/org/apache/excalibur/altrmi/common
ThreadPoolAware.java
altrmi/src/java/org/apache/excalibur/altrmi/server/impl
AbstractServer.java
AbstractServerStreamReadWriter.java
altrmi/src/java/org/apache/excalibur/altrmi/server/impl/callback/socket
CallbackEnabledSocketCustomStreamServer.java
altrmi/src/java/org/apache/excalibur/altrmi/server/impl/callback/stream
CallbackEnabledCustomStreamReadWriter.java
altrmi/src/java/org/apache/excalibur/altrmi/server/impl/http
CustomHttpServer.java
altrmi/src/java/org/apache/excalibur/altrmi/server/impl/piped
AbstractPipedServer.java
altrmi/src/java/org/apache/excalibur/altrmi/server/impl/socket
AbstractCompleteSocketStreamServer.java
CompleteSocketCustomStreamServer.java
CompleteSocketObjectStreamServer.java
altrmi/src/test/org/apache/excalibur/altrmi/test
DummyInvocationHandler.java
altrmi/src/test/org/apache/excalibur/altrmi/test/misc
DefaultConnectionPingerTestCase.java
Log:
ServerMonitor percolated to more ReadWriters. ThreadPool rename completed.
Revision Changes Path
1.16 +8 -8
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/AbstractClientInvocationHandler.java
Index: AbstractClientInvocationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/AbstractClientInvocationHandler.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- AbstractClientInvocationHandler.java 5 Feb 2003 01:02:53 -0000 1.15
+++ AbstractClientInvocationHandler.java 5 Feb 2003 07:32:07 -0000 1.16
@@ -33,7 +33,7 @@
protected ConnectionListener m_connectionListener =
new DefaultConnectionListener();
protected boolean m_stopped = false;
- private ThreadPool m_threadContextProvider;
+ private ThreadPool m_threadPool;
/**
* Method setConnectionListener
@@ -52,18 +52,18 @@
return m_connectionListener;
}
- public void setThreadContextProvider(ThreadPool threadContextProvider)
+ public void setThreadPool(ThreadPool threadPool)
{
- m_threadContextProvider = threadContextProvider;
+ m_threadPool = threadPool;
}
- public synchronized ThreadPool getThreadContextProvider()
+ public synchronized ThreadPool getThreadPool()
{
- if (m_threadContextProvider == null)
+ if (m_threadPool == null)
{
- m_threadContextProvider = new DefaultThreadPool();
+ m_threadPool = new DefaultThreadPool();
}
- return m_threadContextProvider;
+ return m_threadPool;
}
/**
1.15 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/AbstractConnectionPinger.java
Index: AbstractConnectionPinger.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/AbstractConnectionPinger.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AbstractConnectionPinger.java 29 Jan 2003 08:01:12 -0000 1.14
+++ AbstractConnectionPinger.java 5 Feb 2003 07:32:07 -0000 1.15
@@ -130,7 +130,7 @@
}
};
- m_threadContext =
m_clientInvocationHandler.getThreadContextProvider().getThreadContext(m_runnable);
+ m_threadContext =
m_clientInvocationHandler.getThreadPool().getThreadContext(m_runnable);
m_threadContext.start();
}
1.16 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/callback/socket/CallbackEnabledSocketCustomStreamInvocationHandler.java
Index: CallbackEnabledSocketCustomStreamInvocationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/callback/socket/CallbackEnabledSocketCustomStreamInvocationHandler.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- CallbackEnabledSocketCustomStreamInvocationHandler.java 29 Jan 2003 08:01:13
-0000 1.15
+++ CallbackEnabledSocketCustomStreamInvocationHandler.java 5 Feb 2003 07:32:07
-0000 1.16
@@ -49,7 +49,7 @@
{
if( m_callbackEnabledClientCustomStreamReadWriter == null )
{
- m_callbackEnabledClientCustomStreamReadWriter = new
CallbackEnabledClientCustomStreamReadWriter( getThreadContextProvider(), in, out,
m_interfacesClassLoader );
+ m_callbackEnabledClientCustomStreamReadWriter = new
CallbackEnabledClientCustomStreamReadWriter( getThreadPool(), in, out,
m_interfacesClassLoader );
}
return m_callbackEnabledClientCustomStreamReadWriter;
}
1.18 +5 -5
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/callback/stream/CallbackEnabledClientCustomStreamReadWriter.java
Index: CallbackEnabledClientCustomStreamReadWriter.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/callback/stream/CallbackEnabledClientCustomStreamReadWriter.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- CallbackEnabledClientCustomStreamReadWriter.java 5 Feb 2003 01:02:53 -0000
1.17
+++ CallbackEnabledClientCustomStreamReadWriter.java 5 Feb 2003 07:32:07 -0000
1.18
@@ -58,7 +58,7 @@
private HashMap m_exposedObjPublishNameHash_ = new HashMap();
private Server m_clientServerHostingExposedObjects = new DirectServer();
private static int m_random = 0;
- private ThreadPool m_threadContextProvider;
+ private ThreadPool m_threadPool;
/**
* Constructor ClientCustomStreamReadWriter
@@ -70,16 +70,16 @@
* @throws ConnectionException The IO Exception
*
*/
- public CallbackEnabledClientCustomStreamReadWriter(ThreadPool
threadContextProvider, InputStream inputStream, OutputStream outputStream, ClassLoader
interfacesClassLoader)
+ public CallbackEnabledClientCustomStreamReadWriter(ThreadPool threadPool,
InputStream inputStream, OutputStream outputStream, ClassLoader interfacesClassLoader)
throws ConnectionException
{
- this.m_threadContextProvider = threadContextProvider;
+ this.m_threadPool = threadPool;
m_dataOutputStream = new DataOutputStream(new
BufferedOutputStream(outputStream));
m_dataInputStream = new DataInputStream(inputStream);
m_interfacesClassLoader = interfacesClassLoader;
//This thread recv's all the messages sent from the server
- m_messageLoopThreadContext = m_threadContextProvider.getThreadContext(this);
+ m_messageLoopThreadContext = m_threadPool.getThreadContext(this);
m_messageLoopThreadContext.start();
//start the internal Server which holds the exposed Objects
// for the server to make callbacks upon.
1.11 +4 -4
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/multiple/RotatingMultipleInvocationHandler.java
Index: RotatingMultipleInvocationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/multiple/RotatingMultipleInvocationHandler.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- RotatingMultipleInvocationHandler.java 5 Feb 2003 01:02:54 -0000 1.10
+++ RotatingMultipleInvocationHandler.java 5 Feb 2003 07:32:08 -0000 1.11
@@ -18,7 +18,7 @@
* Class RotatingMultipleInvocationHandler
*
*
- * @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
+ * @author Paul Hammant
* @version $Revision$
*/
public class RotatingMultipleInvocationHandler extends
AbstractMultipleInvocationHandler
@@ -114,12 +114,12 @@
}
}
- public void setThreadContextProvider(ThreadPool threadContextProvider)
+ public void setThreadPool(ThreadPool threadPool)
{
//TODO
}
- public ThreadPool getThreadContextProvider()
+ public ThreadPool getThreadPool()
{
//TODO
return null;
1.2 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ThreadPoolAware.java
Index: ThreadPoolAware.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ThreadPoolAware.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ThreadPoolAware.java 5 Feb 2003 01:02:54 -0000 1.1
+++ ThreadPoolAware.java 5 Feb 2003 07:32:08 -0000 1.2
@@ -17,8 +17,8 @@
*/
public interface ThreadPoolAware {
- void setThreadContextProvider(ThreadPool threadContextProvider);
+ void setThreadPool(ThreadPool threadPool);
- ThreadPool getThreadContextProvider();
+ ThreadPool getThreadPool();
}
1.17 +8 -8
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/AbstractServer.java
Index: AbstractServer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/AbstractServer.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- AbstractServer.java 5 Feb 2003 01:02:54 -0000 1.16
+++ AbstractServer.java 5 Feb 2003 07:32:08 -0000 1.17
@@ -53,7 +53,7 @@
private int m_state = UNSTARTED;
private ServerMonitor m_serverMonitor;
- private ThreadPool m_threadContextProvider;
+ private ThreadPool m_threadPool;
/**
* Construct a AbstractServer
@@ -82,18 +82,18 @@
return m_serverMonitor;
}
- public void setThreadContextProvider(ThreadPool threadContextProvider)
+ public void setThreadPool(ThreadPool threadPool)
{
- m_threadContextProvider = threadContextProvider;
+ m_threadPool = threadPool;
}
- public synchronized ThreadPool getThreadContextProvider()
+ public synchronized ThreadPool getThreadPool()
{
- if (m_threadContextProvider == null)
+ if (m_threadPool == null)
{
- m_threadContextProvider = new DefaultThreadPool();
+ m_threadPool = new DefaultThreadPool();
}
- return m_threadContextProvider;
+ return m_threadPool;
}
1.3 +6 -6
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/AbstractServerStreamReadWriter.java
Index: AbstractServerStreamReadWriter.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/AbstractServerStreamReadWriter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractServerStreamReadWriter.java 5 Feb 2003 01:02:54 -0000 1.2
+++ AbstractServerStreamReadWriter.java 5 Feb 2003 07:32:08 -0000 1.3
@@ -40,21 +40,21 @@
private OutputStream m_outputStream;
protected ServerMonitor m_serverMonitor;
- private ThreadPool m_threadContextProvider;
+ private ThreadPool m_threadPool;
private Object m_connectionDetails;
public final void setServerMonitor(ServerMonitor serverMonitor) {
m_serverMonitor = serverMonitor;
}
- public void setThreadContextProvider(ThreadPool threadContextProvider)
+ public void setThreadPool(ThreadPool threadPool)
{
- m_threadContextProvider = threadContextProvider;
+ m_threadPool = threadPool;
}
- public ThreadPool getThreadContextProvider()
+ public ThreadPool getThreadPool()
{
- return m_threadContextProvider;
+ return m_threadPool;
}
/**
1.8 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/callback/socket/CallbackEnabledSocketCustomStreamServer.java
Index: CallbackEnabledSocketCustomStreamServer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/callback/socket/CallbackEnabledSocketCustomStreamServer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CallbackEnabledSocketCustomStreamServer.java 5 Feb 2003 00:55:22 -0000
1.7
+++ CallbackEnabledSocketCustomStreamServer.java 5 Feb 2003 07:32:08 -0000
1.8
@@ -67,7 +67,7 @@
protected AbstractServerStreamReadWriter createServerStreamReadWriter()
{
CallbackEnabledCustomStreamReadWriter
callbackEnabledSocketCustomStreamReadWriter = new
CallbackEnabledCustomStreamReadWriter();
-
callbackEnabledSocketCustomStreamReadWriter.setThreadContextProvider(getThreadContextProvider());
+ callbackEnabledSocketCustomStreamReadWriter.setThreadPool(getThreadPool());
callbackEnabledSocketCustomStreamReadWriter.setServerMonitor(getServerMonitor());
return callbackEnabledSocketCustomStreamReadWriter;
}
1.3 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/callback/stream/CallbackEnabledCustomStreamReadWriter.java
Index: CallbackEnabledCustomStreamReadWriter.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/callback/stream/CallbackEnabledCustomStreamReadWriter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CallbackEnabledCustomStreamReadWriter.java 5 Feb 2003 00:55:22 -0000
1.2
+++ CallbackEnabledCustomStreamReadWriter.java 5 Feb 2003 07:32:08 -0000
1.3
@@ -71,7 +71,7 @@
m_dataOutputStream = new DataOutputStream(new
BufferedOutputStream(getOutputStream()));
//start the receiving message loop
- m_messageLoopThread = getThreadContextProvider().getThreadContext(this);
+ m_messageLoopThread = getThreadPool().getThreadContext(this);
m_messageLoopThread.start();
}
1.9 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/http/CustomHttpServer.java
Index: CustomHttpServer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/http/CustomHttpServer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CustomHttpServer.java 5 Feb 2003 00:55:22 -0000 1.8
+++ CustomHttpServer.java 5 Feb 2003 07:32:08 -0000 1.9
@@ -100,7 +100,7 @@
hcsc.setServerMonitor(getServerMonitor());
- ThreadContext threadContext =
getThreadContextProvider().getThreadContext(hcsc);
+ ThreadContext threadContext = getThreadPool().getThreadContext(hcsc);
threadContext.start();
}
1.12 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/piped/AbstractPipedServer.java
Index: AbstractPipedServer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/piped/AbstractPipedServer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AbstractPipedServer.java 5 Feb 2003 00:55:23 -0000 1.11
+++ AbstractPipedServer.java 5 Feb 2003 07:32:08 -0000 1.12
@@ -83,7 +83,7 @@
ssrw );
pssc.setServerMonitor(getServerMonitor());
- ThreadContext thread =
getThreadContextProvider().getThreadContext(pssc);
+ ThreadContext thread = getThreadPool().getThreadContext(pssc);
thread.start();
}
1.16 +3 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/socket/AbstractCompleteSocketStreamServer.java
Index: AbstractCompleteSocketStreamServer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/socket/AbstractCompleteSocketStreamServer.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- AbstractCompleteSocketStreamServer.java 5 Feb 2003 00:55:23 -0000 1.15
+++ AbstractCompleteSocketStreamServer.java 5 Feb 2003 07:32:08 -0000 1.16
@@ -111,7 +111,7 @@
sssc.setServerMonitor(getServerMonitor());
//TODO ? Two of these getThreadContexts? PH
- ThreadContext threadContext =
getThreadContextProvider().getThreadContext(sssc);
+ ThreadContext threadContext =
getThreadPool().getThreadContext(sssc);
threadContext.start();
}
@@ -176,7 +176,7 @@
if( m_threadContext == null )
{
- m_threadContext = getThreadContextProvider().getThreadContext(this);
+ m_threadContext = getThreadPool().getThreadContext(this);
}
1.9 +6 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/socket/CompleteSocketCustomStreamServer.java
Index: CompleteSocketCustomStreamServer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/socket/CompleteSocketCustomStreamServer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CompleteSocketCustomStreamServer.java 5 Feb 2003 00:55:23 -0000 1.8
+++ CompleteSocketCustomStreamServer.java 5 Feb 2003 07:32:08 -0000 1.9
@@ -17,7 +17,7 @@
* Class CompleteSocketObjectStreamServer
*
*
- * @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
+ * @author Paul Hammant
* @version $Revision$
*/
public class CompleteSocketCustomStreamServer extends
AbstractCompleteSocketStreamServer
@@ -64,6 +64,9 @@
*/
protected AbstractServerStreamReadWriter createServerStreamReadWriter()
{
- return new ServerCustomStreamReadWriter();
+ ServerCustomStreamReadWriter rw = new ServerCustomStreamReadWriter();
+ rw.setThreadPool(getThreadPool());
+ rw.setServerMonitor(getServerMonitor());
+ return rw;
}
}
1.6 +7 -4
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/socket/CompleteSocketObjectStreamServer.java
Index: CompleteSocketObjectStreamServer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/socket/CompleteSocketObjectStreamServer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CompleteSocketObjectStreamServer.java 5 Feb 2003 00:55:23 -0000 1.5
+++ CompleteSocketObjectStreamServer.java 5 Feb 2003 07:32:08 -0000 1.6
@@ -15,7 +15,7 @@
* Class CompleteSocketObjectStreamServer
*
*
- * @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
+ * @author Paul Hammant
* @version $Revision$
*/
public class CompleteSocketObjectStreamServer extends
AbstractCompleteSocketStreamServer
@@ -72,7 +72,10 @@
*/
protected AbstractServerStreamReadWriter createServerStreamReadWriter()
{
- return new ServerObjectStreamReadWriter( m_objectOutputStreamClassName,
- m_objectInputStreamClassName );
+ ServerObjectStreamReadWriter rw = new ServerObjectStreamReadWriter(
m_objectOutputStreamClassName,
+
m_objectInputStreamClassName );
+ rw.setThreadPool(getThreadPool());
+ rw.setServerMonitor(getServerMonitor());
+ return rw;
}
}
1.7 +3 -3
jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/DummyInvocationHandler.java
Index: DummyInvocationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/DummyInvocationHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DummyInvocationHandler.java 5 Feb 2003 01:02:54 -0000 1.6
+++ DummyInvocationHandler.java 5 Feb 2003 07:32:08 -0000 1.7
@@ -108,12 +108,12 @@
throw new java.lang.UnsupportedOperationException();
}
- public void setThreadContextProvider(ThreadPool threadContextProvider)
+ public void setThreadPool(ThreadPool threadContextProvider)
{
m_threadContextProvider = threadContextProvider;
}
- public ThreadPool getThreadContextProvider()
+ public ThreadPool getThreadPool()
{
return m_threadContextProvider;
}
1.4 +1 -1
jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/misc/DefaultConnectionPingerTestCase.java
Index: DefaultConnectionPingerTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/misc/DefaultConnectionPingerTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultConnectionPingerTestCase.java 5 Feb 2003 01:02:54 -0000 1.3
+++ DefaultConnectionPingerTestCase.java 5 Feb 2003 07:32:08 -0000 1.4
@@ -29,7 +29,7 @@
{
DefaultConnectionPinger pinger = new DefaultConnectionPinger(1L,10000L);
DummyInvocationHandler dummy = new DummyInvocationHandler();
- dummy.setThreadContextProvider(new DefaultThreadPool());
+ dummy.setThreadPool(new DefaultThreadPool());
pinger.setInvocationHandler(dummy);
pinger.start();
Thread.sleep(1000);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
