hammant 2003/01/05 15:24:27
Modified: altrmi/src/java/org/apache/excalibur/altrmi/client/impl/piped
PipedObjectStreamHostContext.java
PipedObjectStreamInvocationHandler.java
altrmi/src/java/org/apache/excalibur/altrmi/client/impl/rmi
RmiFactoryHelper.java RmiHostContext.java
RmiInvocationHandler.java
altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket
AbstractSocketStreamInvocationHandler.java
AbstractSocketStreamSSHInvocationHandler.java
SocketCustomStreamFactoryHelper.java
SocketCustomStreamHostContext.java
SocketCustomStreamInvocationHandler.java
SocketCustomStreamSSHHostContext.java
SocketCustomStreamSSHInvocationHandler.java
SocketObjectStreamFactoryHelper.java
SocketObjectStreamHostContext.java
SocketObjectStreamInvocationHandler.java
SocketObjectStreamSSHHostContext.java
SocketObjectStreamSSHInvocationHandler.java
altrmi/src/java/org/apache/excalibur/altrmi/client/impl/stream
ClientCustomStreamReadWriter.java
ClientObjectStreamReadWriter.java
StreamInvocationHandler.java
altrmi/src/java/org/apache/excalibur/altrmi/client/impl/subscriber
AbstractAltrmiInterfaceLookupFactory.java
AbstractSubscriberImpl.java
AltrmiInterfaceLookupWrapper.java
CallbackEnabledCustomSocketStreamInterfaceLookupFactory.java
RmiInterfaceLookupFactory.java
SocketObjectStreamInterfaceLookupFactory.java
altrmi/src/java/org/apache/excalibur/altrmi/common
BadConnectionException.java ClassReply.java
ClassRequest.java ClassRetrievalFailedReply.java
ConnectionRefusedException.java
EndConnectionReply.java ExceptionReply.java
GarbageCollectionReply.java
GarbageCollectionRequest.java
KeyAuthentication.java ListMethodsReply.java
ListMethodsRequest.java ListReply.java
ListRequest.java LookupReply.java
LookupRequest.java MethodAsyncRequest.java
MethodFacadeArrayReply.java
Log:
More renames. AltrMI purged as prefix in 90% of cases.
Revision Changes Path
1.6 +6 -6
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/piped/PipedObjectStreamHostContext.java
Index: PipedObjectStreamHostContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/piped/PipedObjectStreamHostContext.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PipedObjectStreamHostContext.java 4 Jan 2003 22:17:18 -0000 1.5
+++ PipedObjectStreamHostContext.java 5 Jan 2003 23:24:23 -0000 1.6
@@ -11,7 +11,7 @@
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
import org.apache.excalibur.altrmi.client.impl.AbstractHostContext;
-import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
+import org.apache.excalibur.altrmi.common.ConnectionException;
/**
* Class PipedObjectStreamHostContext
@@ -31,12 +31,12 @@
* @param inputStream
* @param outputStream
*
- * @throws AltrmiConnectionException
+ * @throws ConnectionException
*
*/
public PipedObjectStreamHostContext( PipedInputStream inputStream,
PipedOutputStream outputStream )
- throws AltrmiConnectionException
+ throws ConnectionException
{
super( new PipedObjectStreamInvocationHandler( inputStream,
outputStream ) );
}
@@ -45,10 +45,10 @@
* Method initialize
*
*
- * @throws AltrmiConnectionException If a problem
+ * @throws ConnectionException If a problem
*
*/
- public void initialize() throws AltrmiConnectionException
+ public void initialize() throws ConnectionException
{
(
(PipedObjectStreamInvocationHandler)m_altrmiClientInvocationHandler
).initialize();
}
1.5 +7 -7
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/piped/PipedObjectStreamInvocationHandler.java
Index: PipedObjectStreamInvocationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/piped/PipedObjectStreamInvocationHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PipedObjectStreamInvocationHandler.java 13 Dec 2002 00:09:13 -0000
1.4
+++ PipedObjectStreamInvocationHandler.java 5 Jan 2003 23:24:23 -0000
1.5
@@ -14,7 +14,7 @@
import java.io.PipedOutputStream;
import
org.apache.excalibur.altrmi.client.impl.stream.ClientObjectStreamReadWriter;
import org.apache.excalibur.altrmi.client.impl.ClientStreamReadWriter;
-import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
+import org.apache.excalibur.altrmi.common.ConnectionException;
/**
* Class PipedObjectStreamInvocationHandler
@@ -33,11 +33,11 @@
* @param is
* @param os
*
- * @throws AltrmiConnectionException
+ * @throws ConnectionException
*
*/
public PipedObjectStreamInvocationHandler( PipedInputStream is,
PipedOutputStream os )
- throws AltrmiConnectionException
+ throws ConnectionException
{
super( is, os,
PipedObjectStreamInvocationHandler.class.getClassLoader() );
}
@@ -50,18 +50,18 @@
* @param os
* @param interfacesClassLoader
*
- * @throws AltrmiConnectionException
+ * @throws ConnectionException
*
*/
public PipedObjectStreamInvocationHandler(
PipedInputStream is, PipedOutputStream os, ClassLoader
interfacesClassLoader )
- throws AltrmiConnectionException
+ throws ConnectionException
{
super( is, os, interfacesClassLoader );
}
protected ClientStreamReadWriter createClientStreamReadWriter(
- InputStream in, OutputStream out ) throws AltrmiConnectionException
+ InputStream in, OutputStream out ) throws ConnectionException
{
return new ClientObjectStreamReadWriter( in, out, null, null );
}
1.6 +3 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/rmi/RmiFactoryHelper.java
Index: RmiFactoryHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/rmi/RmiFactoryHelper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RmiFactoryHelper.java 5 Jan 2003 23:11:28 -0000 1.5
+++ RmiFactoryHelper.java 5 Jan 2003 23:24:23 -0000 1.6
@@ -12,7 +12,7 @@
import org.apache.excalibur.altrmi.client.HostContext;
import org.apache.excalibur.altrmi.client.InterfaceLookup;
import org.apache.excalibur.altrmi.client.impl.AbstractFactoryHelper;
-import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
+import org.apache.excalibur.altrmi.common.ConnectionException;
/**
* Class RmiFactoryHelper
@@ -39,7 +39,7 @@
*/
public InterfaceLookup getAltrmiInterfaceLookup(
String factoryString, ClassLoader interfacesClassLoader, boolean
optimize )
- throws AltrmiConnectionException
+ throws ConnectionException
{
// TODO maybe we should cache these. Or the abstract parent class
should.
1.3 +4 -4
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/rmi/RmiHostContext.java
Index: RmiHostContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/rmi/RmiHostContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RmiHostContext.java 24 Apr 2002 12:42:57 -0000 1.2
+++ RmiHostContext.java 5 Jan 2003 23:24:23 -0000 1.3
@@ -8,7 +8,7 @@
package org.apache.excalibur.altrmi.client.impl.rmi;
import org.apache.excalibur.altrmi.client.impl.AbstractHostContext;
-import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
+import org.apache.excalibur.altrmi.common.ConnectionException;
/**
* Class RmiHostContext
@@ -29,10 +29,10 @@
* @param host
* @param port
*
- * @throws AltrmiConnectionException
+ * @throws ConnectionException
*
*/
- public RmiHostContext( String host, int port ) throws
AltrmiConnectionException
+ public RmiHostContext( String host, int port ) throws ConnectionException
{
super( new RmiInvocationHandler( host, port ) );
}
1.11 +15 -15
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/rmi/RmiInvocationHandler.java
Index: RmiInvocationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/rmi/RmiInvocationHandler.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- RmiInvocationHandler.java 5 Jan 2003 23:11:28 -0000 1.10
+++ RmiInvocationHandler.java 5 Jan 2003 23:24:23 -0000 1.11
@@ -15,10 +15,10 @@
import java.rmi.RemoteException;
import org.apache.excalibur.altrmi.client.ConnectionListener;
import
org.apache.excalibur.altrmi.client.impl.AbstractClientInvocationHandler;
-import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
-import org.apache.excalibur.altrmi.common.AltrmiInvocationException;
-import org.apache.excalibur.altrmi.common.AltrmiReply;
-import org.apache.excalibur.altrmi.common.AltrmiRequest;
+import org.apache.excalibur.altrmi.common.ConnectionException;
+import org.apache.excalibur.altrmi.common.InvocationException;
+import org.apache.excalibur.altrmi.common.Reply;
+import org.apache.excalibur.altrmi.common.Request;
import org.apache.excalibur.altrmi.common.MethodRequest;
import org.apache.excalibur.altrmi.common.NoSuchReferenceException;
import org.apache.excalibur.altrmi.common.NoSuchReferenceReply;
@@ -27,7 +27,7 @@
import org.apache.excalibur.altrmi.common.PublishedNameRequest;
import org.apache.excalibur.altrmi.common.RmiAltrmiInvocationHandler;
import org.apache.excalibur.altrmi.common.TryLaterReply;
-import org.apache.excalibur.altrmi.common.AltrmiRequestConstants;
+import org.apache.excalibur.altrmi.common.RequestConstants;
import org.apache.excalibur.altrmi.common.BadConnectionException;
/**
@@ -52,10 +52,10 @@
* @param host
* @param port
*
- * @throws AltrmiConnectionException
+ * @throws ConnectionException
*
*/
- public RmiInvocationHandler( String host, int port ) throws
AltrmiConnectionException
+ public RmiInvocationHandler( String host, int port ) throws
ConnectionException
{
m_URL = "rmi://" + host + ":" + port + "/" +
RmiAltrmiInvocationHandler.class.getName();
@@ -66,12 +66,12 @@
}
catch( NotBoundException nbe )
{
- throw new AltrmiConnectionException(
+ throw new ConnectionException(
"Cannot bind to the remote RMI service. Either an IP or RMI
issue." );
}
catch( MalformedURLException mfue )
{
- throw new AltrmiConnectionException( "Malformed URL, host/port
(" + host + "/" + port
+ throw new ConnectionException( "Malformed URL, host/port (" +
host + "/" + port
+ ") must be wrong: " +
mfue.getMessage() );
}
catch( ConnectIOException cioe )
@@ -81,7 +81,7 @@
}
catch( RemoteException re )
{
- throw new AltrmiConnectionException( "Unknown Remote Exception :
" + re.getMessage() );
+ throw new ConnectionException( "Unknown Remote Exception : " +
re.getMessage() );
}
}
@@ -130,16 +130,16 @@
* @return
*
*/
- public synchronized AltrmiReply handleInvocation( AltrmiRequest request )
+ public synchronized Reply handleInvocation( Request request )
{
- if( request.getRequestCode() != AltrmiRequestConstants.PINGREQUEST )
+ if( request.getRequestCode() != RequestConstants.PINGREQUEST )
{
m_lastRealRequest = System.currentTimeMillis();
}
boolean again = true;
- AltrmiReply reply = null;
+ Reply reply = null;
int tries = 0;
long start = 0;
@@ -199,7 +199,7 @@
}
else
{
- throw new AltrmiInvocationException( "Unknown RMI
problem : "
+ throw new InvocationException( "Unknown RMI problem : "
+ re.getMessage() );
}
}
1.7 +7 -7
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/AbstractSocketStreamInvocationHandler.java
Index: AbstractSocketStreamInvocationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/AbstractSocketStreamInvocationHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractSocketStreamInvocationHandler.java 4 Jan 2003 22:17:19
-0000 1.6
+++ AbstractSocketStreamInvocationHandler.java 5 Jan 2003 23:24:23
-0000 1.7
@@ -13,7 +13,7 @@
import java.net.Socket;
import org.apache.excalibur.altrmi.client.impl.ClientStreamReadWriter;
import
org.apache.excalibur.altrmi.client.impl.stream.StreamInvocationHandler;
-import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
+import org.apache.excalibur.altrmi.common.ConnectionException;
import org.apache.excalibur.altrmi.common.ConnectionRefusedException;
/**
@@ -37,11 +37,11 @@
* @param port The port to conenct to
* @param classLoader The class loader
*
- * @throws AltrmiConnectionException If a problem connecting
+ * @throws ConnectionException If a problem connecting
*
*/
public AbstractSocketStreamInvocationHandler( String host, int port,
ClassLoader classLoader )
- throws AltrmiConnectionException
+ throws ConnectionException
{
super( classLoader );
@@ -62,7 +62,7 @@
{
throw new ConnectionRefusedException("Connection to port
"+port+" on host "+host+" refused.");
}
- throw new AltrmiConnectionException( "Cannot open Stream(s) for
socket: "
+ throw new ConnectionException( "Cannot open Stream(s) for
socket: "
+ ioe.getMessage() );
}
}
@@ -85,7 +85,7 @@
return true;
}
- catch( AltrmiConnectionException ce )
+ catch( ConnectionException ce )
{
// TODO log ?
return false;
@@ -113,5 +113,5 @@
}
protected abstract ClientStreamReadWriter createClientStreamReadWriter(
- InputStream in, OutputStream out ) throws AltrmiConnectionException;
+ InputStream in, OutputStream out ) throws ConnectionException;
}
1.3 +9 -9
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/AbstractSocketStreamSSHInvocationHandler.java
Index: AbstractSocketStreamSSHInvocationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/AbstractSocketStreamSSHInvocationHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractSocketStreamSSHInvocationHandler.java 5 Jan 2003 18:10:53
-0000 1.2
+++ AbstractSocketStreamSSHInvocationHandler.java 5 Jan 2003 23:24:23
-0000 1.3
@@ -14,7 +14,7 @@
import org.apache.excalibur.altrmi.client.impl.ClientStreamReadWriter;
import
org.apache.excalibur.altrmi.client.impl.stream.StreamInvocationHandler;
-import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
+import org.apache.excalibur.altrmi.common.ConnectionException;
import com.jcraft.jsch.JSch;
import com.jcraft.jsch.Session;
import com.jcraft.jsch.JSchException;
@@ -51,11 +51,11 @@
* @param password The password to use for SSH Authentication
* @param classLoader The class loader
*
- * @throws AltrmiConnectionException If a problem connecting
+ * @throws ConnectionException If a problem connecting
*
*/
public AbstractSocketStreamSSHInvocationHandler(String host, int port,
String userID, String password, ClassLoader classLoader)
- throws AltrmiConnectionException
+ throws ConnectionException
{
super(classLoader);
@@ -71,11 +71,11 @@
}
catch (IOException ioe)
{
- throw new AltrmiConnectionException("Some problem with
sockets.", ioe);
+ throw new ConnectionException("Some problem with sockets.", ioe);
}
catch (JSchException e)
{
- throw new AltrmiConnectionException("Cannot open SSH
Connection.", e);
+ throw new ConnectionException("Cannot open SSH Connection.", e);
}
}
@@ -94,7 +94,7 @@
connectToSSHAndPort();
return true;
}
- catch (AltrmiConnectionException ce)
+ catch (ConnectionException ce)
{
// TODO log ?
return false;
@@ -111,7 +111,7 @@
}
}
- private void connectToSSHAndPort() throws JSchException, IOException,
AltrmiConnectionException
+ private void connectToSSHAndPort() throws JSchException, IOException,
ConnectionException
{
JSch jsch = new JSch();
Session session = jsch.getSession(m_host, 22);
@@ -134,6 +134,6 @@
}
protected abstract ClientStreamReadWriter createClientStreamReadWriter(
- InputStream in, OutputStream out) throws
AltrmiConnectionException;
+ InputStream in, OutputStream out) throws ConnectionException;
}
1.8 +3 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/SocketCustomStreamFactoryHelper.java
Index: SocketCustomStreamFactoryHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/SocketCustomStreamFactoryHelper.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SocketCustomStreamFactoryHelper.java 5 Jan 2003 23:11:28 -0000
1.7
+++ SocketCustomStreamFactoryHelper.java 5 Jan 2003 23:24:23 -0000
1.8
@@ -11,7 +11,7 @@
import org.apache.excalibur.altrmi.client.HostContext;
import org.apache.excalibur.altrmi.client.InterfaceLookup;
import org.apache.excalibur.altrmi.client.impl.AbstractFactoryHelper;
-import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
+import org.apache.excalibur.altrmi.common.ConnectionException;
/**
* Class SocketCustomStreamFactoryHelper
@@ -38,7 +38,7 @@
*/
public InterfaceLookup getAltrmiInterfaceLookup(
String factoryString, ClassLoader interfacesClassLoader, boolean
optimize)
- throws AltrmiConnectionException
+ throws ConnectionException
{
// TODO maybe we should cache these. Or the abstract parent class
should.
1.7 +9 -9
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/SocketCustomStreamHostContext.java
Index: SocketCustomStreamHostContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/SocketCustomStreamHostContext.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SocketCustomStreamHostContext.java 4 Jan 2003 22:17:19 -0000
1.6
+++ SocketCustomStreamHostContext.java 5 Jan 2003 23:24:23 -0000
1.7
@@ -10,7 +10,7 @@
import
org.apache.excalibur.altrmi.client.impl.piped.PipedCustomStreamHostContext;
import
org.apache.excalibur.altrmi.client.impl.AbstractSameVmBindableHostContext;
import org.apache.excalibur.altrmi.client.impl.AbstractHostContext;
-import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
+import org.apache.excalibur.altrmi.common.ConnectionException;
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
@@ -35,10 +35,10 @@
* @param host
* @param port
*
- * @throws AltrmiConnectionException
+ * @throws ConnectionException
*
*/
- public SocketCustomStreamHostContext( String host, int port ) throws
AltrmiConnectionException
+ public SocketCustomStreamHostContext( String host, int port ) throws
ConnectionException
{
super( new SocketCustomStreamInvocationHandler( host, port,
@@ -55,11 +55,11 @@
* @param port
* @param classLoader
*
- * @throws AltrmiConnectionException
+ * @throws ConnectionException
*
*/
public SocketCustomStreamHostContext( String host, int port, ClassLoader
classLoader )
- throws AltrmiConnectionException
+ throws ConnectionException
{
super( new SocketCustomStreamInvocationHandler( host, port,
classLoader ) );
m_port = port;
@@ -68,9 +68,9 @@
/**
* Make a HostContext for this using SameVM connections nstead of socket
based ones.
* @return the HostContext
- * @throws AltrmiConnectionException if a problem
+ * @throws ConnectionException if a problem
*/
- public AbstractHostContext makeSameVmHostContext() throws
AltrmiConnectionException
+ public AbstractHostContext makeSameVmHostContext() throws
ConnectionException
{
PipedInputStream in = new PipedInputStream();
PipedOutputStream out = new PipedOutputStream();
@@ -93,7 +93,7 @@
}
catch (Exception e)
{
- throw new AltrmiConnectionException("Naming exception during
bind :" + e.getMessage());
+ throw new ConnectionException("Naming exception during bind :" +
e.getMessage());
}
}
1.8 +6 -6
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/SocketCustomStreamInvocationHandler.java
Index: SocketCustomStreamInvocationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/SocketCustomStreamInvocationHandler.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SocketCustomStreamInvocationHandler.java 5 Jan 2003 11:41:40 -0000
1.7
+++ SocketCustomStreamInvocationHandler.java 5 Jan 2003 23:24:23 -0000
1.8
@@ -11,7 +11,7 @@
import java.io.OutputStream;
import
org.apache.excalibur.altrmi.client.impl.stream.ClientCustomStreamReadWriter;
import org.apache.excalibur.altrmi.client.impl.ClientStreamReadWriter;
-import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
+import org.apache.excalibur.altrmi.common.ConnectionException;
/**
* Class SocketCustomStreamInvocationHandler
@@ -32,11 +32,11 @@
* @param port the port
* @param classLoader the classloader for deserialization hints.
*
- * @throws AltrmiConnectionException if a problem
+ * @throws ConnectionException if a problem
*
*/
public SocketCustomStreamInvocationHandler( String host, int port,
ClassLoader classLoader )
- throws AltrmiConnectionException
+ throws ConnectionException
{
super( host, port, classLoader );
}
@@ -46,10 +46,10 @@
* @param in the input stream
* @param out the output stream
* @return the read/writer
- * @throws AltrmiConnectionException if a problem
+ * @throws ConnectionException if a problem
*/
protected ClientStreamReadWriter createClientStreamReadWriter(
- InputStream in, OutputStream out ) throws AltrmiConnectionException
+ InputStream in, OutputStream out ) throws ConnectionException
{
return new ClientCustomStreamReadWriter( in, out,
m_interfacesClassLoader );
}
1.3 +9 -9
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/SocketCustomStreamSSHHostContext.java
Index: SocketCustomStreamSSHHostContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/SocketCustomStreamSSHHostContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SocketCustomStreamSSHHostContext.java 5 Jan 2003 18:10:53 -0000
1.2
+++ SocketCustomStreamSSHHostContext.java 5 Jan 2003 23:24:23 -0000
1.3
@@ -10,7 +10,7 @@
import
org.apache.excalibur.altrmi.client.impl.piped.PipedCustomStreamHostContext;
import
org.apache.excalibur.altrmi.client.impl.AbstractSameVmBindableHostContext;
import org.apache.excalibur.altrmi.client.impl.AbstractHostContext;
-import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
+import org.apache.excalibur.altrmi.common.ConnectionException;
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
@@ -37,10 +37,10 @@
* @param userID The user ID to use for the SSH authentiaction
* @param password The password to use for SSH Authentication
*
- * @throws AltrmiConnectionException
+ * @throws ConnectionException
*
*/
- public SocketCustomStreamSSHHostContext( String host, int port, String
userID, String password ) throws AltrmiConnectionException
+ public SocketCustomStreamSSHHostContext( String host, int port, String
userID, String password ) throws ConnectionException
{
super( new SocketCustomStreamSSHInvocationHandler( host, port,
userID, password,
@@ -59,11 +59,11 @@
* @param password The password to use for SSH Authentication
* @param classLoader
*
- * @throws AltrmiConnectionException
+ * @throws ConnectionException
*
*/
public SocketCustomStreamSSHHostContext( String host, int port, String
userID, String password, ClassLoader classLoader )
- throws AltrmiConnectionException
+ throws ConnectionException
{
super( new SocketCustomStreamSSHInvocationHandler( host, port,
userID, password, classLoader ) );
m_port = port;
@@ -72,9 +72,9 @@
/**
* Make a HostContext for this using SameVM connections nstead of socket
based ones.
* @return the HostContext
- * @throws AltrmiConnectionException if a problem
+ * @throws ConnectionException if a problem
*/
- public AbstractHostContext makeSameVmHostContext() throws
AltrmiConnectionException
+ public AbstractHostContext makeSameVmHostContext() throws
ConnectionException
{
PipedInputStream in = new PipedInputStream();
PipedOutputStream out = new PipedOutputStream();
@@ -97,7 +97,7 @@
}
catch (Exception e)
{
- throw new AltrmiConnectionException("Naming exception during
bind :" + e.getMessage());
+ throw new ConnectionException("Naming exception during bind :" +
e.getMessage());
}
}
1.3 +6 -6
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/SocketCustomStreamSSHInvocationHandler.java
Index: SocketCustomStreamSSHInvocationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/SocketCustomStreamSSHInvocationHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SocketCustomStreamSSHInvocationHandler.java 5 Jan 2003 18:10:53
-0000 1.2
+++ SocketCustomStreamSSHInvocationHandler.java 5 Jan 2003 23:24:23
-0000 1.3
@@ -11,7 +11,7 @@
import java.io.OutputStream;
import
org.apache.excalibur.altrmi.client.impl.stream.ClientCustomStreamReadWriter;
import org.apache.excalibur.altrmi.client.impl.ClientStreamReadWriter;
-import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
+import org.apache.excalibur.altrmi.common.ConnectionException;
/**
* Class SocketCustomStreamSSHInvocationHandler
@@ -34,12 +34,12 @@
* @param password The password to use for SSH Authentication
* @param classLoader the classloader for deserialization hints.
*
- * @throws AltrmiConnectionException if a problem
+ * @throws ConnectionException if a problem
*
*/
public SocketCustomStreamSSHInvocationHandler( String host, int port,
String userID,
String password,
ClassLoader classLoader )
- throws AltrmiConnectionException
+ throws ConnectionException
{
super( host, port, userID, password, classLoader );
}
@@ -49,10 +49,10 @@
* @param in the input stream
* @param out the output stream
* @return the read/writer
- * @throws AltrmiConnectionException if a problem
+ * @throws ConnectionException if a problem
*/
protected ClientStreamReadWriter createClientStreamReadWriter(
- InputStream in, OutputStream out ) throws AltrmiConnectionException
+ InputStream in, OutputStream out ) throws ConnectionException
{
return new ClientCustomStreamReadWriter( in, out,
m_interfacesClassLoader );
}
1.7 +3 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/SocketObjectStreamFactoryHelper.java
Index: SocketObjectStreamFactoryHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/SocketObjectStreamFactoryHelper.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SocketObjectStreamFactoryHelper.java 5 Jan 2003 23:11:28 -0000
1.6
+++ SocketObjectStreamFactoryHelper.java 5 Jan 2003 23:24:23 -0000
1.7
@@ -11,7 +11,7 @@
import org.apache.excalibur.altrmi.client.HostContext;
import org.apache.excalibur.altrmi.client.InterfaceLookup;
import org.apache.excalibur.altrmi.client.impl.AbstractFactoryHelper;
-import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
+import org.apache.excalibur.altrmi.common.ConnectionException;
/**
* Class SocketObjectStreamFactoryHelper
@@ -38,7 +38,7 @@
*/
public InterfaceLookup getAltrmiInterfaceLookup(
String factoryString, ClassLoader interfacesClassLoader, boolean
optimize )
- throws AltrmiConnectionException
+ throws ConnectionException
{
// TODO maybe we should cache these. Or the abstract parent class
should.
1.8 +13 -13
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/SocketObjectStreamHostContext.java
Index: SocketObjectStreamHostContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/SocketObjectStreamHostContext.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SocketObjectStreamHostContext.java 5 Jan 2003 11:41:40 -0000
1.7
+++ SocketObjectStreamHostContext.java 5 Jan 2003 23:24:23 -0000
1.8
@@ -10,7 +10,7 @@
import org.apache.excalibur.altrmi.client.impl.AbstractHostContext;
import
org.apache.excalibur.altrmi.client.impl.AbstractSameVmBindableHostContext;
import
org.apache.excalibur.altrmi.client.impl.piped.PipedObjectStreamHostContext;
-import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
+import org.apache.excalibur.altrmi.common.ConnectionException;
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
@@ -37,10 +37,10 @@
* @param host
* @param port
*
- * @throws AltrmiConnectionException
+ * @throws ConnectionException
*
*/
- public SocketObjectStreamHostContext( String host, int port ) throws
AltrmiConnectionException
+ public SocketObjectStreamHostContext( String host, int port ) throws
ConnectionException
{
super( new SocketObjectStreamInvocationHandler( host, port, null,
null,
@@ -57,11 +57,11 @@
* @param port
* @param classLoader
*
- * @throws AltrmiConnectionException
+ * @throws ConnectionException
*
*/
public SocketObjectStreamHostContext( String host, int port, ClassLoader
classLoader )
- throws AltrmiConnectionException
+ throws ConnectionException
{
super( new SocketObjectStreamInvocationHandler( host, port, null,
null, classLoader ) );
m_port = port;
@@ -76,12 +76,12 @@
* @param objectInputStreamClassName
* @param objectOutputStreamClassName
*
- * @throws AltrmiConnectionException
+ * @throws ConnectionException
*
*/
public SocketObjectStreamHostContext(
String host, int port, String objectInputStreamClassName, String
objectOutputStreamClassName )
- throws AltrmiConnectionException
+ throws ConnectionException
{
super( new SocketObjectStreamInvocationHandler( host, port,
objectInputStreamClassName,
@@ -101,12 +101,12 @@
* @param objectOutputStreamClassName
* @param classLoader
*
- * @throws AltrmiConnectionException
+ * @throws ConnectionException
*
*/
public SocketObjectStreamHostContext(
String host, int port, String objectInputStreamClassName, String
objectOutputStreamClassName, ClassLoader classLoader )
- throws AltrmiConnectionException
+ throws ConnectionException
{
super( new SocketObjectStreamInvocationHandler( host, port,
objectInputStreamClassName,
objectOutputStreamClassName, classLoader ) );
@@ -116,9 +116,9 @@
/**
* Make a HostContext for this using SameVM connections nstead of socket
based ones.
* @return the HostContext
- * @throws AltrmiConnectionException if a problem
+ * @throws ConnectionException if a problem
*/
- public AbstractHostContext makeSameVmHostContext() throws
AltrmiConnectionException
+ public AbstractHostContext makeSameVmHostContext() throws
ConnectionException
{
PipedInputStream in = new PipedInputStream();
PipedOutputStream out = new PipedOutputStream();
@@ -141,7 +141,7 @@
}
catch (Exception e)
{
- throw new AltrmiConnectionException("Naming exception during
bind :" + e.getMessage());
+ throw new ConnectionException("Naming exception during bind :" +
e.getMessage());
}
}
1.8 +6 -6
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/SocketObjectStreamInvocationHandler.java
Index: SocketObjectStreamInvocationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/SocketObjectStreamInvocationHandler.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SocketObjectStreamInvocationHandler.java 5 Jan 2003 11:41:40 -0000
1.7
+++ SocketObjectStreamInvocationHandler.java 5 Jan 2003 23:24:23 -0000
1.8
@@ -11,7 +11,7 @@
import java.io.OutputStream;
import
org.apache.excalibur.altrmi.client.impl.stream.ClientObjectStreamReadWriter;
import org.apache.excalibur.altrmi.client.impl.ClientStreamReadWriter;
-import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
+import org.apache.excalibur.altrmi.common.ConnectionException;
/**
* Class SocketObjectStreamInvocationHandler
@@ -37,12 +37,12 @@
* @param objectOutputStreamClassName a classname for the output stream
* @param classLoader a classloader for deserialization hints.
*
- * @throws AltrmiConnectionException if a problem
+ * @throws ConnectionException if a problem
*
*/
public SocketObjectStreamInvocationHandler(
String host, int port, String objectInputStreamClassName, String
objectOutputStreamClassName, ClassLoader classLoader )
- throws AltrmiConnectionException
+ throws ConnectionException
{
super( host, port, classLoader );
@@ -58,10 +58,10 @@
* @param in the input stream
* @param out the output stream
* @return the read/writer
- * @throws AltrmiConnectionException if a problem
+ * @throws ConnectionException if a problem
*/
protected ClientStreamReadWriter createClientStreamReadWriter(
- InputStream in, OutputStream out ) throws AltrmiConnectionException
+ InputStream in, OutputStream out ) throws ConnectionException
{
return new ClientObjectStreamReadWriter( in, out,
m_objectOutputStreamClassName,
m_objectInputStreamClassName );
1.2 +10 -10
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/SocketObjectStreamSSHHostContext.java
Index: SocketObjectStreamSSHHostContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/SocketObjectStreamSSHHostContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SocketObjectStreamSSHHostContext.java 5 Jan 2003 18:10:53 -0000
1.1
+++ SocketObjectStreamSSHHostContext.java 5 Jan 2003 23:24:23 -0000
1.2
@@ -10,7 +10,7 @@
import
org.apache.excalibur.altrmi.client.impl.piped.PipedCustomStreamHostContext;
import
org.apache.excalibur.altrmi.client.impl.AbstractSameVmBindableHostContext;
import org.apache.excalibur.altrmi.client.impl.AbstractHostContext;
-import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
+import org.apache.excalibur.altrmi.common.ConnectionException;
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
@@ -37,10 +37,10 @@
* @param userID The user ID to use for the SSH authentiaction
* @param password The password to use for SSH Authentication
*
- * @throws AltrmiConnectionException
+ * @throws ConnectionException
*
*/
- public SocketObjectStreamSSHHostContext( String host, int port, String
userID, String password ) throws AltrmiConnectionException
+ public SocketObjectStreamSSHHostContext( String host, int port, String
userID, String password ) throws ConnectionException
{
this(host, port, userID, password, "java.io.ObjectInputStream",
"java.io.ObjectOutputStream");
}
@@ -56,11 +56,11 @@
* @param objectInputStreamClassName
* @param objectOutputStreamClassName
*
- * @throws AltrmiConnectionException
+ * @throws ConnectionException
*
*/
public SocketObjectStreamSSHHostContext( String host, int port, String
userID, String password,
- String objectInputStreamClassName, String
objectOutputStreamClassName) throws AltrmiConnectionException
+ String objectInputStreamClassName, String
objectOutputStreamClassName) throws ConnectionException
{
super( new SocketObjectStreamSSHInvocationHandler( host, port,
userID, password,
@@ -83,12 +83,12 @@
* @param objectOutputStreamClassName
* @param classLoader
*
- * @throws AltrmiConnectionException
+ * @throws ConnectionException
*
*/
public SocketObjectStreamSSHHostContext( String host, int port, String
userID, String password,
String objectInputStreamClassName, String
objectOutputStreamClassName, ClassLoader classLoader )
- throws AltrmiConnectionException
+ throws ConnectionException
{
super( new SocketObjectStreamSSHInvocationHandler( host, port,
userID, password,
objectInputStreamClassName, objectOutputStreamClassName,
classLoader ) );
@@ -98,9 +98,9 @@
/**
* Make a HostContext for this using SameVM connections nstead of socket
based ones.
* @return the HostContext
- * @throws AltrmiConnectionException if a problem
+ * @throws ConnectionException if a problem
*/
- public AbstractHostContext makeSameVmHostContext() throws
AltrmiConnectionException
+ public AbstractHostContext makeSameVmHostContext() throws
ConnectionException
{
PipedInputStream in = new PipedInputStream();
PipedOutputStream out = new PipedOutputStream();
@@ -123,7 +123,7 @@
}
catch (Exception e)
{
- throw new AltrmiConnectionException("Naming exception during
bind :" + e.getMessage());
+ throw new ConnectionException("Naming exception during bind :" +
e.getMessage());
}
}
1.2 +5 -5
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/SocketObjectStreamSSHInvocationHandler.java
Index: SocketObjectStreamSSHInvocationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/SocketObjectStreamSSHInvocationHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SocketObjectStreamSSHInvocationHandler.java 5 Jan 2003 18:10:53
-0000 1.1
+++ SocketObjectStreamSSHInvocationHandler.java 5 Jan 2003 23:24:23
-0000 1.2
@@ -11,7 +11,7 @@
import java.io.OutputStream;
import
org.apache.excalibur.altrmi.client.impl.stream.ClientObjectStreamReadWriter;
import org.apache.excalibur.altrmi.client.impl.ClientStreamReadWriter;
-import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
+import org.apache.excalibur.altrmi.common.ConnectionException;
/**
* Class SocketObjectStreamSSHInvocationHandler
@@ -38,14 +38,14 @@
* @param objectOutputStreamClassName
* @param classLoader the classloader for deserialization hints.
*
- * @throws AltrmiConnectionException if a problem
+ * @throws ConnectionException if a problem
*
*/
public SocketObjectStreamSSHInvocationHandler( String host, int port,
String userID,
String password,
String
objectInputStreamClassName, String objectOutputStreamClassName,
ClassLoader classLoader )
- throws AltrmiConnectionException
+ throws ConnectionException
{
super( host, port, userID, password, classLoader );
m_objectInputStreamClassName = objectInputStreamClassName;
@@ -57,10 +57,10 @@
* @param in the input stream
* @param out the output stream
* @return the read/writer
- * @throws AltrmiConnectionException if a problem
+ * @throws ConnectionException if a problem
*/
protected ClientStreamReadWriter createClientStreamReadWriter(
- InputStream in, OutputStream out ) throws AltrmiConnectionException
+ InputStream in, OutputStream out ) throws ConnectionException
{
//TODO pass on classloader and use it during deserialization (PH).
1.9 +11 -11
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/stream/ClientCustomStreamReadWriter.java
Index: ClientCustomStreamReadWriter.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/stream/ClientCustomStreamReadWriter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ClientCustomStreamReadWriter.java 4 Jan 2003 22:17:19 -0000 1.8
+++ ClientCustomStreamReadWriter.java 5 Jan 2003 23:24:24 -0000 1.9
@@ -13,10 +13,10 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import org.apache.excalibur.altrmi.common.AltrmiReply;
-import org.apache.excalibur.altrmi.common.AltrmiRequest;
+import org.apache.excalibur.altrmi.common.Reply;
+import org.apache.excalibur.altrmi.common.Request;
import org.apache.excalibur.altrmi.common.SerializationHelper;
-import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
+import org.apache.excalibur.altrmi.common.ConnectionException;
import org.apache.excalibur.altrmi.client.impl.ClientStreamReadWriter;
/**
@@ -43,12 +43,12 @@
* @param outputStream
* @param interfacesClassLoader
*
- * @throws AltrmiConnectionException
+ * @throws ConnectionException
*
*/
public ClientCustomStreamReadWriter(
InputStream inputStream, OutputStream outputStream, ClassLoader
interfacesClassLoader )
- throws AltrmiConnectionException
+ throws ConnectionException
{
m_dataOutputStream = new DataOutputStream( new BufferedOutputStream(
outputStream ) );
@@ -56,18 +56,18 @@
m_interfacesClassLoader = interfacesClassLoader;
}
- public synchronized AltrmiReply postRequest( AltrmiRequest altrmiRequest
)
+ public synchronized Reply postRequest( Request altrmiRequest )
throws IOException, ClassNotFoundException
{
writeRequest( altrmiRequest );
- AltrmiReply r = readReply();
+ Reply r = readReply();
return r;
}
- private void writeRequest( AltrmiRequest altrmiRequest ) throws
IOException
+ private void writeRequest( Request altrmiRequest ) throws IOException
{
byte[] aBytes = SerializationHelper.getBytesFromInstance(
altrmiRequest );
@@ -77,7 +77,7 @@
m_dataOutputStream.flush();
}
- private AltrmiReply readReply() throws IOException,
ClassNotFoundException
+ private Reply readReply() throws IOException, ClassNotFoundException
{
int byteArraySize = m_dataInputStream.readInt();
@@ -91,7 +91,7 @@
pos += read;
cnt++;
}
- return (AltrmiReply)SerializationHelper.getInstanceFromBytes(
byteArray,
+ return (Reply)SerializationHelper.getInstanceFromBytes( byteArray,
m_interfacesClassLoader );
}
}
1.9 +11 -11
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/stream/ClientObjectStreamReadWriter.java
Index: ClientObjectStreamReadWriter.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/stream/ClientObjectStreamReadWriter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ClientObjectStreamReadWriter.java 5 Jan 2003 18:10:53 -0000 1.8
+++ ClientObjectStreamReadWriter.java 5 Jan 2003 23:24:24 -0000 1.9
@@ -15,9 +15,9 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
-import org.apache.excalibur.altrmi.common.AltrmiReply;
-import org.apache.excalibur.altrmi.common.AltrmiRequest;
-import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
+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.BadConnectionException;
import org.apache.excalibur.altrmi.client.impl.ClientStreamReadWriter;
@@ -46,13 +46,13 @@
* @param objectOutputStreamClassName
* @param objectInputStreamClassName
*
- * @throws AltrmiConnectionException
+ * @throws ConnectionException
*
*/
public ClientObjectStreamReadWriter(
InputStream inputStream, OutputStream outputStream,
String objectOutputStreamClassName, String
objectInputStreamClassName)
- throws AltrmiConnectionException
+ throws ConnectionException
{
if( objectOutputStreamClassName != null )
@@ -84,12 +84,12 @@
{
e.printStackTrace();
- throw new AltrmiConnectionException( "Some problem instantiating
ObjectStream classes: "
+ throw new ConnectionException( "Some problem instantiating
ObjectStream classes: "
+ e.getMessage() );
}
}
- public synchronized AltrmiReply postRequest( AltrmiRequest altrmiRequest
)
+ public synchronized Reply postRequest( Request altrmiRequest )
throws IOException, ClassNotFoundException
{
@@ -98,7 +98,7 @@
return readReply();
}
- private void writeRequest( AltrmiRequest altrmiRequest ) throws
IOException
+ private void writeRequest( Request altrmiRequest ) throws IOException
{
m_objectOutputStream.writeObject( altrmiRequest );
@@ -107,8 +107,8 @@
//m_objectOutputStream.reset();
}
- private AltrmiReply readReply() throws IOException,
ClassNotFoundException
+ private Reply readReply() throws IOException, ClassNotFoundException
{
- return (AltrmiReply)m_objectInputStream.readObject();
+ return (Reply)m_objectInputStream.readObject();
}
}
1.14 +11 -11
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/stream/StreamInvocationHandler.java
Index: StreamInvocationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/stream/StreamInvocationHandler.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- StreamInvocationHandler.java 5 Jan 2003 23:11:28 -0000 1.13
+++ StreamInvocationHandler.java 5 Jan 2003 23:24:24 -0000 1.14
@@ -14,9 +14,9 @@
import org.apache.excalibur.altrmi.client.ConnectionListener;
import
org.apache.excalibur.altrmi.client.impl.AbstractClientInvocationHandler;
import org.apache.excalibur.altrmi.client.impl.ClientStreamReadWriter;
-import org.apache.excalibur.altrmi.common.AltrmiInvocationException;
-import org.apache.excalibur.altrmi.common.AltrmiReply;
-import org.apache.excalibur.altrmi.common.AltrmiRequest;
+import org.apache.excalibur.altrmi.common.InvocationException;
+import org.apache.excalibur.altrmi.common.Reply;
+import org.apache.excalibur.altrmi.common.Request;
import org.apache.excalibur.altrmi.common.MethodRequest;
import org.apache.excalibur.altrmi.common.NoSuchReferenceException;
import org.apache.excalibur.altrmi.common.NoSuchReferenceReply;
@@ -24,7 +24,7 @@
import org.apache.excalibur.altrmi.common.NotPublishedReply;
import org.apache.excalibur.altrmi.common.PublishedNameRequest;
import org.apache.excalibur.altrmi.common.TryLaterReply;
-import org.apache.excalibur.altrmi.common.AltrmiRequestConstants;
+import org.apache.excalibur.altrmi.common.RequestConstants;
/**
* Class StreamInvocationHandler
@@ -98,10 +98,10 @@
* @return
*
*/
- public synchronized AltrmiReply handleInvocation( AltrmiRequest request )
+ public synchronized Reply handleInvocation( Request request )
{
- if( request.getRequestCode() != AltrmiRequestConstants.PINGREQUEST )
+ if( request.getRequestCode() != RequestConstants.PINGREQUEST )
{
m_lastRealRequest = System.currentTimeMillis();
}
@@ -111,7 +111,7 @@
while( true )
{
boolean again = true;
- AltrmiReply reply = null;
+ Reply reply = null;
int tries = 0;
long start = 0;
@@ -130,7 +130,7 @@
{
long t1 = System.currentTimeMillis();
- reply = (AltrmiReply)m_objectReadWriter.postRequest(
request );
+ reply = (Reply)m_objectReadWriter.postRequest(
request );
long t2 = System.currentTimeMillis();
@@ -178,7 +178,7 @@
{
ioe.printStackTrace();
- throw new AltrmiInvocationException(
+ throw new InvocationException(
"IO Exception during invocation to server :"
+ ioe.getMessage() );
}
}
@@ -199,7 +199,7 @@
}
catch( ClassNotFoundException e )
{
- throw new AltrmiInvocationException( "Class definition missing
on Deserialization: "
+ throw new InvocationException( "Class definition missing on
Deserialization: "
+ e.getMessage() );
}
}
1.3 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/subscriber/AbstractAltrmiInterfaceLookupFactory.java
Index: AbstractAltrmiInterfaceLookupFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/subscriber/AbstractAltrmiInterfaceLookupFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractAltrmiInterfaceLookupFactory.java 5 Jan 2003 23:11:28 -0000
1.2
+++ AbstractAltrmiInterfaceLookupFactory.java 5 Jan 2003 23:24:25 -0000
1.3
@@ -19,7 +19,7 @@
import org.apache.excalibur.altrmi.client.impl.ClientClassAltrmiFactory;
import org.apache.excalibur.altrmi.client.impl.PerpetualConnectionPinger;
import org.apache.excalibur.altrmi.client.impl.ServerClassAltrmiFactory;
-import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
+import org.apache.excalibur.altrmi.common.ConnectionException;
/**
* Abstract base factory to create <code>InterfaceLookup</code> instances
for the
@@ -79,7 +79,7 @@
return new AltrmiInterfaceLookupWrapper( factory );
}
- protected abstract HostContext createHostContext() throws
AltrmiConnectionException;
+ protected abstract HostContext createHostContext() throws
ConnectionException;
public Class getCreatedClass()
{
1.3 +11 -11
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/subscriber/AbstractSubscriberImpl.java
Index: AbstractSubscriberImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/subscriber/AbstractSubscriberImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractSubscriberImpl.java 5 Jan 2003 23:11:28 -0000 1.2
+++ AbstractSubscriberImpl.java 5 Jan 2003 23:24:25 -0000 1.3
@@ -21,9 +21,9 @@
import org.apache.excalibur.altrmi.client.AbstractSubscriber;
import org.apache.excalibur.altrmi.client.InterfaceLookup;
import org.apache.excalibur.altrmi.client.LookupSource;
-import org.apache.excalibur.altrmi.common.AltrmiAuthentication;
-import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
-import org.apache.excalibur.altrmi.common.AltrmiInvocationException;
+import org.apache.excalibur.altrmi.common.Authentication;
+import org.apache.excalibur.altrmi.common.ConnectionException;
+import org.apache.excalibur.altrmi.common.InvocationException;
/**
* An abstract base class to be used in conjunction with
<code>AbstractSubscriber</code>
@@ -35,16 +35,16 @@
* {
* String ROLE = MyRemoteInterfaceSubscriber.class.getName();
*
- * MyRemoteInterface select( AltrmiAuthentication authentication )
- * throws AltrmiConnectionException;
+ * MyRemoteInterface select( Authentication authentication )
+ * throws ConnectionException;
* }
*
* public class MyRemoteInterfaceSubscriberImpl extends
AbstractSubscriberImpl
* implements MyRemoteInterfaceSubscriber
* {
*
- * public MyRemoteInterface select( AltrmiAuthentication authentication )
- * throws AltrmiConnectionException
+ * public MyRemoteInterface select( Authentication authentication )
+ * throws ConnectionException
* {
* return ( MyRemoteInterface ) lookup( authentication );
* }
@@ -54,12 +54,12 @@
* Alternatively, the <code>MyRemoteInterfaceSubscriberImpl.select</code>
could be written as
*
* <pre>
- * public MyRemoteInterface select( AltrmiAuthentication authentication )
+ * public MyRemoteInterface select( Authentication authentication )
* {
* try {
* return ( MyRemoteInterface ) lookup( authentication );
* }
- * catch( AltrmiConnectionException e )
+ * catch( ConnectionException e )
* {
* throw new CascadingRuntimeException( "Unable to select
remote interface", e );
* }
@@ -90,7 +90,7 @@
m_retryCount = configuration.getChild( "retry-count"
).getValueAsInteger( 10 );
}
- protected Object lookup( AltrmiAuthentication authentication ) throws
AltrmiConnectionException
+ protected Object lookup( Authentication authentication ) throws
ConnectionException
{
for( int i = 0; i < this.m_retryCount; i++ )
{
@@ -114,7 +114,7 @@
return iface;
}
- catch( AltrmiInvocationException e )
+ catch( InvocationException e )
{
getLogger().error( "Exception looking up publication [pub: "
+ this.m_publication + "]", e );
1.3 +9 -9
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/subscriber/AltrmiInterfaceLookupWrapper.java
Index: AltrmiInterfaceLookupWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/subscriber/AltrmiInterfaceLookupWrapper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AltrmiInterfaceLookupWrapper.java 5 Jan 2003 23:11:28 -0000 1.2
+++ AltrmiInterfaceLookupWrapper.java 5 Jan 2003 23:24:25 -0000 1.3
@@ -12,9 +12,9 @@
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.excalibur.altrmi.client.InterfaceLookup;
-import org.apache.excalibur.altrmi.common.AltrmiAuthentication;
-import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
-import org.apache.excalibur.altrmi.common.AltrmiInvocationException;
+import org.apache.excalibur.altrmi.common.Authentication;
+import org.apache.excalibur.altrmi.common.ConnectionException;
+import org.apache.excalibur.altrmi.common.InvocationException;
/**
* The <code>AbstractAltrmiInterfaceLookupFactory</code> uses this class to
wrap the
@@ -72,25 +72,25 @@
this.m_lookup.close();
}
- public Object lookup( String publishedServiceName ) throws
AltrmiConnectionException
+ public Object lookup( String publishedServiceName ) throws
ConnectionException
{
return this.m_lookup.lookup( publishedServiceName );
}
- public Object lookup( String publishedServiceName, AltrmiAuthentication
altrmiAuthentication )
- throws AltrmiConnectionException
+ public Object lookup( String publishedServiceName, Authentication
altrmiAuthentication )
+ throws ConnectionException
{
try
{
return this.m_lookup.lookup( publishedServiceName,
altrmiAuthentication );
}
- catch( AltrmiConnectionException e )
+ catch( ConnectionException e )
{
this.m_broken = true;
throw e;
}
- catch( AltrmiInvocationException e )
+ catch( InvocationException e )
{
this.m_broken = true;
1.3 +3 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/subscriber/CallbackEnabledCustomSocketStreamInterfaceLookupFactory.java
Index: CallbackEnabledCustomSocketStreamInterfaceLookupFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/subscriber/CallbackEnabledCustomSocketStreamInterfaceLookupFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CallbackEnabledCustomSocketStreamInterfaceLookupFactory.java 5 Jan
2003 23:11:28 -0000 1.2
+++ CallbackEnabledCustomSocketStreamInterfaceLookupFactory.java 5 Jan
2003 23:24:25 -0000 1.3
@@ -11,7 +11,7 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.excalibur.altrmi.client.HostContext;
import
org.apache.excalibur.altrmi.client.impl.callback.socket.CallbackEnabledSocketCustomStreamHostContext;
-import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
+import org.apache.excalibur.altrmi.common.ConnectionException;
/**
* Factory for CallbackEnabledSocketCustomStream transport
@@ -33,7 +33,7 @@
m_host = configuration.getChild( "host" ).getValue();
}
- protected HostContext createHostContext() throws
AltrmiConnectionException
+ protected HostContext createHostContext() throws ConnectionException
{
return new CallbackEnabledSocketCustomStreamHostContext( m_host,
m_port );
}
1.3 +3 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/subscriber/RmiInterfaceLookupFactory.java
Index: RmiInterfaceLookupFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/subscriber/RmiInterfaceLookupFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RmiInterfaceLookupFactory.java 5 Jan 2003 23:11:28 -0000 1.2
+++ RmiInterfaceLookupFactory.java 5 Jan 2003 23:24:25 -0000 1.3
@@ -11,7 +11,7 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.excalibur.altrmi.client.HostContext;
import org.apache.excalibur.altrmi.client.impl.rmi.RmiHostContext;
-import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
+import org.apache.excalibur.altrmi.common.ConnectionException;
/**
* Factory for RMI transport
@@ -32,7 +32,7 @@
m_host = configuration.getChild( "host" ).getValue();
}
- protected HostContext createHostContext() throws
AltrmiConnectionException
+ protected HostContext createHostContext() throws ConnectionException
{
return new RmiHostContext( m_host, m_port );
}
1.3 +3 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/subscriber/SocketObjectStreamInterfaceLookupFactory.java
Index: SocketObjectStreamInterfaceLookupFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/subscriber/SocketObjectStreamInterfaceLookupFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SocketObjectStreamInterfaceLookupFactory.java 5 Jan 2003 23:11:28
-0000 1.2
+++ SocketObjectStreamInterfaceLookupFactory.java 5 Jan 2003 23:24:25
-0000 1.3
@@ -11,7 +11,7 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.excalibur.altrmi.client.HostContext;
import
org.apache.excalibur.altrmi.client.impl.socket.SocketObjectStreamHostContext;
-import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
+import org.apache.excalibur.altrmi.common.ConnectionException;
/**
* Factory for SocketObjectStream transport
@@ -32,7 +32,7 @@
m_host = configuration.getChild( "host" ).getValue();
}
- protected HostContext createHostContext() throws
AltrmiConnectionException
+ protected HostContext createHostContext() throws ConnectionException
{
return new SocketObjectStreamHostContext( m_host, m_port );
}
1.2 +1 -1
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/BadConnectionException.java
Index: BadConnectionException.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/BadConnectionException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BadConnectionException.java 28 Oct 2002 21:58:56 -0000 1.1
+++ BadConnectionException.java 5 Jan 2003 23:24:25 -0000 1.2
@@ -14,7 +14,7 @@
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version $Revision$
*/
-public class BadConnectionException extends AltrmiConnectionException
+public class BadConnectionException extends ConnectionException
{
/**
1.5 +4 -4
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ClassReply.java
Index: ClassReply.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ClassReply.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ClassReply.java 23 May 2002 21:37:19 -0000 1.4
+++ ClassReply.java 5 Jan 2003 23:24:25 -0000 1.5
@@ -18,7 +18,7 @@
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version $Revision$
*/
-public final class ClassReply extends AltrmiReply
+public final class ClassReply extends Reply
{
static final long serialVersionUID = -2122973452303573425L;
@@ -76,12 +76,12 @@
* This is quicker than instanceof for type checking.
*
* @return the representative code
- * @see AltrmiReplyConstants
+ * @see ReplyConstants
*
*/
public int getReplyCode()
{
- return AltrmiReplyConstants.CLASSREPLY;
+ return ReplyConstants.CLASSREPLY;
}
/**
1.5 +3 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ClassRequest.java
Index: ClassRequest.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ClassRequest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ClassRequest.java 23 May 2002 21:37:19 -0000 1.4
+++ ClassRequest.java 5 Jan 2003 23:24:25 -0000 1.5
@@ -45,11 +45,11 @@
* This is quicker than instanceof for type checking.
*
* @return the representative code
- * @see AltrmiRequestConstants
+ * @see RequestConstants
*
*/
public int getRequestCode()
{
- return AltrmiRequestConstants.CLASSREQUEST;
+ return RequestConstants.CLASSREQUEST;
}
}
1.7 +4 -4
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ClassRetrievalFailedReply.java
Index: ClassRetrievalFailedReply.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ClassRetrievalFailedReply.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ClassRetrievalFailedReply.java 23 May 2002 21:37:19 -0000 1.6
+++ ClassRetrievalFailedReply.java 5 Jan 2003 23:24:25 -0000 1.7
@@ -18,7 +18,7 @@
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version $Revision$
*/
-public final class ClassRetrievalFailedReply extends AltrmiReply
+public final class ClassRetrievalFailedReply extends Reply
{
static final long serialVersionUID = -9005409182642544362L;
@@ -57,12 +57,12 @@
* This is quicker than instanceof for type checking.
*
* @return the representative code
- * @see AltrmiReplyConstants
+ * @see ReplyConstants
*
*/
public int getReplyCode()
{
- return AltrmiReplyConstants.CLASSRETRIEVALFAILEDREPLY;
+ return ReplyConstants.CLASSRETRIEVALFAILEDREPLY;
}
/**
1.2 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ConnectionRefusedException.java
Index: ConnectionRefusedException.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ConnectionRefusedException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConnectionRefusedException.java 26 Oct 2002 14:10:50 -0000 1.1
+++ ConnectionRefusedException.java 5 Jan 2003 23:24:25 -0000 1.2
@@ -14,7 +14,7 @@
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version $Revision$
*/
-public class ConnectionRefusedException extends AltrmiConnectionException
+public class ConnectionRefusedException extends ConnectionException
{
/**
1.5 +4 -4
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/EndConnectionReply.java
Index: EndConnectionReply.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/EndConnectionReply.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- EndConnectionReply.java 23 May 2002 21:37:19 -0000 1.4
+++ EndConnectionReply.java 5 Jan 2003 23:24:25 -0000 1.5
@@ -14,7 +14,7 @@
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version $Revision$
*/
-public final class EndConnectionReply extends AltrmiReply
+public final class EndConnectionReply extends Reply
{
static final long serialVersionUID = -3318297057355746898L;
@@ -31,11 +31,11 @@
* This is quicker than instanceof for type checking.
*
* @return the representative code
- * @see AltrmiReplyConstants
+ * @see ReplyConstants
*
*/
public int getReplyCode()
{
- return AltrmiReplyConstants.ENDCONNECTIONREPLY;
+ return ReplyConstants.ENDCONNECTIONREPLY;
}
}
1.6 +4 -4
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ExceptionReply.java
Index: ExceptionReply.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ExceptionReply.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ExceptionReply.java 23 May 2002 21:37:19 -0000 1.5
+++ ExceptionReply.java 5 Jan 2003 23:24:25 -0000 1.6
@@ -18,7 +18,7 @@
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version $Revision$
*/
-public final class ExceptionReply extends AltrmiReply
+public final class ExceptionReply extends Reply
{
static final long serialVersionUID = 8989665815895115830L;
@@ -62,12 +62,12 @@
* This is quicker than instanceof for type checking.
*
* @return the representative code
- * @see AltrmiReplyConstants
+ * @see ReplyConstants
*
*/
public int getReplyCode()
{
- return AltrmiReplyConstants.EXCEPTIONREPLY;
+ return ReplyConstants.EXCEPTIONREPLY;
}
/**
1.5 +4 -4
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/GarbageCollectionReply.java
Index: GarbageCollectionReply.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/GarbageCollectionReply.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- GarbageCollectionReply.java 23 May 2002 21:37:19 -0000 1.4
+++ GarbageCollectionReply.java 5 Jan 2003 23:24:25 -0000 1.5
@@ -18,7 +18,7 @@
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version $Revision$
*/
-public final class GarbageCollectionReply extends AltrmiReply
+public final class GarbageCollectionReply extends Reply
{
static final long serialVersionUID = -4521870130866247906L;
@@ -36,12 +36,12 @@
* This is quicker than instanceof for type checking.
*
* @return the representative code
- * @see AltrmiReplyConstants
+ * @see ReplyConstants
*
*/
public int getReplyCode()
{
- return AltrmiReplyConstants.GCREPLY;
+ return ReplyConstants.GCREPLY;
}
/**
1.5 +3 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/GarbageCollectionRequest.java
Index: GarbageCollectionRequest.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/GarbageCollectionRequest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- GarbageCollectionRequest.java 23 May 2002 21:37:19 -0000 1.4
+++ GarbageCollectionRequest.java 5 Jan 2003 23:24:25 -0000 1.5
@@ -59,12 +59,12 @@
* This is quicker than instanceof for type checking.
*
* @return the representative code
- * @see AltrmiRequestConstants
+ * @see RequestConstants
*
*/
public int getRequestCode()
{
- return AltrmiRequestConstants.GCREQUEST;
+ return RequestConstants.GCREQUEST;
}
/**
1.4 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/KeyAuthentication.java
Index: KeyAuthentication.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/KeyAuthentication.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- KeyAuthentication.java 23 May 2002 21:37:19 -0000 1.3
+++ KeyAuthentication.java 5 Jan 2003 23:24:25 -0000 1.4
@@ -18,7 +18,7 @@
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version $Revision$
*/
-public final class KeyAuthentication extends AltrmiAuthentication
+public final class KeyAuthentication extends Authentication
{
private String m_publicKey;
1.2 +5 -5
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ListMethodsReply.java
Index: ListMethodsReply.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ListMethodsReply.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ListMethodsReply.java 1 Nov 2002 16:35:42 -0000 1.1
+++ ListMethodsReply.java 5 Jan 2003 23:24:25 -0000 1.2
@@ -68,7 +68,7 @@
* @author Vinay Chandrasekharan
* @version $Revision$
*/
-public final class ListMethodsReply extends AltrmiReply
+public final class ListMethodsReply extends Reply
{
//-------variables-----------//
static final long serialVersionUID = 42199248686498983L;
@@ -104,18 +104,18 @@
return m_listOfMethods;
}
- //-----AltrmiReply override---//
+ //-----Reply override---//
/**
* Gets number that represents type for this class.
* This is quicker than instanceof for type checking.
*
* @return the representative code
- * @see AltrmiReplyConstants
+ * @see ReplyConstants
*
*/
public int getReplyCode()
{
- return AltrmiReplyConstants.LISTREPLY;
+ return ReplyConstants.LISTREPLY;
}
//----Externalizable Overrides--//
1.2 +4 -4
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ListMethodsRequest.java
Index: ListMethodsRequest.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ListMethodsRequest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ListMethodsRequest.java 1 Nov 2002 16:35:42 -0000 1.1
+++ ListMethodsRequest.java 5 Jan 2003 23:24:25 -0000 1.2
@@ -64,7 +64,7 @@
* Request the list of remote methods within the published Object.
* @author <a href="mailto:[EMAIL PROTECTED]">Vinay Chandrasekharan</a>
*/
-public final class ListMethodsRequest extends AltrmiRequest
+public final class ListMethodsRequest extends Request
{
//--------Variables----------//
static final long serialVersionUID = -6277904408381799644L;
@@ -99,18 +99,18 @@
return m_publishedName;
}
- //----AltrmiRequest Override--//
+ //----Request Override--//
/**
* Gets number that represents type for this class.
* This is quicker than instanceof for type checking.
*
* @return the representative code
- * @see AltrmiRequestConstants
+ * @see RequestConstants
*
*/
public int getRequestCode()
{
- return AltrmiRequestConstants.LISTMETHODSREQUEST;
+ return RequestConstants.LISTMETHODSREQUEST;
}
//----Externalizable Overrides---//
1.5 +4 -4
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ListReply.java
Index: ListReply.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ListReply.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ListReply.java 23 May 2002 21:37:19 -0000 1.4
+++ ListReply.java 5 Jan 2003 23:24:25 -0000 1.5
@@ -18,7 +18,7 @@
* @author Vinay Chandrasekharan
* @version $Revision$
*/
-public final class ListReply extends AltrmiReply
+public final class ListReply extends Reply
{
static final long serialVersionUID = 2859821236622834515L;
@@ -62,12 +62,12 @@
* This is quicker than instanceof for type checking.
*
* @return the representative code
- * @see AltrmiReplyConstants
+ * @see ReplyConstants
*
*/
public int getReplyCode()
{
- return AltrmiReplyConstants.LISTREPLY;
+ return ReplyConstants.LISTREPLY;
}
/**
1.5 +4 -4
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ListRequest.java
Index: ListRequest.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ListRequest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ListRequest.java 23 May 2002 21:37:19 -0000 1.4
+++ ListRequest.java 5 Jan 2003 23:24:25 -0000 1.5
@@ -14,7 +14,7 @@
* @author Vinay Chandrasekharan
* @version $Revision$
*/
-public final class ListRequest extends AltrmiRequest
+public final class ListRequest extends Request
{
static final long serialVersionUID = -8603142444769220615L;
@@ -23,11 +23,11 @@
* This is quicker than instanceof for type checking.
*
* @return the representative code
- * @see AltrmiRequestConstants
+ * @see RequestConstants
*
*/
public int getRequestCode()
{
- return AltrmiRequestConstants.LISTREQUEST;
+ return RequestConstants.LISTREQUEST;
}
}
1.5 +4 -4
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/LookupReply.java
Index: LookupReply.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/LookupReply.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LookupReply.java 23 May 2002 21:37:19 -0000 1.4
+++ LookupReply.java 5 Jan 2003 23:24:25 -0000 1.5
@@ -18,7 +18,7 @@
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version $Revision$
*/
-public final class LookupReply extends AltrmiReply
+public final class LookupReply extends Reply
{
static final long serialVersionUID = 4421747064999748917L;
@@ -62,12 +62,12 @@
* This is quicker than instanceof for type checking.
*
* @return the representative code
- * @see AltrmiReplyConstants
+ * @see ReplyConstants
*
*/
public int getReplyCode()
{
- return AltrmiReplyConstants.LOOKUPREPLY;
+ return ReplyConstants.LOOKUPREPLY;
}
/**
1.5 +7 -7
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/LookupRequest.java
Index: LookupRequest.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/LookupRequest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LookupRequest.java 23 May 2002 21:37:19 -0000 1.4
+++ LookupRequest.java 5 Jan 2003 23:24:25 -0000 1.5
@@ -22,7 +22,7 @@
{
static final long serialVersionUID = -4954813612238819220L;
- private AltrmiAuthentication m_altrmiAuthentication;
+ private Authentication m_altrmiAuthentication;
private Long m_session;
/**
@@ -34,7 +34,7 @@
* @param session the session ID
*
*/
- public LookupRequest( String publishedServiceName, AltrmiAuthentication
altrmiAuthentication,
+ public LookupRequest( String publishedServiceName, Authentication
altrmiAuthentication,
Long session )
{
@@ -58,12 +58,12 @@
* This is quicker than instanceof for type checking.
*
* @return the representative code
- * @see AltrmiRequestConstants
+ * @see RequestConstants
*
*/
public int getRequestCode()
{
- return AltrmiRequestConstants.LOOKUPREQUEST;
+ return RequestConstants.LOOKUPREQUEST;
}
/**
@@ -73,7 +73,7 @@
* @return the authenticator
*
*/
- public AltrmiAuthentication getAltrmiAuthentication()
+ public Authentication getAltrmiAuthentication()
{
return m_altrmiAuthentication;
}
@@ -130,7 +130,7 @@
super.readExternal( in );
- m_altrmiAuthentication = (AltrmiAuthentication)in.readObject();
+ m_altrmiAuthentication = (Authentication)in.readObject();
m_session = (Long)in.readObject();
}
}
1.2 +3 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/MethodAsyncRequest.java
Index: MethodAsyncRequest.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/MethodAsyncRequest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MethodAsyncRequest.java 25 Nov 2002 21:17:07 -0000 1.1
+++ MethodAsyncRequest.java 5 Jan 2003 23:24:25 -0000 1.2
@@ -80,12 +80,12 @@
* This is quicker than instanceof for type checking.
*
* @return the representative code
- * @see AltrmiRequestConstants
+ * @see RequestConstants
*
*/
public int getRequestCode()
{
- return AltrmiRequestConstants.METHODASYNCREQUEST;
+ return RequestConstants.METHODASYNCREQUEST;
}
/**
1.6 +4 -4
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/MethodFacadeArrayReply.java
Index: MethodFacadeArrayReply.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/MethodFacadeArrayReply.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MethodFacadeArrayReply.java 23 May 2002 21:37:19 -0000 1.5
+++ MethodFacadeArrayReply.java 5 Jan 2003 23:24:25 -0000 1.6
@@ -18,7 +18,7 @@
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version $Revision$
*/
-public final class MethodFacadeArrayReply extends AltrmiReply
+public final class MethodFacadeArrayReply extends Reply
{
static final long serialVersionUID = 3982374893707173208L;
@@ -78,12 +78,12 @@
* This is quicker than instanceof for type checking.
*
* @return the representative code
- * @see AltrmiReplyConstants
+ * @see ReplyConstants
*
*/
public int getReplyCode()
{
- return AltrmiReplyConstants.METHODFACADEARRAYREPLY;
+ return ReplyConstants.METHODFACADEARRAYREPLY;
}
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
