hammant 2003/02/04 16:55:23
Modified: altrmi/src/java/org/apache/excalibur/altrmi/server/impl
ServerCustomStreamReadWriter.java
ServerObjectStreamReadWriter.java
StreamServerConnection.java
altrmi/src/java/org/apache/excalibur/altrmi/server/impl/callback/socket
CallbackEnabledSocketCustomStreamServer.java
PartialCallbackEnabledSocketCustomStreamServer.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
HttpCustomServerConnection.java
altrmi/src/java/org/apache/excalibur/altrmi/server/impl/piped
AbstractPipedServer.java
PipedCustomStreamServer.java
PipedObjectStreamServer.java
PipedStreamServerConnection.java
altrmi/src/java/org/apache/excalibur/altrmi/server/impl/socket
AbstractCompleteSocketStreamServer.java
AbstractPartialSocketStreamServer.java
CompleteSocketCustomStreamServer.java
CompleteSocketObjectStreamServer.java
PartialSocketCustomStreamServer.java
PartialSocketObjectStreamServer.java
SocketStreamServerConnection.java
altrmi/src/test/org/apache/excalibur/altrmi/test/socket
CallbackEnabledCustomStreamTestCase.java
Added: altrmi/src/java/org/apache/excalibur/altrmi/server/impl
AbstractServerStreamReadWriter.java
Removed: altrmi/src/java/org/apache/excalibur/altrmi/server/impl
ServerStreamReadWriter.java
Log:
ServerMonitor now works.
Revision Changes Path
1.9 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/ServerCustomStreamReadWriter.java
Index: ServerCustomStreamReadWriter.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/ServerCustomStreamReadWriter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ServerCustomStreamReadWriter.java 5 Jan 2003 23:24:44 -0000 1.8
+++ ServerCustomStreamReadWriter.java 5 Feb 2003 00:55:22 -0000 1.9
@@ -24,7 +24,7 @@
* @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
* @version $Revision$
*/
-public class ServerCustomStreamReadWriter extends ServerStreamReadWriter
+public class ServerCustomStreamReadWriter extends AbstractServerStreamReadWriter
{
private DataInputStream m_dataInputStream;
1.8 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/ServerObjectStreamReadWriter.java
Index: ServerObjectStreamReadWriter.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/ServerObjectStreamReadWriter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ServerObjectStreamReadWriter.java 5 Jan 2003 23:24:44 -0000 1.7
+++ ServerObjectStreamReadWriter.java 5 Feb 2003 00:55:22 -0000 1.8
@@ -23,7 +23,7 @@
* @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
* @version $Revision$
*/
-public class ServerObjectStreamReadWriter extends ServerStreamReadWriter
+public class ServerObjectStreamReadWriter extends AbstractServerStreamReadWriter
{
/**
1.16 +3 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/StreamServerConnection.java
Index: StreamServerConnection.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/StreamServerConnection.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- StreamServerConnection.java 2 Feb 2003 14:10:06 -0000 1.15
+++ StreamServerConnection.java 5 Feb 2003 00:55:22 -0000 1.16
@@ -46,7 +46,7 @@
/**
* The Sever Stream Read Writer.
*/
- private ServerStreamReadWriter m_readWriter;
+ private AbstractServerStreamReadWriter m_readWriter;
private ServerMonitor m_serverMonitor;
@@ -59,7 +59,7 @@
*
*/
public StreamServerConnection(AbstractServer abstractServer,
- ServerStreamReadWriter readWriter)
+ AbstractServerStreamReadWriter readWriter)
{
m_abstractServer = abstractServer;
m_readWriter = readWriter;
1.1
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/AbstractServerStreamReadWriter.java
Index: AbstractServerStreamReadWriter.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.excalibur.altrmi.server.impl;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import org.apache.excalibur.altrmi.common.Reply;
import org.apache.excalibur.altrmi.common.Request;
import org.apache.excalibur.altrmi.common.ConnectionException;
import org.apache.excalibur.altrmi.common.ThreadContextProvider;
import org.apache.excalibur.altrmi.server.ServerMonitor;
import org.apache.excalibur.altrmi.common.ThreadContextProviderAware;
/**
* Class AbstractServerStreamReadWriter
*
*
* @author Paul Hammant
* @version $Revision: 1.1 $
*/
public abstract class AbstractServerStreamReadWriter implements
ThreadContextProviderAware
{
/**
* The input stream
*/
private InputStream m_inputStream;
/**
* The output stream
*/
private OutputStream m_outputStream;
protected ServerMonitor m_serverMonitor;
private ThreadContextProvider m_threadContextProvider;
private Object m_connectionDetails;
public final void setServerMonitor(ServerMonitor serverMonitor) {
m_serverMonitor = serverMonitor;
}
public void setThreadContextProvider(ThreadContextProvider threadContextProvider)
{
m_threadContextProvider = threadContextProvider;
}
public ThreadContextProvider getThreadContextProvider()
{
return m_threadContextProvider;
}
/**
* Method setStreams
*
*
* @param inputStream The input stream
* @param outputStream the outpur stream
*
*/
public final void setStreams( InputStream inputStream, OutputStream
outputStream, Object connectionDetails )
{
m_inputStream = inputStream;
m_outputStream = outputStream;
m_connectionDetails = connectionDetails;
}
public Object getConnectionDetails()
{
return m_connectionDetails;
}
/**
* Initialize the Read Writer.
* @throws IOException if a problem during initialization.
*/
protected abstract void initialize() throws IOException;
/**
* Write a Reply, then Get a new Request over the stream.
* @param altrmiReply The reply to pass back to the client
* @return The Request that is new and incoming
* @throws IOException if a problem during write & read.
* @throws ConnectionException if a problem during write & read.
* @throws ClassNotFoundException If a Class is not found during serialization.
*/
protected abstract Request writeReplyAndGetRequest( Reply altrmiReply )
throws IOException, ConnectionException, ClassNotFoundException;
/**
* Close the stream.
*/
protected void close()
{
try
{
m_inputStream.close();
}
catch ( IOException e )
{
m_serverMonitor.closeError( "AbstractServerStreamReadWriter.close():
Failed closing an AltRMI connection input stream: ", e);
}
try
{
m_outputStream.close();
}
catch ( IOException e )
{
m_serverMonitor.closeError( "AbstractServerStreamReadWriter.close():
Failed closing an AltRMI connection output stream: ", e);
}
}
/**
* Get the Input stream
* @return The input stream
*/
protected InputStream getInputStream()
{
return m_inputStream;
}
/**
* Get the Output stream
* @return The Output stream
*/
protected OutputStream getOutputStream()
{
return m_outputStream;
}
}
1.7 +4 -3
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CallbackEnabledSocketCustomStreamServer.java 5 Feb 2003 00:10:26 -0000
1.6
+++ CallbackEnabledSocketCustomStreamServer.java 5 Feb 2003 00:55:22 -0000
1.7
@@ -8,7 +8,7 @@
package org.apache.excalibur.altrmi.server.impl.callback.socket;
import org.apache.excalibur.altrmi.server.ServerException;
-import org.apache.excalibur.altrmi.server.impl.ServerStreamReadWriter;
+import org.apache.excalibur.altrmi.server.impl.AbstractServerStreamReadWriter;
import
org.apache.excalibur.altrmi.server.impl.callback.stream.CallbackEnabledCustomStreamReadWriter;
import org.apache.excalibur.altrmi.server.impl.adapters.InvocationHandlerAdapter;
import
org.apache.excalibur.altrmi.server.impl.socket.AbstractCompleteSocketStreamServer;
@@ -64,10 +64,11 @@
/*
* @see AbstractCompleteSocketStreamServer#createServerStreamReadWriter()
*/
- protected ServerStreamReadWriter createServerStreamReadWriter()
+ protected AbstractServerStreamReadWriter createServerStreamReadWriter()
{
CallbackEnabledCustomStreamReadWriter
callbackEnabledSocketCustomStreamReadWriter = new
CallbackEnabledCustomStreamReadWriter();
callbackEnabledSocketCustomStreamReadWriter.setThreadContextProvider(getThreadContextProvider());
+
callbackEnabledSocketCustomStreamReadWriter.setServerMonitor(getServerMonitor());
return callbackEnabledSocketCustomStreamReadWriter;
}
}
1.6 +3 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/callback/socket/PartialCallbackEnabledSocketCustomStreamServer.java
Index: PartialCallbackEnabledSocketCustomStreamServer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/callback/socket/PartialCallbackEnabledSocketCustomStreamServer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PartialCallbackEnabledSocketCustomStreamServer.java 5 Feb 2003 00:10:26
-0000 1.5
+++ PartialCallbackEnabledSocketCustomStreamServer.java 5 Feb 2003 00:55:22
-0000 1.6
@@ -7,7 +7,7 @@
*/
package org.apache.excalibur.altrmi.server.impl.callback.socket;
-import org.apache.excalibur.altrmi.server.impl.ServerStreamReadWriter;
+import org.apache.excalibur.altrmi.server.impl.AbstractServerStreamReadWriter;
import
org.apache.excalibur.altrmi.server.impl.callback.stream.CallbackEnabledCustomStreamReadWriter;
import org.apache.excalibur.altrmi.server.impl.adapters.InvocationHandlerAdapter;
import
org.apache.excalibur.altrmi.server.impl.socket.AbstractPartialSocketStreamServer;
@@ -48,7 +48,7 @@
/*
* @see AbstractPartialSocketStreamServer#createServerStreamReadWriter()
*/
- protected ServerStreamReadWriter createServerStreamReadWriter()
+ protected AbstractServerStreamReadWriter createServerStreamReadWriter()
{
return new CallbackEnabledCustomStreamReadWriter();
}
1.2 +13 -11
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CallbackEnabledCustomStreamReadWriter.java 5 Feb 2003 00:10:27 -0000
1.1
+++ CallbackEnabledCustomStreamReadWriter.java 5 Feb 2003 00:55:22 -0000
1.2
@@ -24,7 +24,8 @@
import org.apache.excalibur.altrmi.common.ReqRepBytes;
import org.apache.excalibur.altrmi.common.ExceptionReply;
import org.apache.excalibur.altrmi.common.InvocationException;
-import org.apache.excalibur.altrmi.server.impl.ServerStreamReadWriter;
+import org.apache.excalibur.altrmi.common.ConnectionException;
+import org.apache.excalibur.altrmi.server.impl.AbstractServerStreamReadWriter;
import org.apache.excalibur.altrmi.server.impl.callback.CallbackHostContext;
import org.apache.excalibur.altrmi.server.impl.callback.CallbackServerClassFactory;
import
org.apache.excalibur.altrmi.server.impl.callback.socket.CallbackServerClientReadWriter;
@@ -43,7 +44,7 @@
* @author Paul Hammant
* @version $Revision$
*/
-public class CallbackEnabledCustomStreamReadWriter extends ServerStreamReadWriter
+public class CallbackEnabledCustomStreamReadWriter extends
AbstractServerStreamReadWriter
implements Runnable
{
@@ -61,7 +62,7 @@
private CallbackServerClassFactory m_altrmiFactory;
/*
- * @see ServerStreamReadWriter#initialize()
+ * @see AbstractServerStreamReadWriter#initialize()
*/
protected void initialize() throws IOException
{
@@ -106,14 +107,14 @@
if ((ioe instanceof EOFException &&
reqRepBytes.ioeDuringReadInt())
|| ioe instanceof SocketException)
{
+ m_serverMonitor.closeError("Close During callback
operation", ioe);
m_isStopped = true;
notifyBoth();
// restart ?
return;
}
}
-
- System.out.println("--> ##1 " + ioe.getClass().getName());
+ m_serverMonitor.unexpectedException("Problem during reading of
bytes", ioe);
}
@@ -129,7 +130,7 @@
}
catch (ClassNotFoundException e)
{
- System.out.println("--> TODO!!" + e.getMessage());
+ m_serverMonitor.classNotFound(e);
m_request = null;
m_isStopped = true;
return;
@@ -149,6 +150,7 @@
}
catch (ClassNotFoundException e)
{
+ m_serverMonitor.classNotFound(e);
m_reply = new ExceptionReply(new
InvocationException("ClassNotFoundException", e));
}
@@ -194,7 +196,7 @@
}
catch (InterruptedException e)
{
- e.printStackTrace();
+ m_serverMonitor.unexpectedException("Wait issue", e);
}
}
}
@@ -228,7 +230,7 @@
}
/*
- * @see ServerStreamReadWriter#writeReplyAndGetRequest(Reply)
+ * @see AbstractServerStreamReadWriter#writeReplyAndGetRequest(Reply)
*/
protected Request writeReplyAndGetRequest(Reply altrmiReply)
throws IOException, ClassNotFoundException
@@ -349,9 +351,9 @@
args[i] = obj;
}
- catch (Exception altrmiConnectionException)
+ catch (ConnectionException connectionException)
{
- altrmiConnectionException.printStackTrace();
+ m_serverMonitor.connectionProblem("Connection issue on lookup",
connectionException);
}
}
}
1.8 +3 -3
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CustomHttpServer.java 2 Feb 2003 14:10:06 -0000 1.7
+++ CustomHttpServer.java 5 Feb 2003 00:55:22 -0000 1.8
@@ -10,7 +10,7 @@
import org.apache.excalibur.altrmi.server.ServerException;
import org.apache.excalibur.altrmi.server.impl.AbstractServer;
import org.apache.excalibur.altrmi.server.impl.ServerCustomStreamReadWriter;
-import org.apache.excalibur.altrmi.server.impl.ServerStreamReadWriter;
+import org.apache.excalibur.altrmi.server.impl.AbstractServerStreamReadWriter;
import org.apache.excalibur.altrmi.server.impl.adapters.InvocationHandlerAdapter;
import org.apache.excalibur.altrmi.common.ThreadContext;
@@ -91,7 +91,7 @@
protected void processRequest(InputStream in, OutputStream out)
{
- ServerStreamReadWriter ssrw = new ServerCustomStreamReadWriter();
+ AbstractServerStreamReadWriter ssrw = new ServerCustomStreamReadWriter();
ssrw.setStreams(in, out, "TODO");
1.2 +3 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/http/HttpCustomServerConnection.java
Index: HttpCustomServerConnection.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/http/HttpCustomServerConnection.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HttpCustomServerConnection.java 16 Dec 2002 01:00:01 -0000 1.1
+++ HttpCustomServerConnection.java 5 Feb 2003 00:55:22 -0000 1.2
@@ -8,7 +8,7 @@
package org.apache.excalibur.altrmi.server.impl.http;
import org.apache.excalibur.altrmi.server.impl.AbstractServer;
-import org.apache.excalibur.altrmi.server.impl.ServerStreamReadWriter;
+import org.apache.excalibur.altrmi.server.impl.AbstractServerStreamReadWriter;
import org.apache.excalibur.altrmi.server.impl.StreamServerConnection;
/**
@@ -28,7 +28,7 @@
* @param readWriter The readWriter for the transport type
*/
public HttpCustomServerConnection(
- final AbstractServer abstractServer, ServerStreamReadWriter readWriter)
+ final AbstractServer abstractServer, AbstractServerStreamReadWriter
readWriter)
{
super(abstractServer, readWriter);
}
1.11 +4 -4
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AbstractPipedServer.java 2 Feb 2003 14:10:06 -0000 1.10
+++ AbstractPipedServer.java 5 Feb 2003 00:55:23 -0000 1.11
@@ -13,7 +13,7 @@
import org.apache.excalibur.altrmi.common.ConnectionException;
import org.apache.excalibur.altrmi.common.ThreadContext;
import org.apache.excalibur.altrmi.server.impl.AbstractServer;
-import org.apache.excalibur.altrmi.server.impl.ServerStreamReadWriter;
+import org.apache.excalibur.altrmi.server.impl.AbstractServerStreamReadWriter;
import org.apache.excalibur.altrmi.server.impl.adapters.InvocationHandlerAdapter;
/**
@@ -75,7 +75,7 @@
pIS.connect( out );
in.connect( pOS );
- ServerStreamReadWriter ssrw = createServerStreamReadWriter();
+ AbstractServerStreamReadWriter ssrw = createServerStreamReadWriter();
ssrw.setStreams( pIS, pOS, "piped");
@@ -117,5 +117,5 @@
setState(STOPPED);
}
- protected abstract ServerStreamReadWriter createServerStreamReadWriter();
+ protected abstract AbstractServerStreamReadWriter
createServerStreamReadWriter();
}
1.4 +3 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/piped/PipedCustomStreamServer.java
Index: PipedCustomStreamServer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/piped/PipedCustomStreamServer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PipedCustomStreamServer.java 11 Jan 2003 16:10:09 -0000 1.3
+++ PipedCustomStreamServer.java 5 Feb 2003 00:55:23 -0000 1.4
@@ -7,7 +7,7 @@
*/
package org.apache.excalibur.altrmi.server.impl.piped;
-import org.apache.excalibur.altrmi.server.impl.ServerStreamReadWriter;
+import org.apache.excalibur.altrmi.server.impl.AbstractServerStreamReadWriter;
import org.apache.excalibur.altrmi.server.impl.ServerCustomStreamReadWriter;
import org.apache.excalibur.altrmi.server.impl.adapters.InvocationHandlerAdapter;
@@ -35,7 +35,7 @@
super(invocationHandlerAdapter);
}
- protected ServerStreamReadWriter createServerStreamReadWriter()
+ protected AbstractServerStreamReadWriter createServerStreamReadWriter()
{
return new ServerCustomStreamReadWriter();
}
1.6 +3 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/piped/PipedObjectStreamServer.java
Index: PipedObjectStreamServer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/piped/PipedObjectStreamServer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PipedObjectStreamServer.java 11 Jan 2003 16:10:09 -0000 1.5
+++ PipedObjectStreamServer.java 5 Feb 2003 00:55:23 -0000 1.6
@@ -8,7 +8,7 @@
package org.apache.excalibur.altrmi.server.impl.piped;
import org.apache.excalibur.altrmi.server.impl.ServerObjectStreamReadWriter;
-import org.apache.excalibur.altrmi.server.impl.ServerStreamReadWriter;
+import org.apache.excalibur.altrmi.server.impl.AbstractServerStreamReadWriter;
import org.apache.excalibur.altrmi.server.impl.adapters.InvocationHandlerAdapter;
/**
@@ -36,7 +36,7 @@
super(invocationHandlerAdapter);
}
- protected ServerStreamReadWriter createServerStreamReadWriter()
+ protected AbstractServerStreamReadWriter createServerStreamReadWriter()
{
return new ServerObjectStreamReadWriter();
}
1.7 +3 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/piped/PipedStreamServerConnection.java
Index: PipedStreamServerConnection.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/piped/PipedStreamServerConnection.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PipedStreamServerConnection.java 19 Jan 2003 11:10:01 -0000 1.6
+++ PipedStreamServerConnection.java 5 Feb 2003 00:55:23 -0000 1.7
@@ -11,7 +11,7 @@
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
import org.apache.excalibur.altrmi.server.impl.AbstractServer;
-import org.apache.excalibur.altrmi.server.impl.ServerStreamReadWriter;
+import org.apache.excalibur.altrmi.server.impl.AbstractServerStreamReadWriter;
import org.apache.excalibur.altrmi.server.impl.StreamServerConnection;
/**
@@ -46,7 +46,7 @@
*
*/
public PipedStreamServerConnection(
- AbstractServer abstractServer, PipedInputStream pipedIn, PipedOutputStream
pipedOut, ServerStreamReadWriter readWriter )
+ AbstractServer abstractServer, PipedInputStream pipedIn, PipedOutputStream
pipedOut, AbstractServerStreamReadWriter readWriter )
{
super( abstractServer, readWriter );
1.15 +4 -4
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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AbstractCompleteSocketStreamServer.java 2 Feb 2003 14:10:06 -0000 1.14
+++ AbstractCompleteSocketStreamServer.java 5 Feb 2003 00:55:23 -0000 1.15
@@ -12,7 +12,7 @@
import java.net.Socket;
import org.apache.excalibur.altrmi.server.ServerException;
import org.apache.excalibur.altrmi.server.impl.AbstractServer;
-import org.apache.excalibur.altrmi.server.impl.ServerStreamReadWriter;
+import org.apache.excalibur.altrmi.server.impl.AbstractServerStreamReadWriter;
import org.apache.excalibur.altrmi.server.impl.adapters.InvocationHandlerAdapter;
import org.apache.excalibur.altrmi.common.AltrmiRuntimeException;
import org.apache.excalibur.altrmi.common.ThreadContext;
@@ -101,7 +101,7 @@
// see
http://developer.java.sun.com/developer/bugParade/bugs/4508149.html
sock.setSoTimeout( 36000 );
- ServerStreamReadWriter ssrw = createServerStreamReadWriter();
+ AbstractServerStreamReadWriter ssrw =
createServerStreamReadWriter();
ssrw.setStreams( sock.getInputStream(), sock.getOutputStream(),
sock );
@@ -187,5 +187,5 @@
* Create a Server Stream Read Writer.
* @return The Server Stream Read Writer.
*/
- protected abstract ServerStreamReadWriter createServerStreamReadWriter();
+ protected abstract AbstractServerStreamReadWriter
createServerStreamReadWriter();
}
1.9 +4 -4
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/socket/AbstractPartialSocketStreamServer.java
Index: AbstractPartialSocketStreamServer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/socket/AbstractPartialSocketStreamServer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractPartialSocketStreamServer.java 2 Feb 2003 14:10:06 -0000 1.8
+++ AbstractPartialSocketStreamServer.java 5 Feb 2003 00:55:23 -0000 1.9
@@ -4,7 +4,7 @@
import java.net.Socket;
import java.net.SocketException;
import org.apache.excalibur.altrmi.server.impl.AbstractServer;
-import org.apache.excalibur.altrmi.server.impl.ServerStreamReadWriter;
+import org.apache.excalibur.altrmi.server.impl.AbstractServerStreamReadWriter;
import org.apache.excalibur.altrmi.server.impl.adapters.InvocationHandlerAdapter;
/**
@@ -55,7 +55,7 @@
{
if( getState() == STARTED )
{
- ServerStreamReadWriter ssrw = createServerStreamReadWriter();
+ AbstractServerStreamReadWriter ssrw =
createServerStreamReadWriter();
ssrw.setStreams( socket.getInputStream(), socket.getOutputStream(),
socket );
@@ -78,7 +78,7 @@
* Create a Server Stream Read Writer.
* @return The Server Stream Read Writer.
*/
- protected abstract ServerStreamReadWriter createServerStreamReadWriter();
+ protected abstract AbstractServerStreamReadWriter
createServerStreamReadWriter();
/**
* Method start
1.8 +3 -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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CompleteSocketCustomStreamServer.java 5 Jan 2003 23:24:54 -0000 1.7
+++ CompleteSocketCustomStreamServer.java 5 Feb 2003 00:55:23 -0000 1.8
@@ -9,7 +9,7 @@
import org.apache.excalibur.altrmi.server.ServerException;
import org.apache.excalibur.altrmi.server.impl.ServerCustomStreamReadWriter;
-import org.apache.excalibur.altrmi.server.impl.ServerStreamReadWriter;
+import org.apache.excalibur.altrmi.server.impl.AbstractServerStreamReadWriter;
import org.apache.excalibur.altrmi.server.impl.adapters.InvocationHandlerAdapter;
import org.apache.excalibur.altrmi.common.RegistryHelper;
@@ -62,7 +62,7 @@
* Create a Server Stream Read Writer.
* @return The Server Stream Read Writer.
*/
- protected ServerStreamReadWriter createServerStreamReadWriter()
+ protected AbstractServerStreamReadWriter createServerStreamReadWriter()
{
return new ServerCustomStreamReadWriter();
}
1.5 +3 -3
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CompleteSocketObjectStreamServer.java 5 Jan 2003 23:24:54 -0000 1.4
+++ CompleteSocketObjectStreamServer.java 5 Feb 2003 00:55:23 -0000 1.5
@@ -9,7 +9,7 @@
import org.apache.excalibur.altrmi.server.ServerException;
import org.apache.excalibur.altrmi.server.impl.ServerObjectStreamReadWriter;
-import org.apache.excalibur.altrmi.server.impl.ServerStreamReadWriter;
+import org.apache.excalibur.altrmi.server.impl.AbstractServerStreamReadWriter;
/**
* Class CompleteSocketObjectStreamServer
@@ -70,7 +70,7 @@
* Create a Server Stream Read Writer.
* @return The Server Stream Read Writer.
*/
- protected ServerStreamReadWriter createServerStreamReadWriter()
+ protected AbstractServerStreamReadWriter createServerStreamReadWriter()
{
return new ServerObjectStreamReadWriter( m_objectOutputStreamClassName,
m_objectInputStreamClassName );
1.9 +3 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/socket/PartialSocketCustomStreamServer.java
Index: PartialSocketCustomStreamServer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/socket/PartialSocketCustomStreamServer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PartialSocketCustomStreamServer.java 5 Jan 2003 23:24:54 -0000 1.8
+++ PartialSocketCustomStreamServer.java 5 Feb 2003 00:55:23 -0000 1.9
@@ -8,7 +8,7 @@
package org.apache.excalibur.altrmi.server.impl.socket;
import org.apache.excalibur.altrmi.server.impl.ServerCustomStreamReadWriter;
-import org.apache.excalibur.altrmi.server.impl.ServerStreamReadWriter;
+import org.apache.excalibur.altrmi.server.impl.AbstractServerStreamReadWriter;
import org.apache.excalibur.altrmi.server.impl.adapters.InvocationHandlerAdapter;
import org.apache.excalibur.altrmi.server.ServerException;
import org.apache.excalibur.altrmi.common.RegistryHelper;
@@ -66,7 +66,7 @@
* Create a Server Stream Read Writer.
* @return The Server Stream Read Writer.
*/
- protected ServerStreamReadWriter createServerStreamReadWriter()
+ protected AbstractServerStreamReadWriter createServerStreamReadWriter()
{
return new ServerCustomStreamReadWriter();
}
1.9 +3 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/socket/PartialSocketObjectStreamServer.java
Index: PartialSocketObjectStreamServer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/socket/PartialSocketObjectStreamServer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PartialSocketObjectStreamServer.java 5 Jan 2003 23:24:54 -0000 1.8
+++ PartialSocketObjectStreamServer.java 5 Feb 2003 00:55:23 -0000 1.9
@@ -8,7 +8,7 @@
package org.apache.excalibur.altrmi.server.impl.socket;
import org.apache.excalibur.altrmi.server.impl.ServerObjectStreamReadWriter;
-import org.apache.excalibur.altrmi.server.impl.ServerStreamReadWriter;
+import org.apache.excalibur.altrmi.server.impl.AbstractServerStreamReadWriter;
import org.apache.excalibur.altrmi.server.impl.adapters.InvocationHandlerAdapter;
import org.apache.excalibur.altrmi.server.ServerException;
import org.apache.excalibur.altrmi.common.RegistryHelper;
@@ -68,7 +68,7 @@
* Create a Server Stream Read Writer.
* @return The Server Stream Read Writer.
*/
- protected ServerStreamReadWriter createServerStreamReadWriter()
+ protected AbstractServerStreamReadWriter createServerStreamReadWriter()
{
return new ServerObjectStreamReadWriter();
}
1.6 +3 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/socket/SocketStreamServerConnection.java
Index: SocketStreamServerConnection.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/socket/SocketStreamServerConnection.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SocketStreamServerConnection.java 19 Jan 2003 11:10:01 -0000 1.5
+++ SocketStreamServerConnection.java 5 Feb 2003 00:55:23 -0000 1.6
@@ -10,7 +10,7 @@
import java.io.IOException;
import java.net.Socket;
import org.apache.excalibur.altrmi.server.impl.AbstractServer;
-import org.apache.excalibur.altrmi.server.impl.ServerStreamReadWriter;
+import org.apache.excalibur.altrmi.server.impl.AbstractServerStreamReadWriter;
import org.apache.excalibur.altrmi.server.impl.StreamServerConnection;
/**
@@ -35,7 +35,7 @@
* @param readWriter The readWriter for the transport type
*/
public SocketStreamServerConnection(
- final AbstractServer abstractServer, final Socket
socket,ServerStreamReadWriter readWriter )
+ final AbstractServer abstractServer, final Socket
socket,AbstractServerStreamReadWriter readWriter )
{
super( abstractServer, readWriter );
1.14 +3 -1
jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/socket/CallbackEnabledCustomStreamTestCase.java
Index: CallbackEnabledCustomStreamTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/socket/CallbackEnabledCustomStreamTestCase.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- CallbackEnabledCustomStreamTestCase.java 5 Feb 2003 00:28:55 -0000 1.13
+++ CallbackEnabledCustomStreamTestCase.java 5 Feb 2003 00:55:23 -0000 1.14
@@ -24,6 +24,8 @@
import org.apache.excalibur.altrmi.common.Request;
import org.apache.excalibur.altrmi.common.InvocationException;
import org.apache.avalon.framework.logger.ConsoleLogger;
+import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.logger.NullLogger;
import java.util.HashMap;
import java.io.IOException;
@@ -52,7 +54,7 @@
PublicationDescription pd = new PublicationDescription(TestInterface.class,
new Class[] { TestInterface3.class, TestInterface2.class });
server.publish(testServer, "Hello", pd);
- server.setServerMonitor(new LogEnabledServerMonitor(new ConsoleLogger()));
+ server.setServerMonitor(new LogEnabledServerMonitor(new NullLogger()));
server.start();
// Client side setup
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
