hammant 2003/01/05 15:11:29
Modified: altrmi build.xml default.properties
altrmi/src/java/org/apache/excalibur/altrmi/blocks/subscription
AbstractSubscriber.java RmiSubscriber.java
SocketCustomStreamSubscriber.java
SocketObjectStreamSubscriber.java
altrmi/src/java/org/apache/excalibur/altrmi/client
AltrmiFactory.java
CallbackEnabledClientInvocationHandler.java
altrmi/src/java/org/apache/excalibur/altrmi/client/impl
AbstractAltrmiFactory.java
AbstractClientInvocationHandler.java
AbstractConnectionPinger.java
AbstractFactoryHelper.java AbstractHostContext.java
AbstractInterfaceLookupFactory.java
AbstractSameVmBindableHostContext.java
DefaultConnectionListener.java
DefaultInterfaceLookupFactory.java
DefaultProxyHelper.java DumbConnectionListener.java
DynamicClassAltrmiFactory.java DynamicInvoker.java
NeverConnectionPinger.java
altrmi/src/java/org/apache/excalibur/altrmi/client/impl/callback/socket
CallbackEnabledSocketCustomStreamInvocationHandler.java
altrmi/src/java/org/apache/excalibur/altrmi/client/impl/direct
AbstractDirectInvocationHandler.java
altrmi/src/java/org/apache/excalibur/altrmi/client/impl/multiple
AbstractMultipleHostContext.java
AbstractMultipleInvocationHandler.java
RotatingMultipleInvocationHandler.java
altrmi/src/java/org/apache/excalibur/altrmi/client/impl/naming
DefaultAltrmiContext.java
altrmi/src/java/org/apache/excalibur/altrmi/client/impl/rmi
RmiFactoryHelper.java RmiInvocationHandler.java
altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket
SocketCustomStreamFactoryHelper.java
SocketObjectStreamFactoryHelper.java
altrmi/src/java/org/apache/excalibur/altrmi/client/impl/stream
StreamInvocationHandler.java
altrmi/src/java/org/apache/excalibur/altrmi/client/impl/subscriber
AbstractAltrmiInterfaceLookupFactory.java
AbstractSubscriberImpl.java
AltrmiInterfaceLookupWrapper.java
AltrmiLookupPool.java
CallbackEnabledCustomSocketStreamInterfaceLookupFactory.java
RmiInterfaceLookupFactory.java
SocketObjectStreamInterfaceLookupFactory.java
altrmi/src/java/org/apache/excalibur/altrmi/server/impl/callback
CallbackServerClassAltrmiFactory.java
altrmi/src/java/org/apache/excalibur/altrmi/server/impl/callback/socket
CallbackEnabledSocketCustomStreamReadWriter.java
Log:
Start of renames on class names. 'Altrmi' as a prefix to everything is
needless as has been pointed out many times. Vinay's remotable added too
(alpha).
Revision Changes Path
1.62 +1 -0 jakarta-avalon-excalibur/altrmi/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/build.xml,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- build.xml 5 Jan 2003 11:41:39 -0000 1.61
+++ build.xml 5 Jan 2003 23:11:25 -0000 1.62
@@ -31,6 +31,7 @@
<pathelement path="${phoenix-client.jar}"/>
<pathelement path="${phoenix-metagenerate.jar}"/>
<pathelement path="${jsch.jar}"/>
+ <pathelement path="${excalibur-container.jar}"/>
<pathelement
path="jetty-download/Jetty-${jetty.rel}/Jetty-${jetty.rel}/lib/javax.servlet.jar"/>
<pathelement
path="jetty-download/Jetty-${jetty.rel}/Jetty-${jetty.rel}/lib/org.mortbay.jetty.jar"/>
</path>
1.19 +1 -0 jakarta-avalon-excalibur/altrmi/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/default.properties,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- default.properties 5 Jan 2003 11:41:39 -0000 1.18
+++ default.properties 5 Jan 2003 23:11:25 -0000 1.19
@@ -37,6 +37,7 @@
jakarta-commons-attributes.jar=./lib/commons-attributes-0.1.jar
jakarta-commons-httpclient.jar=./lib/commons-httpclient.jar
jakarta-commons-logging.jar=./lib/commons-logging.jar
+excalibur-container.jar=./lib/excalibur-container-1.0.jar
# ----- Excalibur pool, version 1.1 or later -----
excalibur-pool.home=${basedir}/../pool/dist
1.2 +6 -6
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/blocks/subscription/AbstractSubscriber.java
Index: AbstractSubscriber.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/blocks/subscription/AbstractSubscriber.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractSubscriber.java 27 Dec 2002 00:07:28 -0000 1.1
+++ AbstractSubscriber.java 5 Jan 2003 23:11:25 -0000 1.2
@@ -13,25 +13,25 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.excalibur.altrmi.client.AltrmiFactory;
-import org.apache.excalibur.altrmi.client.AltrmiHostContext;
-import org.apache.excalibur.altrmi.client.AltrmiInterfaceLookup;
+import org.apache.excalibur.altrmi.client.HostContext;
+import org.apache.excalibur.altrmi.client.InterfaceLookup;
import org.apache.excalibur.altrmi.client.impl.ClientClassAltrmiFactory;
import org.apache.excalibur.altrmi.client.impl.ServerClassAltrmiFactory;
import org.apache.excalibur.altrmi.common.AltrmiAuthentication;
import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
/**
- * @phoenix:service
name="org.apache.excalibur.altrmi.client.AltrmiInterfaceLookup"
+ * @phoenix:service name="org.apache.excalibur.altrmi.client.InterfaceLookup"
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version $Revision$
*/
public abstract class AbstractSubscriber
extends AbstractLogEnabled
- implements AltrmiInterfaceLookup, Configurable, Initializable
+ implements InterfaceLookup, Configurable, Initializable
{
protected AltrmiFactory m_altrmiFactory;
- protected AltrmiHostContext m_hostContext;
+ protected HostContext m_hostContext;
/**
* Pass the <code>Configuration</code> to the <code>Configurable</code>
1.2 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/blocks/subscription/RmiSubscriber.java
Index: RmiSubscriber.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/blocks/subscription/RmiSubscriber.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RmiSubscriber.java 27 Dec 2002 00:07:28 -0000 1.1
+++ RmiSubscriber.java 5 Jan 2003 23:11:25 -0000 1.2
@@ -13,7 +13,7 @@
/**
* @phoenix:block
- * @phoenix:service
name="org.apache.excalibur.altrmi.client.AltrmiInterfaceLookup"
+ * @phoenix:service name="org.apache.excalibur.altrmi.client.InterfaceLookup"
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version $Revision$
1.2 +1 -1
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/blocks/subscription/SocketCustomStreamSubscriber.java
Index: SocketCustomStreamSubscriber.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/blocks/subscription/SocketCustomStreamSubscriber.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SocketCustomStreamSubscriber.java 4 Jan 2003 21:46:36 -0000 1.1
+++ SocketCustomStreamSubscriber.java 5 Jan 2003 23:11:25 -0000 1.2
@@ -13,7 +13,7 @@
/**
* @phoenix:block
- * @phoenix:service
name="org.apache.excalibur.altrmi.client.AltrmiInterfaceLookup"
+ * @phoenix:service name="org.apache.excalibur.altrmi.client.InterfaceLookup"
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version $Revision$
1.2 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/blocks/subscription/SocketObjectStreamSubscriber.java
Index: SocketObjectStreamSubscriber.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/blocks/subscription/SocketObjectStreamSubscriber.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SocketObjectStreamSubscriber.java 27 Dec 2002 00:07:28 -0000 1.1
+++ SocketObjectStreamSubscriber.java 5 Jan 2003 23:11:25 -0000 1.2
@@ -13,7 +13,7 @@
/**
* @phoenix:block
- * @phoenix:service
name="org.apache.excalibur.altrmi.client.AltrmiInterfaceLookup"
+ * @phoenix:service name="org.apache.excalibur.altrmi.client.InterfaceLookup"
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version $Revision$
1.5 +4 -4
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/AltrmiFactory.java
Index: AltrmiFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/AltrmiFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AltrmiFactory.java 26 Oct 2002 14:10:48 -0000 1.4
+++ AltrmiFactory.java 5 Jan 2003 23:11:25 -0000 1.5
@@ -18,7 +18,7 @@
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version $Revision$
*/
-public interface AltrmiFactory extends AltrmiInterfaceLookup
+public interface AltrmiFactory extends InterfaceLookup
{
/**
@@ -27,7 +27,7 @@
* @throws AltrmiConnectionException if a problem
*
*/
- void setHostContext( AltrmiHostContext hostContext ) throws
AltrmiConnectionException;
+ void setHostContext( HostContext hostContext ) throws
AltrmiConnectionException;
/**
* Set the host context
@@ -35,6 +35,6 @@
* @param allowOptimize allow optimize
* @throws AltrmiConnectionException if a problem
*/
- void setHostContext( AltrmiHostContext hostContext, boolean
allowOptimize ) throws AltrmiConnectionException;
+ void setHostContext( HostContext hostContext, boolean allowOptimize )
throws AltrmiConnectionException;
}
1.2 +8 -0
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/CallbackEnabledClientInvocationHandler.java
Index: CallbackEnabledClientInvocationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/CallbackEnabledClientInvocationHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CallbackEnabledClientInvocationHandler.java 6 May 2002 18:14:36
-0000 1.1
+++ CallbackEnabledClientInvocationHandler.java 5 Jan 2003 23:11:25
-0000 1.2
@@ -10,6 +10,14 @@
import org.apache.excalibur.altrmi.common.AltrmiCallbackException;
+/**
+ * Interface CallbackEnabledClientInvocationHandler
+ *
+ *
+ * @author <a href="mailto:[EMAIL PROTECTED]">Vinay Chandran</a>
+ * @version * $Revision$
+ */
+
public interface CallbackEnabledClientInvocationHandler {
boolean exposeObject( Object tobeExposedObject, Class
tobeExposedInterface ) throws AltrmiCallbackException;
1.15 +7 -7
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/AbstractAltrmiFactory.java
Index: AbstractAltrmiFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/AbstractAltrmiFactory.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AbstractAltrmiFactory.java 4 Jan 2003 21:31:45 -0000 1.14
+++ AbstractAltrmiFactory.java 5 Jan 2003 23:11:25 -0000 1.15
@@ -14,9 +14,9 @@
import org.apache.excalibur.altrmi.client.AltrmiFactory;
-import org.apache.excalibur.altrmi.client.AltrmiHostContext;
+import org.apache.excalibur.altrmi.client.HostContext;
import org.apache.excalibur.altrmi.client.AltrmiProxy;
-import org.apache.excalibur.altrmi.client.AltrmiClientInvocationHandler;
+import org.apache.excalibur.altrmi.client.ClientInvocationHandler;
import org.apache.excalibur.altrmi.common.OpenConnectionRequest;
import org.apache.excalibur.altrmi.common.SameVMReply;
import org.apache.excalibur.altrmi.common.AltrmiReply;
@@ -46,7 +46,7 @@
private static final UID U_ID = new UID((short)20729);
protected AbstractHostContext m_hostContext;
- protected AltrmiClientInvocationHandler m_clientInvocationHandler;
+ protected ClientInvocationHandler m_clientInvocationHandler;
protected final HashMap m_refObjs = new HashMap();
private final boolean m_beanOnly;
private transient String m_textToSign;
@@ -81,7 +81,7 @@
* @param hostContext the host context
* @throws AltrmiConnectionException if a problem
*/
- public void setHostContext(AltrmiHostContext hostContext) throws
AltrmiConnectionException {
+ public void setHostContext(HostContext hostContext) throws
AltrmiConnectionException {
setHostContext(hostContext, true);
}
@@ -91,7 +91,7 @@
* @param allowOptimize allow optimization
* @throws AltrmiConnectionException if a problem
*/
- public void setHostContext( AltrmiHostContext hostContext, boolean
allowOptimize ) throws AltrmiConnectionException
+ public void setHostContext( HostContext hostContext, boolean
allowOptimize ) throws AltrmiConnectionException
{
if( m_hostContext == null )
{
@@ -117,7 +117,7 @@
{
AbstractSameVmBindableHostContext sameVmBindableHostContext =
(AbstractSameVmBindableHostContext) m_hostContext;
- AltrmiHostContext hContext =
sameVmBindableHostContext.makeSameVmHostContext();
+ HostContext hContext =
sameVmBindableHostContext.makeSameVmHostContext();
if (hContext == null)
{
// Registry not found, or a different instance to the one
1.8 +11 -11
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/AbstractClientInvocationHandler.java
Index: AbstractClientInvocationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/AbstractClientInvocationHandler.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractClientInvocationHandler.java 5 Jan 2003 22:05:01 -0000
1.7
+++ AbstractClientInvocationHandler.java 5 Jan 2003 23:11:25 -0000
1.8
@@ -9,11 +9,11 @@
import java.io.IOException;
-import org.apache.excalibur.altrmi.client.AltrmiClientInvocationHandler;
-import org.apache.excalibur.altrmi.client.AltrmiConnectionListener;
-import org.apache.excalibur.altrmi.client.AltrmiConnectionPinger;
+import org.apache.excalibur.altrmi.client.ClientInvocationHandler;
+import org.apache.excalibur.altrmi.client.ConnectionListener;
+import org.apache.excalibur.altrmi.client.ConnectionPinger;
import org.apache.excalibur.altrmi.client.AltrmiProxy;
-import org.apache.excalibur.altrmi.client.AltrmiConnectionClosedException;
+import org.apache.excalibur.altrmi.client.ConnectionClosedException;
import org.apache.excalibur.altrmi.common.AltrmiInvocationHandler;
import org.apache.excalibur.altrmi.common.AltrmiReply;
import org.apache.excalibur.altrmi.common.FacadeRefHolder;
@@ -28,11 +28,11 @@
* @version $Revision$
*/
public abstract class AbstractClientInvocationHandler
- implements AltrmiClientInvocationHandler
+ implements ClientInvocationHandler
{
- protected AltrmiConnectionPinger m_connectionPinger;
- protected AltrmiConnectionListener m_altrmiConnectionListener =
+ protected ConnectionPinger m_connectionPinger;
+ protected ConnectionListener m_altrmiConnectionListener =
new DefaultConnectionListener();
protected boolean m_stopped = false;
@@ -43,7 +43,7 @@
* @param altrmiConnectionListener
*
*/
- public void setAltrmiConnectionListener( AltrmiConnectionListener
altrmiConnectionListener )
+ public void setAltrmiConnectionListener( ConnectionListener
altrmiConnectionListener )
{
m_altrmiConnectionListener = altrmiConnectionListener;
}
@@ -90,7 +90,7 @@
if( m_stopped )
{
- throw new AltrmiConnectionClosedException( "Connection closed" );
+ throw new ConnectionClosedException( "Connection closed" );
}
AltrmiReply ar = handleInvocation( new PingRequest() );
@@ -105,7 +105,7 @@
* @param connectionPinger
*
*/
- public void setConnectionPinger( AltrmiConnectionPinger connectionPinger
)
+ public void setConnectionPinger( ConnectionPinger connectionPinger )
{
m_connectionPinger = connectionPinger;
}
1.10 +10 -10
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/AbstractConnectionPinger.java
Index: AbstractConnectionPinger.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/AbstractConnectionPinger.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AbstractConnectionPinger.java 5 Jan 2003 22:05:01 -0000 1.9
+++ AbstractConnectionPinger.java 5 Jan 2003 23:11:25 -0000 1.10
@@ -7,9 +7,9 @@
*/
package org.apache.excalibur.altrmi.client.impl;
-import org.apache.excalibur.altrmi.client.AltrmiClientInvocationHandler;
-import org.apache.excalibur.altrmi.client.AltrmiConnectionPinger;
-import org.apache.excalibur.altrmi.client.AltrmiConnectionClosedException;
+import org.apache.excalibur.altrmi.client.ClientInvocationHandler;
+import org.apache.excalibur.altrmi.client.ConnectionPinger;
+import org.apache.excalibur.altrmi.client.ConnectionClosedException;
import org.apache.excalibur.altrmi.common.AltrmiInvocationException;
/**
@@ -19,10 +19,10 @@
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version * $Revision$
*/
-public abstract class AbstractConnectionPinger implements
AltrmiConnectionPinger
+public abstract class AbstractConnectionPinger implements ConnectionPinger
{
- private AltrmiClientInvocationHandler m_altrmiInvocationHandler;
+ private ClientInvocationHandler m_altrmiInvocationHandler;
private boolean m_continue = true;
private Runnable m_runnable;
private Thread m_thread;
@@ -75,7 +75,7 @@
*
*
*/
- public void setAltrmiInvocationHandler( AltrmiClientInvocationHandler
altrmiInvocationHandler )
+ public void setAltrmiInvocationHandler( ClientInvocationHandler
altrmiInvocationHandler )
{
m_altrmiInvocationHandler = altrmiInvocationHandler;
}
@@ -84,7 +84,7 @@
* Get the Invocation handler.
* @return
*/
- protected AltrmiClientInvocationHandler getAltrmiInvocationHandler()
+ protected ClientInvocationHandler getAltrmiInvocationHandler()
{
return m_altrmiInvocationHandler;
}
@@ -117,7 +117,7 @@
// no need to ping anymore.
}
- catch( AltrmiConnectionClosedException cce )
+ catch( ConnectionClosedException cce )
{
// We really need a logger or something to be able to
see this
// for debugging.
@@ -134,7 +134,7 @@
}
};
- m_thread = new Thread( m_runnable ,"AltrmiConnectionPinger Thread");
+ m_thread = new Thread( m_runnable ,"ConnectionPinger Thread");
m_thread.start();
}
1.5 +5 -5
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/AbstractFactoryHelper.java
Index: AbstractFactoryHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/AbstractFactoryHelper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractFactoryHelper.java 13 Oct 2002 11:54:25 -0000 1.4
+++ AbstractFactoryHelper.java 5 Jan 2003 23:11:25 -0000 1.5
@@ -10,8 +10,8 @@
import java.util.StringTokenizer;
import java.util.Vector;
import org.apache.excalibur.altrmi.client.AltrmiFactory;
-import org.apache.excalibur.altrmi.client.AltrmiInterfaceLookup;
-import org.apache.excalibur.altrmi.client.AltrmiInterfaceLookupFactory;
+import org.apache.excalibur.altrmi.client.InterfaceLookup;
+import org.apache.excalibur.altrmi.client.InterfaceLookupFactory;
import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
/**
@@ -21,7 +21,7 @@
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version $Revision$
*/
-public abstract class AbstractFactoryHelper implements
AltrmiInterfaceLookupFactory
+public abstract class AbstractFactoryHelper implements InterfaceLookupFactory
{
protected String[] processFactoryString( String factoryString )
@@ -71,7 +71,7 @@
* @throws AltrmiConnectionException
*
*/
- public final AltrmiInterfaceLookup getAltrmiInterfaceLookup( String
factoryString, boolean optimize )
+ public final InterfaceLookup getAltrmiInterfaceLookup( String
factoryString, boolean optimize )
throws AltrmiConnectionException
{
return getAltrmiInterfaceLookup( factoryString,
this.getClass().getClassLoader(), optimize );
1.7 +10 -10
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/AbstractHostContext.java
Index: AbstractHostContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/AbstractHostContext.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractHostContext.java 4 Jan 2003 22:17:18 -0000 1.6
+++ AbstractHostContext.java 5 Jan 2003 23:11:25 -0000 1.7
@@ -7,9 +7,9 @@
*/
package org.apache.excalibur.altrmi.client.impl;
-import org.apache.excalibur.altrmi.client.AltrmiClientInvocationHandler;
-import org.apache.excalibur.altrmi.client.AltrmiConnectionListener;
-import org.apache.excalibur.altrmi.client.AltrmiHostContext;
+import org.apache.excalibur.altrmi.client.ClientInvocationHandler;
+import org.apache.excalibur.altrmi.client.ConnectionListener;
+import org.apache.excalibur.altrmi.client.HostContext;
/**
* Class AbstractHostContext
@@ -18,10 +18,10 @@
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version $Revision$
*/
-public abstract class AbstractHostContext implements AltrmiHostContext
+public abstract class AbstractHostContext implements HostContext
{
- protected final AltrmiClientInvocationHandler
m_altrmiClientInvocationHandler;
+ protected final ClientInvocationHandler m_altrmiClientInvocationHandler;
/**
* Constructor AbstractHostContext
@@ -31,7 +31,7 @@
* @param altrmiClientInvocationHandler
*
*/
- public AbstractHostContext( AltrmiClientInvocationHandler
altrmiClientInvocationHandler )
+ public AbstractHostContext( ClientInvocationHandler
altrmiClientInvocationHandler )
{
m_altrmiClientInvocationHandler = altrmiClientInvocationHandler;
}
@@ -43,7 +43,7 @@
* @return
*
*/
- public AltrmiClientInvocationHandler getClientInvocationHandler()
+ public ClientInvocationHandler getClientInvocationHandler()
{
return m_altrmiClientInvocationHandler;
}
@@ -56,12 +56,12 @@
* @param altrmiConnectionListener
*
*/
- public void setAltrmiConnectionListener( AltrmiConnectionListener
altrmiConnectionListener )
+ public void setAltrmiConnectionListener( ConnectionListener
altrmiConnectionListener )
{
m_altrmiClientInvocationHandler.setAltrmiConnectionListener(
altrmiConnectionListener );
}
- public AltrmiHostContext makeSameVmHostContext(String key) {
+ public HostContext makeSameVmHostContext(String key) {
throw new UnsupportedOperationException();
}
1.6 +10 -10
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/AbstractInterfaceLookupFactory.java
Index: AbstractInterfaceLookupFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/AbstractInterfaceLookupFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractInterfaceLookupFactory.java 4 Jan 2003 22:17:18 -0000
1.5
+++ AbstractInterfaceLookupFactory.java 5 Jan 2003 23:11:25 -0000
1.6
@@ -8,8 +8,8 @@
package org.apache.excalibur.altrmi.client.impl;
import java.util.Vector;
-import org.apache.excalibur.altrmi.client.AltrmiInterfaceLookup;
-import org.apache.excalibur.altrmi.client.AltrmiInterfaceLookupFactory;
+import org.apache.excalibur.altrmi.client.InterfaceLookup;
+import org.apache.excalibur.altrmi.client.InterfaceLookupFactory;
import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
/**
@@ -19,12 +19,12 @@
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version $Revision$
*/
-public class AbstractInterfaceLookupFactory implements
AltrmiInterfaceLookupFactory
+public class AbstractInterfaceLookupFactory implements InterfaceLookupFactory
{
private Vector m_factories = new Vector();
- protected void addFactory( String factoryStringPrefix,
AltrmiInterfaceLookupFactory factory )
+ protected void addFactory( String factoryStringPrefix,
InterfaceLookupFactory factory )
{
m_factories.add( new Factory( factoryStringPrefix, factory ) );
}
@@ -40,7 +40,7 @@
* @throws AltrmiConnectionException
*
*/
- public final AltrmiInterfaceLookup getAltrmiInterfaceLookup( String
factoryString, boolean optimize )
+ public final InterfaceLookup getAltrmiInterfaceLookup( String
factoryString, boolean optimize )
throws AltrmiConnectionException
{
return getAltrmiInterfaceLookup( factoryString,
this.getClass().getClassLoader(), optimize );
@@ -58,7 +58,7 @@
* @throws AltrmiConnectionException
*
*/
- public AltrmiInterfaceLookup getAltrmiInterfaceLookup(
+ public InterfaceLookup getAltrmiInterfaceLookup(
String factoryString, ClassLoader interfacesClassLoader, boolean
optimize )
throws AltrmiConnectionException
{
@@ -88,7 +88,7 @@
{
private String factoryStringPrefix;
- private AltrmiInterfaceLookupFactory altrmiInterfaceLookupFactory;
+ private InterfaceLookupFactory altrmiInterfaceLookupFactory;
/**
* Constructor Factory
@@ -99,7 +99,7 @@
*
*/
public Factory( String factoryStringPrefix,
- AltrmiInterfaceLookupFactory
altrmiInterfaceLookupFactory )
+ InterfaceLookupFactory altrmiInterfaceLookupFactory )
{
this.factoryStringPrefix = factoryStringPrefix;
this.altrmiInterfaceLookupFactory = altrmiInterfaceLookupFactory;
1.5 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/AbstractSameVmBindableHostContext.java
Index: AbstractSameVmBindableHostContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/AbstractSameVmBindableHostContext.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractSameVmBindableHostContext.java 7 Nov 2002 07:57:34 -0000
1.4
+++ AbstractSameVmBindableHostContext.java 5 Jan 2003 23:11:25 -0000
1.5
@@ -8,13 +8,13 @@
package org.apache.excalibur.altrmi.client.impl;
import org.apache.excalibur.altrmi.client.impl.AbstractHostContext;
-import org.apache.excalibur.altrmi.client.AltrmiClientInvocationHandler;
+import org.apache.excalibur.altrmi.client.ClientInvocationHandler;
import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
import org.apache.excalibur.altrmi.common.RegistryHelper;
public abstract class AbstractSameVmBindableHostContext extends
AbstractHostContext{
- public AbstractSameVmBindableHostContext(AltrmiClientInvocationHandler
altrmiClientInvocationHandler)
+ public AbstractSameVmBindableHostContext(ClientInvocationHandler
altrmiClientInvocationHandler)
{
super(altrmiClientInvocationHandler);
}
1.7 +3 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/DefaultConnectionListener.java
Index: DefaultConnectionListener.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/DefaultConnectionListener.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultConnectionListener.java 5 Jan 2003 22:05:01 -0000 1.6
+++ DefaultConnectionListener.java 5 Jan 2003 23:11:25 -0000 1.7
@@ -7,7 +7,7 @@
*/
package org.apache.excalibur.altrmi.client.impl;
-import org.apache.excalibur.altrmi.client.AltrmiConnectionListener;
+import org.apache.excalibur.altrmi.client.ConnectionListener;
import org.apache.excalibur.altrmi.common.AltrmiInvocationException;
import org.apache.excalibur.altrmi.common.AltrmiRequest;
@@ -20,7 +20,7 @@
* @author Paul Hammant
* @version * $Revision$
*/
-public class DefaultConnectionListener implements AltrmiConnectionListener
+public class DefaultConnectionListener implements ConnectionListener
{
private int m_maxReconnectAttempts;
1.5 +5 -5
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/DefaultInterfaceLookupFactory.java
Index: DefaultInterfaceLookupFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/DefaultInterfaceLookupFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultInterfaceLookupFactory.java 5 Sep 2002 22:22:36 -0000
1.4
+++ DefaultInterfaceLookupFactory.java 5 Jan 2003 23:11:25 -0000
1.5
@@ -7,7 +7,7 @@
*/
package org.apache.excalibur.altrmi.client.impl;
-import org.apache.excalibur.altrmi.client.AltrmiInterfaceLookupFactory;
+import org.apache.excalibur.altrmi.client.InterfaceLookupFactory;
/**
* Class DefaultInterfaceLookupFactory
@@ -34,7 +34,7 @@
{
addFactory(
"SocketObjectStream:",
-
(AltrmiInterfaceLookupFactory)this.getClass().getClassLoader().loadClass(
+
(InterfaceLookupFactory)this.getClass().getClassLoader().loadClass(
"org.apache.excalibur.altrmi.client.impl.socket.SocketObjectStreamFactoryHelper"
)
.newInstance() );
}
@@ -52,7 +52,7 @@
{
addFactory(
"SocketCustomStream:",
-
(AltrmiInterfaceLookupFactory)this.getClass().getClassLoader().loadClass(
+
(InterfaceLookupFactory)this.getClass().getClassLoader().loadClass(
"org.apache.excalibur.altrmi.client.impl.socket.SocketCustomStreamFactoryHelper"
)
.newInstance() );
}
@@ -68,7 +68,7 @@
try
{
- addFactory( "RMI:", (AltrmiInterfaceLookupFactory)Class
+ addFactory( "RMI:", (InterfaceLookupFactory)Class
.forName(
"org.apache.excalibur.altrmi.client.impl.rmi.RmiFactoryHelper" )
.newInstance()
);
}
1.17 +4 -4
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/DefaultProxyHelper.java
Index: DefaultProxyHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/DefaultProxyHelper.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- DefaultProxyHelper.java 5 Jan 2003 22:05:01 -0000 1.16
+++ DefaultProxyHelper.java 5 Jan 2003 23:11:25 -0000 1.17
@@ -7,7 +7,7 @@
*/
package org.apache.excalibur.altrmi.client.impl;
-import org.apache.excalibur.altrmi.client.AltrmiClientInvocationHandler;
+import org.apache.excalibur.altrmi.client.ClientInvocationHandler;
import org.apache.excalibur.altrmi.client.AltrmiProxy;
import org.apache.excalibur.altrmi.client.ProxyHelper;
import org.apache.excalibur.altrmi.common.AltrmiInvocationException;
@@ -40,7 +40,7 @@
{
private final transient AbstractAltrmiFactory m_altrmiFactory;
- private final transient AltrmiClientInvocationHandler
m_clientInvocationHandler;
+ private final transient ClientInvocationHandler
m_clientInvocationHandler;
private final transient String m_publishedServiceName;
private final transient String m_objectName;
private final transient Long m_referenceID;
@@ -60,7 +60,7 @@
*
*/
public DefaultProxyHelper( AbstractAltrmiFactory altrmiFactory,
- AltrmiClientInvocationHandler
clientInvocationHandler,
+ ClientInvocationHandler
clientInvocationHandler,
String pubishedServiceName, String
objectName, Long referenceID,
Long session )
{
1.2 +3 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/DumbConnectionListener.java
Index: DumbConnectionListener.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/DumbConnectionListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DumbConnectionListener.java 5 Jan 2003 22:05:02 -0000 1.1
+++ DumbConnectionListener.java 5 Jan 2003 23:11:25 -0000 1.2
@@ -7,7 +7,7 @@
*/
package org.apache.excalibur.altrmi.client.impl;
-import org.apache.excalibur.altrmi.client.AltrmiConnectionListener;
+import org.apache.excalibur.altrmi.client.ConnectionListener;
import org.apache.excalibur.altrmi.common.AltrmiInvocationException;
import org.apache.excalibur.altrmi.common.AltrmiRequest;
@@ -20,7 +20,7 @@
* @author Paul Hammant
* @version * $Revision$
*/
-public class DumbConnectionListener implements AltrmiConnectionListener
+public class DumbConnectionListener implements ConnectionListener
{
/**
1.3 +1 -1
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/DynamicClassAltrmiFactory.java
Index: DynamicClassAltrmiFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/DynamicClassAltrmiFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DynamicClassAltrmiFactory.java 5 Nov 2002 07:19:46 -0000 1.2
+++ DynamicClassAltrmiFactory.java 5 Jan 2003 23:11:25 -0000 1.3
@@ -109,7 +109,7 @@
/**
- * @see org.apache.excalibur.altrmi.client.AltrmiInterfaceLookup#close()
+ * @see org.apache.excalibur.altrmi.client.InterfaceLookup#close()
*/
public void close()
1.4 +8 -8
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/DynamicInvoker.java
Index: DynamicInvoker.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/DynamicInvoker.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DynamicInvoker.java 24 Nov 2002 07:16:34 -0000 1.3
+++ DynamicInvoker.java 5 Jan 2003 23:11:25 -0000 1.4
@@ -60,8 +60,8 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.excalibur.altrmi.client.AltrmiClientInvocationHandler;
-import org.apache.excalibur.altrmi.client.AltrmiHostContext;
+import org.apache.excalibur.altrmi.client.ClientInvocationHandler;
+import org.apache.excalibur.altrmi.client.HostContext;
import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
import org.apache.excalibur.altrmi.common.AltrmiReply;
import org.apache.excalibur.altrmi.common.ListMethodsReply;
@@ -75,7 +75,7 @@
* One creates a DynamicInvoker as follows:
* <code>
* //create custom altrmiHostContext for the specific transport
- * AltrmiHostContext arhc;
+ * HostContext arhc;
* arhc = new SocketCustomStreamHostContext("127.0.0.1", 1235);
*
* //Initialize the dynamic invoker
@@ -99,10 +99,10 @@
/** AltrmiFactory*/
private DynamicClassAltrmiFactory m_factory =
new DynamicClassAltrmiFactory(false);
- /** AltrmiHostContext*/
- private AltrmiHostContext m_hostContext;
- /** AltrmiClientInvocationHandler */
- private AltrmiClientInvocationHandler m_clientInvocationHandler;
+ /** HostContext*/
+ private HostContext m_hostContext;
+ /** ClientInvocationHandler */
+ private ClientInvocationHandler m_clientInvocationHandler;
/** Cache of stubs lookeup by the client*/
private Map m_stubs = new HashMap();
@@ -112,7 +112,7 @@
* @param altrmiHostContext
* @throws Exception
*/
- public DynamicInvoker(AltrmiHostContext altrmiHostContext) throws
Exception
+ public DynamicInvoker(HostContext altrmiHostContext) throws Exception
{
m_hostContext = altrmiHostContext;
1.2 +5 -5
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/NeverConnectionPinger.java
Index: NeverConnectionPinger.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/NeverConnectionPinger.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NeverConnectionPinger.java 5 Jan 2003 22:05:02 -0000 1.1
+++ NeverConnectionPinger.java 5 Jan 2003 23:11:25 -0000 1.2
@@ -7,8 +7,8 @@
*/
package org.apache.excalibur.altrmi.client.impl;
-import org.apache.excalibur.altrmi.client.AltrmiConnectionPinger;
-import org.apache.excalibur.altrmi.client.AltrmiClientInvocationHandler;
+import org.apache.excalibur.altrmi.client.ConnectionPinger;
+import org.apache.excalibur.altrmi.client.ClientInvocationHandler;
/**
* Interface NeverConnectionPinger
@@ -17,7 +17,7 @@
* @author Paul Hammant
* @version * $Revision$
*/
-public class NeverConnectionPinger implements AltrmiConnectionPinger
+public class NeverConnectionPinger implements ConnectionPinger
{
/**
@@ -27,7 +27,7 @@
{
}
- public void setAltrmiInvocationHandler(AltrmiClientInvocationHandler
altrmiInvocationHandler)
+ public void setAltrmiInvocationHandler(ClientInvocationHandler
altrmiInvocationHandler)
{
}
1.12 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/callback/socket/CallbackEnabledSocketCustomStreamInvocationHandler.java
Index: CallbackEnabledSocketCustomStreamInvocationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/callback/socket/CallbackEnabledSocketCustomStreamInvocationHandler.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- CallbackEnabledSocketCustomStreamInvocationHandler.java 4 Jan 2003
22:17:18 -0000 1.11
+++ CallbackEnabledSocketCustomStreamInvocationHandler.java 5 Jan 2003
23:11:26 -0000 1.12
@@ -73,7 +73,7 @@
* can issue callbacks back to the client using
* those references.
* </pre>
- * @see
org.apache.excalibur.altrmi.client.AltrmiClientInvocationHandler#resolveArgument(String,
Class, Object)
+ * @see
org.apache.excalibur.altrmi.client.ClientInvocationHandler#resolveArgument(String,
Class, Object)
*/
public Object resolveArgument(
String methodSignature,
1.6 +3 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/direct/AbstractDirectInvocationHandler.java
Index: AbstractDirectInvocationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/direct/AbstractDirectInvocationHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractDirectInvocationHandler.java 4 Jan 2003 22:17:18 -0000
1.5
+++ AbstractDirectInvocationHandler.java 5 Jan 2003 23:11:26 -0000
1.6
@@ -8,7 +8,7 @@
package org.apache.excalibur.altrmi.client.impl.direct;
import java.io.IOException;
-import org.apache.excalibur.altrmi.client.AltrmiConnectionListener;
+import org.apache.excalibur.altrmi.client.ConnectionListener;
import
org.apache.excalibur.altrmi.client.impl.AbstractClientInvocationHandler;
import org.apache.excalibur.altrmi.common.AltrmiInvocationException;
import org.apache.excalibur.altrmi.common.AltrmiReply;
@@ -42,7 +42,7 @@
* @param altrmiConnectionListener
*
*/
- public void setAltrmiConnectionListener( AltrmiConnectionListener
altrmiConnectionListener )
+ public void setAltrmiConnectionListener( ConnectionListener
altrmiConnectionListener )
{
super.setAltrmiConnectionListener( altrmiConnectionListener );
1.5 +7 -7
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/multiple/AbstractMultipleHostContext.java
Index: AbstractMultipleHostContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/multiple/AbstractMultipleHostContext.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractMultipleHostContext.java 4 Jan 2003 22:17:18 -0000 1.4
+++ AbstractMultipleHostContext.java 5 Jan 2003 23:11:26 -0000 1.5
@@ -9,8 +9,8 @@
import java.util.List;
import java.util.Vector;
-import org.apache.excalibur.altrmi.client.AltrmiClientInvocationHandler;
-import org.apache.excalibur.altrmi.client.AltrmiHostContext;
+import org.apache.excalibur.altrmi.client.ClientInvocationHandler;
+import org.apache.excalibur.altrmi.client.HostContext;
/**
* Class AbstractMultipleHostContext
@@ -19,7 +19,7 @@
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version $Revision$
*/
-public abstract class AbstractMultipleHostContext implements
AltrmiHostContext
+public abstract class AbstractMultipleHostContext implements HostContext
{
private final AbstractMultipleInvocationHandler
m_abstractMultipleInvocationHandler;
@@ -48,7 +48,7 @@
* @param altrmiHostContext
*
*/
- public void addAltrmiHostContext( AltrmiHostContext altrmiHostContext )
+ public void addAltrmiHostContext( HostContext altrmiHostContext )
{
m_altrmiHostContexts.add( altrmiHostContext );
}
@@ -60,7 +60,7 @@
* @param altrmiHostContext
*
*/
- public void removeAltrmiHostContext( AltrmiHostContext altrmiHostContext
)
+ public void removeAltrmiHostContext( HostContext altrmiHostContext )
{
m_altrmiHostContexts.remove( altrmiHostContext );
}
@@ -77,7 +77,7 @@
* @return
*
*/
- public AltrmiClientInvocationHandler getClientInvocationHandler()
+ public ClientInvocationHandler getClientInvocationHandler()
{
return m_abstractMultipleInvocationHandler;
}
1.6 +8 -8
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/multiple/AbstractMultipleInvocationHandler.java
Index: AbstractMultipleInvocationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/multiple/AbstractMultipleInvocationHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractMultipleInvocationHandler.java 4 Jan 2003 22:17:18 -0000
1.5
+++ AbstractMultipleInvocationHandler.java 5 Jan 2003 23:11:27 -0000
1.6
@@ -8,9 +8,9 @@
package org.apache.excalibur.altrmi.client.impl.multiple;
import java.io.IOException;
-import org.apache.excalibur.altrmi.client.AltrmiClientInvocationHandler;
-import org.apache.excalibur.altrmi.client.AltrmiConnectionListener;
-import org.apache.excalibur.altrmi.client.AltrmiConnectionPinger;
+import org.apache.excalibur.altrmi.client.ClientInvocationHandler;
+import org.apache.excalibur.altrmi.client.ConnectionListener;
+import org.apache.excalibur.altrmi.client.ConnectionPinger;
import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
/**
@@ -20,10 +20,10 @@
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version $Revision$
*/
-public abstract class AbstractMultipleInvocationHandler implements
AltrmiClientInvocationHandler
+public abstract class AbstractMultipleInvocationHandler implements
ClientInvocationHandler
{
- private AltrmiConnectionListener m_altrmiConnectionListener;
+ private ConnectionListener m_altrmiConnectionListener;
protected AbstractMultipleHostContext m_multipleHostContext;
/**
@@ -33,7 +33,7 @@
* @param altrmiConnectionListener
*
*/
- public void setAltrmiConnectionListener( AltrmiConnectionListener
altrmiConnectionListener )
+ public void setAltrmiConnectionListener( ConnectionListener
altrmiConnectionListener )
{
m_altrmiConnectionListener = altrmiConnectionListener;
}
@@ -50,7 +50,7 @@
* @param connectionPinger
*
*/
- public void setConnectionPinger( AltrmiConnectionPinger connectionPinger
)
+ public void setConnectionPinger( ConnectionPinger connectionPinger )
{
}
1.7 +9 -9
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/multiple/RotatingMultipleInvocationHandler.java
Index: RotatingMultipleInvocationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/multiple/RotatingMultipleInvocationHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RotatingMultipleInvocationHandler.java 4 Jan 2003 22:17:18 -0000
1.6
+++ RotatingMultipleInvocationHandler.java 5 Jan 2003 23:11:27 -0000
1.7
@@ -3,7 +3,7 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
-import org.apache.excalibur.altrmi.client.AltrmiClientInvocationHandler;
+import org.apache.excalibur.altrmi.client.ClientInvocationHandler;
import org.apache.excalibur.altrmi.common.AltrmiInvocationException;
import org.apache.excalibur.altrmi.common.AltrmiReply;
import org.apache.excalibur.altrmi.common.AltrmiRequest;
@@ -44,8 +44,8 @@
if( m_sessionHandlerMap.containsKey( session ) )
{
- AltrmiClientInvocationHandler cih =
- (AltrmiClientInvocationHandler)m_sessionHandlerMap.get(
session );
+ ClientInvocationHandler cih =
+ (ClientInvocationHandler)m_sessionHandlerMap.get(
session );
return cih.handleInvocation( request );
}
@@ -63,8 +63,8 @@
m_next = 0;
}
- AltrmiClientInvocationHandler cih =
- (AltrmiClientInvocationHandler)hostContexts.get( m_next++ );
+ ClientInvocationHandler cih =
+ (ClientInvocationHandler)hostContexts.get( m_next++ );
AltrmiReply ar = cih.handleInvocation( request );
if( ar instanceof OpenConnectionReply )
@@ -83,8 +83,8 @@
for( Iterator iterator = hostContexts.iterator();
iterator.hasNext(); )
{
- AltrmiClientInvocationHandler cih =
- (AltrmiClientInvocationHandler)iterator.next();
+ ClientInvocationHandler cih =
+ (ClientInvocationHandler)iterator.next();
try
{
@@ -108,7 +108,7 @@
// class request
List hostContexts = m_multipleHostContext.getHostContexts();
- return ( (AltrmiClientInvocationHandler)hostContexts.get( 0 ) )
+ return ( (ClientInvocationHandler)hostContexts.get( 0 ) )
.handleInvocation( request );
}
}
1.7 +5 -5
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/naming/DefaultAltrmiContext.java
Index: DefaultAltrmiContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/naming/DefaultAltrmiContext.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultAltrmiContext.java 4 Jan 2003 22:17:18 -0000 1.6
+++ DefaultAltrmiContext.java 5 Jan 2003 23:11:27 -0000 1.7
@@ -13,8 +13,8 @@
import javax.naming.NameParser;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
-import org.apache.excalibur.altrmi.client.AltrmiInterfaceLookup;
-import org.apache.excalibur.altrmi.client.AltrmiInterfaceLookupFactory;
+import org.apache.excalibur.altrmi.client.InterfaceLookup;
+import org.apache.excalibur.altrmi.client.InterfaceLookupFactory;
import org.apache.excalibur.altrmi.client.impl.DefaultInterfaceLookupFactory;
import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
@@ -29,9 +29,9 @@
public class DefaultAltrmiContext implements Context
{
- AltrmiInterfaceLookupFactory m_altrmiInterfaceLookupFactory =
+ InterfaceLookupFactory m_altrmiInterfaceLookupFactory =
new DefaultInterfaceLookupFactory();
- AltrmiInterfaceLookup m_altrmiInterfaceLookup = null;
+ InterfaceLookup m_altrmiInterfaceLookup = null;
/**
* Constructor DefaultAltrmiContext
1.5 +5 -5
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RmiFactoryHelper.java 26 Oct 2002 14:10:49 -0000 1.4
+++ RmiFactoryHelper.java 5 Jan 2003 23:11:28 -0000 1.5
@@ -9,8 +9,8 @@
import java.io.IOException;
import org.apache.excalibur.altrmi.client.AltrmiFactory;
-import org.apache.excalibur.altrmi.client.AltrmiHostContext;
-import org.apache.excalibur.altrmi.client.AltrmiInterfaceLookup;
+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;
@@ -37,14 +37,14 @@
* @return
*
*/
- public AltrmiInterfaceLookup getAltrmiInterfaceLookup(
+ public InterfaceLookup getAltrmiInterfaceLookup(
String factoryString, ClassLoader interfacesClassLoader, boolean
optimize )
throws AltrmiConnectionException
{
// TODO maybe we should cache these. Or the abstract parent class
should.
String[] terms = processFactoryString( factoryString );
- AltrmiHostContext hc = new RmiHostContext( terms[ 1 ],
Integer.parseInt( terms[ 2 ] ) );
+ HostContext hc = new RmiHostContext( terms[ 1 ], Integer.parseInt(
terms[ 2 ] ) );
AltrmiFactory af = createAltrmiFactory( terms[ 3 ], terms[ 4
].equalsIgnoreCase( "bo" ) );
af.setHostContext( hc );
1.10 +3 -3
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- RmiInvocationHandler.java 4 Jan 2003 22:17:18 -0000 1.9
+++ RmiInvocationHandler.java 5 Jan 2003 23:11:28 -0000 1.10
@@ -13,7 +13,7 @@
import java.rmi.Naming;
import java.rmi.NotBoundException;
import java.rmi.RemoteException;
-import org.apache.excalibur.altrmi.client.AltrmiConnectionListener;
+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;
@@ -92,7 +92,7 @@
* @param altrmiConnectionListener
*
*/
- public void setAltrmiConnectionListener( AltrmiConnectionListener
altrmiConnectionListener )
+ public void setAltrmiConnectionListener( ConnectionListener
altrmiConnectionListener )
{
super.setAltrmiConnectionListener( altrmiConnectionListener );
1.7 +5 -5
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SocketCustomStreamFactoryHelper.java 5 Jan 2003 11:41:40 -0000
1.6
+++ SocketCustomStreamFactoryHelper.java 5 Jan 2003 23:11:28 -0000
1.7
@@ -8,8 +8,8 @@
package org.apache.excalibur.altrmi.client.impl.socket;
import org.apache.excalibur.altrmi.client.AltrmiFactory;
-import org.apache.excalibur.altrmi.client.AltrmiHostContext;
-import org.apache.excalibur.altrmi.client.AltrmiInterfaceLookup;
+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;
@@ -36,14 +36,14 @@
* @return
*
*/
- public AltrmiInterfaceLookup getAltrmiInterfaceLookup(
+ public InterfaceLookup getAltrmiInterfaceLookup(
String factoryString, ClassLoader interfacesClassLoader, boolean
optimize)
throws AltrmiConnectionException
{
// TODO maybe we should cache these. Or the abstract parent class
should.
String[] terms = processFactoryString( factoryString );
- AltrmiHostContext hc = new SocketCustomStreamHostContext( terms[ 1 ],
+ HostContext hc = new SocketCustomStreamHostContext( terms[ 1 ],
Integer.parseInt( terms[ 2 ] ),
interfacesClassLoader );
AltrmiFactory af = createAltrmiFactory( terms[ 3 ], terms[ 4
].equalsIgnoreCase( "bo" ) );
1.6 +5 -5
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SocketObjectStreamFactoryHelper.java 5 Jan 2003 11:41:40 -0000
1.5
+++ SocketObjectStreamFactoryHelper.java 5 Jan 2003 23:11:28 -0000
1.6
@@ -8,8 +8,8 @@
package org.apache.excalibur.altrmi.client.impl.socket;
import org.apache.excalibur.altrmi.client.AltrmiFactory;
-import org.apache.excalibur.altrmi.client.AltrmiHostContext;
-import org.apache.excalibur.altrmi.client.AltrmiInterfaceLookup;
+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;
@@ -36,14 +36,14 @@
* @return
*
*/
- public AltrmiInterfaceLookup getAltrmiInterfaceLookup(
+ public InterfaceLookup getAltrmiInterfaceLookup(
String factoryString, ClassLoader interfacesClassLoader, boolean
optimize )
throws AltrmiConnectionException
{
// TODO maybe we should cache these. Or the abstract parent class
should.
String[] terms = processFactoryString( factoryString );
- AltrmiHostContext hc = new SocketObjectStreamHostContext( terms[ 1 ],
+ HostContext hc = new SocketObjectStreamHostContext( terms[ 1 ],
Integer.parseInt( terms[ 2 ] ),
interfacesClassLoader );
AltrmiFactory af = createAltrmiFactory( terms[ 3 ], terms[ 4
].equalsIgnoreCase( "bo" ) );
1.13 +3 -3
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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- StreamInvocationHandler.java 4 Jan 2003 22:17:19 -0000 1.12
+++ StreamInvocationHandler.java 5 Jan 2003 23:11:28 -0000 1.13
@@ -11,7 +11,7 @@
import java.io.IOException;
import java.io.InterruptedIOException;
import java.net.SocketException;
-import org.apache.excalibur.altrmi.client.AltrmiConnectionListener;
+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;
@@ -72,7 +72,7 @@
* @param altrmiConnectionListener
*
*/
- public void setAltrmiConnectionListener( AltrmiConnectionListener
altrmiConnectionListener )
+ public void setAltrmiConnectionListener( ConnectionListener
altrmiConnectionListener )
{
super.setAltrmiConnectionListener( altrmiConnectionListener );
1.2 +5 -5
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractAltrmiInterfaceLookupFactory.java 8 Aug 2002 14:18:39 -0000
1.1
+++ AbstractAltrmiInterfaceLookupFactory.java 5 Jan 2003 23:11:28 -0000
1.2
@@ -15,14 +15,14 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.excalibur.altrmi.client.AltrmiFactory;
-import org.apache.excalibur.altrmi.client.AltrmiHostContext;
+import org.apache.excalibur.altrmi.client.HostContext;
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;
/**
- * Abstract base factory to create <code>AltrmiInterfaceLookup</code>
instances for the
+ * Abstract base factory to create <code>InterfaceLookup</code> instances
for the
* connection pool.
*
* Concrete subclasses provide support for the various Altrmi transports
@@ -68,18 +68,18 @@
public Object newInstance() throws Exception
{
final AltrmiFactory factory = createFactory();
- final AltrmiHostContext context = createHostContext();
+ final HostContext context = createHostContext();
context.getClientInvocationHandler().setConnectionPinger( new
PerpetualConnectionPinger() );
factory.setHostContext( context );
if( getLogger().isDebugEnabled() )
- getLogger().debug( "AltrmiInterfaceLookup object created" );
+ getLogger().debug( "InterfaceLookup object created" );
return new AltrmiInterfaceLookupWrapper( factory );
}
- protected abstract AltrmiHostContext createHostContext() throws
AltrmiConnectionException;
+ protected abstract HostContext createHostContext() throws
AltrmiConnectionException;
public Class getCreatedClass()
{
1.2 +8 -8
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractSubscriberImpl.java 8 Aug 2002 14:18:39 -0000 1.1
+++ AbstractSubscriberImpl.java 5 Jan 2003 23:11:28 -0000 1.2
@@ -19,8 +19,8 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.excalibur.altrmi.client.AbstractSubscriber;
-import org.apache.excalibur.altrmi.client.AltrmiInterfaceLookup;
-import org.apache.excalibur.altrmi.client.AltrmiLookupSource;
+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;
@@ -66,7 +66,7 @@
* }
* </pre>
*
- * This class is <code>Composable</code> and expects to have a
<code>AltrmiLookupSource</code>
+ * This class is <code>Composable</code> and expects to have a
<code>LookupSource</code>
* available in its <code>ComponentManager</code>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Royal</a>
@@ -76,12 +76,12 @@
{
private int m_retryCount;
private String m_publication;
- private AltrmiLookupSource m_lookupSource;
+ private LookupSource m_lookupSource;
private Map m_subscriptions = Collections.synchronizedMap( new HashMap()
);
public void compose( ComponentManager componentManager ) throws
ComponentException
{
- m_lookupSource = ( AltrmiLookupSource ) componentManager.lookup(
AltrmiLookupSource.ROLE );
+ m_lookupSource = ( LookupSource ) componentManager.lookup(
LookupSource.ROLE );
}
public void configure( Configuration configuration ) throws
ConfigurationException
@@ -94,7 +94,7 @@
{
for( int i = 0; i < this.m_retryCount; i++ )
{
- AltrmiInterfaceLookup lookup = this.m_lookupSource.get();
+ InterfaceLookup lookup = this.m_lookupSource.get();
try
{
@@ -130,8 +130,8 @@
{
if( o != null )
{
- final AltrmiInterfaceLookup lookup =
- ( AltrmiInterfaceLookup ) this.m_subscriptions.remove( o );
+ final InterfaceLookup lookup =
+ ( InterfaceLookup ) this.m_subscriptions.remove( o );
if( lookup == null )
{
1.2 +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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AltrmiInterfaceLookupWrapper.java 8 Aug 2002 14:18:39 -0000 1.1
+++ AltrmiInterfaceLookupWrapper.java 5 Jan 2003 23:11:28 -0000 1.2
@@ -11,26 +11,26 @@
import org.apache.avalon.excalibur.pool.Poolable;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.excalibur.altrmi.client.AltrmiInterfaceLookup;
+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;
/**
* The <code>AbstractAltrmiInterfaceLookupFactory</code> uses this class to
wrap the
- * <code>AltrmiInterfaceLookup</code> objects it returns so they can be
transparently pooled.
+ * <code>InterfaceLookup</code> objects it returns so they can be
transparently pooled.
*
- * An <code>AltrmiInterfaceLookup</code> is deemed <i>broken</i> if the
<code>lookup</code>
- * operation returns an exception. Broken <code>AltrmiInterfaceLookup</code>
instances will
+ * An <code>InterfaceLookup</code> is deemed <i>broken</i> if the
<code>lookup</code>
+ * operation returns an exception. Broken <code>InterfaceLookup</code>
instances will
* be removed from the pool when returned.
*
* @author <a href="[EMAIL PROTECTED]">Peter Royal</a>
* @version $Revision$
*/
public class AltrmiInterfaceLookupWrapper extends AbstractLogEnabled
- implements AltrmiInterfaceLookup, Poolable, Disposable
+ implements InterfaceLookup, Poolable, Disposable
{
- protected final AltrmiInterfaceLookup m_lookup;
+ protected final InterfaceLookup m_lookup;
protected Pool m_pool;
private boolean m_broken = false;
@@ -45,9 +45,9 @@
}
/**
- * @param lookup AltrmiInterfaceLookup instance to wrap
+ * @param lookup InterfaceLookup instance to wrap
*/
- public AltrmiInterfaceLookupWrapper( final AltrmiInterfaceLookup lookup )
+ public AltrmiInterfaceLookupWrapper( final InterfaceLookup lookup )
{
this.m_lookup = lookup;
}
1.2 +3 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/subscriber/AltrmiLookupPool.java
Index: AltrmiLookupPool.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/subscriber/AltrmiLookupPool.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AltrmiLookupPool.java 8 Aug 2002 14:18:39 -0000 1.1
+++ AltrmiLookupPool.java 5 Jan 2003 23:11:28 -0000 1.2
@@ -14,7 +14,7 @@
import org.apache.avalon.framework.activity.Initializable;
/**
- * The Pool implementation for AltrmiInterfaceLookup's.
+ * The Pool implementation for InterfaceLookup's.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Royal</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
@@ -72,7 +72,7 @@
if( obj.isBroken() )
{
if( getLogger().isDebugEnabled() )
- getLogger().debug( "AltrmiInterfaceLookup was broken,
creating one to take its place" );
+ getLogger().debug( "InterfaceLookup was broken, creating one
to take its place" );
try
{
1.2 +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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CallbackEnabledCustomSocketStreamInterfaceLookupFactory.java 8 Aug
2002 14:18:39 -0000 1.1
+++ CallbackEnabledCustomSocketStreamInterfaceLookupFactory.java 5 Jan
2003 23:11:28 -0000 1.2
@@ -9,7 +9,7 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.excalibur.altrmi.client.AltrmiHostContext;
+import org.apache.excalibur.altrmi.client.HostContext;
import
org.apache.excalibur.altrmi.client.impl.callback.socket.CallbackEnabledSocketCustomStreamHostContext;
import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
@@ -33,7 +33,7 @@
m_host = configuration.getChild( "host" ).getValue();
}
- protected AltrmiHostContext createHostContext() throws
AltrmiConnectionException
+ protected HostContext createHostContext() throws
AltrmiConnectionException
{
return new CallbackEnabledSocketCustomStreamHostContext( m_host,
m_port );
}
1.2 +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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RmiInterfaceLookupFactory.java 8 Aug 2002 14:18:39 -0000 1.1
+++ RmiInterfaceLookupFactory.java 5 Jan 2003 23:11:28 -0000 1.2
@@ -9,7 +9,7 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.excalibur.altrmi.client.AltrmiHostContext;
+import org.apache.excalibur.altrmi.client.HostContext;
import org.apache.excalibur.altrmi.client.impl.rmi.RmiHostContext;
import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
@@ -32,7 +32,7 @@
m_host = configuration.getChild( "host" ).getValue();
}
- protected AltrmiHostContext createHostContext() throws
AltrmiConnectionException
+ protected HostContext createHostContext() throws
AltrmiConnectionException
{
return new RmiHostContext( m_host, m_port );
}
1.2 +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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SocketObjectStreamInterfaceLookupFactory.java 8 Aug 2002 14:18:39
-0000 1.1
+++ SocketObjectStreamInterfaceLookupFactory.java 5 Jan 2003 23:11:28
-0000 1.2
@@ -9,7 +9,7 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.excalibur.altrmi.client.AltrmiHostContext;
+import org.apache.excalibur.altrmi.client.HostContext;
import
org.apache.excalibur.altrmi.client.impl.socket.SocketObjectStreamHostContext;
import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
@@ -32,7 +32,7 @@
m_host = configuration.getChild( "host" ).getValue();
}
- protected AltrmiHostContext createHostContext() throws
AltrmiConnectionException
+ protected HostContext createHostContext() throws
AltrmiConnectionException
{
return new SocketObjectStreamHostContext( m_host, m_port );
}
1.7 +3 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/callback/CallbackServerClassAltrmiFactory.java
Index: CallbackServerClassAltrmiFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/callback/CallbackServerClassAltrmiFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CallbackServerClassAltrmiFactory.java 13 Oct 2002 11:54:27 -0000
1.6
+++ CallbackServerClassAltrmiFactory.java 5 Jan 2003 23:11:28 -0000
1.7
@@ -7,7 +7,7 @@
*/
package org.apache.excalibur.altrmi.server.impl.callback;
-import org.apache.excalibur.altrmi.client.AltrmiHostContext;
+import org.apache.excalibur.altrmi.client.HostContext;
import org.apache.excalibur.altrmi.client.impl.AbstractHostContext;
import org.apache.excalibur.altrmi.client.impl.DefaultProxyHelper;
import org.apache.excalibur.altrmi.client.impl.ServerClassAltrmiFactory;
@@ -55,7 +55,7 @@
* @param hostContext The host context
*
*/
- public void setInitializedHostContext( AltrmiHostContext hostContext )
+ public void setInitializedHostContext( HostContext hostContext )
{
m_hostContext = (AbstractHostContext)hostContext;
}
1.7 +3 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/callback/socket/CallbackEnabledSocketCustomStreamReadWriter.java
Index: CallbackEnabledSocketCustomStreamReadWriter.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/callback/socket/CallbackEnabledSocketCustomStreamReadWriter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CallbackEnabledSocketCustomStreamReadWriter.java 5 Jan 2003 22:05:02
-0000 1.6
+++ CallbackEnabledSocketCustomStreamReadWriter.java 5 Jan 2003 23:11:29
-0000 1.7
@@ -11,7 +11,7 @@
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import org.apache.excalibur.altrmi.client.AltrmiConnectionClosedException;
+import org.apache.excalibur.altrmi.client.ConnectionClosedException;
import org.apache.excalibur.altrmi.common.AltrmiReply;
import org.apache.excalibur.altrmi.common.AltrmiRequest;
import org.apache.excalibur.altrmi.common.ExposedObjectProxy;
@@ -280,7 +280,7 @@
if( m_isStopped )
{
- throw new AltrmiConnectionClosedException( "Client Closed
Connection" );
+ throw new ConnectionClosedException( "Client Closed Connection"
);
}
writeRequest( altrmiRequest );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
