hammant 02/05/06 11:14:37
Modified: altrmi/src/java/org/apache/excalibur/altrmi/client
AltrmiClientInvocationHandler.java
AltrmiHostContext.java
altrmi/src/java/org/apache/excalibur/altrmi/client/impl
AbstractAltrmiFactory.java AbstractHostContext.java
ClientClassAltrmiFactory.java
DefaultProxyHelper.java
ServerClassAltrmiFactory.java
altrmi/src/java/org/apache/excalibur/altrmi/client/impl/callback/socket
CallbackEnabledSocketCustomStreamHostContext.java
CallbackEnabledSocketCustomStreamInvocationHandler.java
altrmi/src/java/org/apache/excalibur/altrmi/client/impl/direct
DirectInvocationHandler.java
DirectMarshalledInvocationHandler.java
altrmi/src/java/org/apache/excalibur/altrmi/client/impl/multiple
AbstractMultipleHostContext.java
RotatingMultipleInvocationHandler.java
altrmi/src/java/org/apache/excalibur/altrmi/client/impl/piped
AbstractPipedStreamInvocationHandler.java
altrmi/src/java/org/apache/excalibur/altrmi/client/impl/rmi
RmiInvocationHandler.java
altrmi/src/java/org/apache/excalibur/altrmi/client/impl/stream
StreamInvocationHandler.java
altrmi/src/java/org/apache/excalibur/altrmi/server/impl/callback
CallbackServerClassAltrmiFactory.java
Added: altrmi/src/java/org/apache/excalibur/altrmi/client
CallbackEnabledClientInvocationHandler.java
Log:
Small abstraction of callback so to eliminate hardcoding of impl in interface
code
Revision Changes Path
1.4 +1 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/AltrmiClientInvocationHandler.java
Index: AltrmiClientInvocationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/AltrmiClientInvocationHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AltrmiClientInvocationHandler.java 24 Apr 2002 12:42:56 -0000
1.3
+++ AltrmiClientInvocationHandler.java 6 May 2002 18:14:36 -0000
1.4
@@ -15,7 +15,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version * $Revision: 1.3 $
+ * @version * $Revision: 1.4 $
*/
public interface AltrmiClientInvocationHandler extends
AltrmiInvocationHandler
{
@@ -78,7 +78,5 @@
*
*/
ClassLoader getInterfacesClassLoader();
-
- boolean isCallbackEnabled();
}
1.3 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/AltrmiHostContext.java
Index: AltrmiHostContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/AltrmiHostContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AltrmiHostContext.java 24 Apr 2002 12:42:56 -0000 1.2
+++ AltrmiHostContext.java 6 May 2002 18:14:36 -0000 1.3
@@ -12,7 +12,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version * $Revision: 1.2 $
+ * @version * $Revision: 1.3 $
*/
public interface AltrmiHostContext
{
@@ -24,5 +24,5 @@
* @return
*
*/
- AltrmiClientInvocationHandler getInvocationHandler();
+ AltrmiClientInvocationHandler getClientInvocationHandler();
}
1.1
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/CallbackEnabledClientInvocationHandler.java
Index: CallbackEnabledClientInvocationHandler.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.excalibur.altrmi.client;
import org.apache.excalibur.altrmi.common.AltrmiCallbackException;
public interface CallbackEnabledClientInvocationHandler {
boolean exposeObject( Object tobeExposedObject, Class
tobeExposedInterface ) throws AltrmiCallbackException;
String getPublishedName( Object tobeExposedObject );
}
1.6 +6 -6
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractAltrmiFactory.java 24 Apr 2002 12:42:56 -0000 1.5
+++ AbstractAltrmiFactory.java 6 May 2002 18:14:36 -0000 1.6
@@ -31,7 +31,7 @@
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @author Peter Royal <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public abstract class AbstractAltrmiFactory implements AltrmiFactory
{
@@ -83,10 +83,10 @@
mHostContext = (AbstractHostContext)hostContext;
}
- (
(AbstractClientInvocationHandler)mHostContext.getInvocationHandler()
).initialize();
+ (
(AbstractClientInvocationHandler)mHostContext.getClientInvocationHandler()
).initialize();
AltrmiReply ar =
- mHostContext.getInvocationHandler().handleInvocation( new
OpenConnectionRequest() );
+ mHostContext.getClientInvocationHandler().handleInvocation( new
OpenConnectionRequest() );
if( ar instanceof OpenConnectionReply )
{
@@ -117,7 +117,7 @@
{
AltrmiReply ar =
- mHostContext.getInvocationHandler()
+ mHostContext.getClientInvocationHandler()
.handleInvocation( new LookupRequest( publishedServiceName,
altrmiAuthentication,
mSession ) );
@@ -170,7 +170,7 @@
LookupReply lr = (LookupReply)ar;
DefaultProxyHelper baseObj = new DefaultProxyHelper( this,
-
mHostContext.getInvocationHandler(),
+
mHostContext.getClientInvocationHandler(),
publishedServiceName, "Main",
lr.getReferenceID(), mSession );
Object retVal = getInstance( publishedServiceName, "Main", baseObj,
isBeanOnly() );
@@ -295,7 +295,7 @@
public String[] list()
{
- AltrmiReply ar =
mHostContext.getInvocationHandler().handleInvocation( new ListRequest() );
+ AltrmiReply ar =
mHostContext.getClientInvocationHandler().handleInvocation( new ListRequest() );
if( ar instanceof ListReply )
{
1.4 +2 -2
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractHostContext.java 24 Apr 2002 12:42:56 -0000 1.3
+++ AbstractHostContext.java 6 May 2002 18:14:36 -0000 1.4
@@ -16,7 +16,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public abstract class AbstractHostContext implements AltrmiHostContext
{
@@ -43,7 +43,7 @@
* @return
*
*/
- public AltrmiClientInvocationHandler getInvocationHandler()
+ public AltrmiClientInvocationHandler getClientInvocationHandler()
{
return mAltrmiClientInvocationHandler;
}
1.6 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/ClientClassAltrmiFactory.java
Index: ClientClassAltrmiFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/ClientClassAltrmiFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ClientClassAltrmiFactory.java 24 Apr 2002 12:42:56 -0000 1.5
+++ ClientClassAltrmiFactory.java 6 May 2002 18:14:36 -0000 1.6
@@ -16,7 +16,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public class ClientClassAltrmiFactory extends AbstractAltrmiFactory
{
@@ -102,6 +102,6 @@
*/
public void close()
{
- mHostContext.getInvocationHandler().close();
+ mHostContext.getClientInvocationHandler().close();
}
}
1.8 +19 -24
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultProxyHelper.java 24 Apr 2002 12:42:56 -0000 1.7
+++ DefaultProxyHelper.java 6 May 2002 18:14:36 -0000 1.8
@@ -10,7 +10,8 @@
import java.lang.reflect.Array;
import org.apache.excalibur.altrmi.client.AltrmiProxy;
import org.apache.excalibur.altrmi.client.ProxyHelper;
-import
org.apache.excalibur.altrmi.client.impl.callback.socket.CallbackEnabledSocketCustomStreamInvocationHandler;
+import org.apache.excalibur.altrmi.client.AltrmiClientInvocationHandler;
+import
org.apache.excalibur.altrmi.client.CallbackEnabledClientInvocationHandler;
import org.apache.excalibur.altrmi.common.AltrmiCallbackException;
import org.apache.excalibur.altrmi.common.AltrmiInvocationException;
import org.apache.excalibur.altrmi.common.AltrmiInvocationHandler;
@@ -32,22 +33,20 @@
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @author Vinay Chandrasekharan <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*/
public final class DefaultProxyHelper implements ProxyHelper
{
private final transient AbstractAltrmiFactory mAltrmiFactory;
- private final transient AltrmiInvocationHandler mInvocationHandler;
+ private final transient AltrmiClientInvocationHandler
mClientInvocationHandler;
private final transient String mPublishedServiceName;
private final transient String mObjectName;
private final transient Long mReferenceID;
private final transient Long mSession;
//<callback related>
- private boolean mbIsCallbackAware = false;
- private CallbackEnabledSocketCustomStreamInvocationHandler
mCallbackEnabledSocketCustomStreamInvocationHandler =
- null;
+ private boolean mIsCallbackAware = false;
//</callback related>
@@ -64,24 +63,22 @@
*
*/
public DefaultProxyHelper( AbstractAltrmiFactory altrmiFactory,
- AltrmiInvocationHandler invocationHandler,
+ AltrmiClientInvocationHandler
clientInvocationHandler,
String pubishedServiceName, String
objectName, Long referenceID,
Long session )
{
mAltrmiFactory = altrmiFactory;
- mInvocationHandler = invocationHandler;
+ mClientInvocationHandler = clientInvocationHandler;
mPublishedServiceName = pubishedServiceName;
mObjectName = objectName;
mReferenceID = referenceID;
mSession = session;
//<callback related>
- if( mInvocationHandler instanceof
CallbackEnabledSocketCustomStreamInvocationHandler )
+ if( mClientInvocationHandler instanceof
CallbackEnabledClientInvocationHandler )
{
- mCallbackEnabledSocketCustomStreamInvocationHandler =
-
(CallbackEnabledSocketCustomStreamInvocationHandler)mInvocationHandler;
- mbIsCallbackAware = true;
+ mIsCallbackAware = true;
}
//</callback related>
@@ -136,7 +133,7 @@
mSession );
}
- AltrmiReply reply = mInvocationHandler.handleInvocation( request );
+ AltrmiReply reply = mClientInvocationHandler.handleInvocation(
request );
if( reply.getReplyCode() == AltrmiReply.METHODFACADEREPLY )
{
@@ -154,7 +151,7 @@
if( implBean == null )
{
DefaultProxyHelper pHelper = new DefaultProxyHelper(
mAltrmiFactory,
-
mInvocationHandler,
+
mClientInvocationHandler,
mPublishedServiceName,
mfr.getObjectName(), ref,
mSession );
@@ -195,7 +192,7 @@
if( implBeans[ i ] == null )
{
DefaultProxyHelper bo2 = new DefaultProxyHelper(
mAltrmiFactory,
-
mInvocationHandler,
+
mClientInvocationHandler,
mPublishedServiceName,
objectNames[ i ], refs[ i ],
mSession );
@@ -256,7 +253,7 @@
MethodRequest request = new MethodRequest( mPublishedServiceName,
mObjectName,
methodSignature, args,
mReferenceID, mSession );
- AltrmiReply reply = mInvocationHandler.handleInvocation( request );
+ AltrmiReply reply = mClientInvocationHandler.handleInvocation(
request );
if( reply.getReplyCode() == AltrmiReply.METHODREPLY )
{
@@ -294,7 +291,7 @@
methodSignature, args,
mReferenceID, mSession );
//debug(args);
- AltrmiReply reply = mInvocationHandler.handleInvocation( request );
+ AltrmiReply reply = mClientInvocationHandler.handleInvocation(
request );
if( reply.getReplyCode() == AltrmiReply.METHODREPLY )
{
@@ -397,10 +394,10 @@
args[ i ] = makeFacadeRefHolder( proxy, objName );
}
}
- else if( argClass != null && mbIsCallbackAware )
+ else if( argClass != null && mIsCallbackAware )
{
String publishedName =
-
mCallbackEnabledSocketCustomStreamInvocationHandler.getPublishedName( args[ i ]
);
+ ((CallbackEnabledClientInvocationHandler)
mClientInvocationHandler).getPublishedName( args[ i ] );
if( publishedName != null ) //already published
{
@@ -419,8 +416,7 @@
{
try
{
-
mCallbackEnabledSocketCustomStreamInvocationHandler
- .exposeObject( args[ i ], argClass );
+ ((CallbackEnabledClientInvocationHandler)
mClientInvocationHandler).exposeObject( args[ i ], argClass );
}
catch( AltrmiCallbackException ace )
{
@@ -428,8 +424,7 @@
}
publishedName =
-
mCallbackEnabledSocketCustomStreamInvocationHandler
- .getPublishedName( args[ i ] );
+ ((CallbackEnabledClientInvocationHandler)
mClientInvocationHandler).getPublishedName( args[ i ] );
ExposedObjectProxy exposedObjectProxy =
new ExposedObjectProxy( publishedName );
@@ -471,7 +466,7 @@
synchronized( mAltrmiFactory )
{
GarbageCollectionReply gcr =
- (GarbageCollectionReply)mInvocationHandler
+ (GarbageCollectionReply)mClientInvocationHandler
.handleInvocation( new GarbageCollectionRequest(
mPublishedServiceName,
mObjectName, mSession,
mReferenceID ) );
1.7 +4 -4
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/ServerClassAltrmiFactory.java
Index: ServerClassAltrmiFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/ServerClassAltrmiFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ServerClassAltrmiFactory.java 24 Apr 2002 12:42:56 -0000 1.6
+++ ServerClassAltrmiFactory.java 6 May 2002 18:14:36 -0000 1.7
@@ -23,7 +23,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
public class ServerClassAltrmiFactory extends AbstractAltrmiFactory
{
@@ -70,7 +70,7 @@
try
{
AltrmiReply ar =
- mHostContext.getInvocationHandler()
+ mHostContext.getClientInvocationHandler()
.handleInvocation( new ClassRequest(
publishedServiceName, objectName ) );
if( ar.getReplyCode() >= AltrmiReply.PROBLEMREPLY )
@@ -97,7 +97,7 @@
+ " not published on
Server" );
}
- tcl = new TransportedClassLoader(
mHostContext.getInvocationHandler()
+ tcl = new TransportedClassLoader(
mHostContext.getClientInvocationHandler()
.getInterfacesClassLoader() );
tcl.add( beanClassName, cr.getBeanClassBytes() );
@@ -178,6 +178,6 @@
*/
public void close()
{
- mHostContext.getInvocationHandler().close();
+ mHostContext.getClientInvocationHandler().close();
}
}
1.3 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/callback/socket/CallbackEnabledSocketCustomStreamHostContext.java
Index: CallbackEnabledSocketCustomStreamHostContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/callback/socket/CallbackEnabledSocketCustomStreamHostContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CallbackEnabledSocketCustomStreamHostContext.java 24 Apr 2002 12:42:57
-0000 1.2
+++ CallbackEnabledSocketCustomStreamHostContext.java 6 May 2002 18:14:36
-0000 1.3
@@ -15,7 +15,7 @@
/**
* Class CallbackEnabledSocketCustomStreamHostContext
* @author <a href="mailto:[EMAIL PROTECTED]">Vinay Chandran</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class CallbackEnabledSocketCustomStreamHostContext extends
AbstractHostContext
{
@@ -32,7 +32,7 @@
public boolean exposeObject( Object tobeExposedObject, Class
tobeExposedInterface ) throws AltrmiCallbackException
{
- return (
(CallbackEnabledSocketCustomStreamInvocationHandler)getInvocationHandler()
).exposeObject( tobeExposedObject, tobeExposedInterface );
+ return (
(CallbackEnabledSocketCustomStreamInvocationHandler)getClientInvocationHandler()
).exposeObject( tobeExposedObject, tobeExposedInterface );
}
}
1.5 +3 -7
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CallbackEnabledSocketCustomStreamInvocationHandler.java 24 Apr 2002
12:42:57 -0000 1.4
+++ CallbackEnabledSocketCustomStreamInvocationHandler.java 6 May 2002
18:14:36 -0000 1.5
@@ -13,6 +13,7 @@
import
org.apache.excalibur.altrmi.client.impl.callback.stream.CallbackEnabledClientCustomStreamReadWriter;
import
org.apache.excalibur.altrmi.client.impl.socket.AbstractSocketStreamInvocationHandler;
import org.apache.excalibur.altrmi.client.impl.stream.ClientStreamReadWriter;
+import
org.apache.excalibur.altrmi.client.CallbackEnabledClientInvocationHandler;
import org.apache.excalibur.altrmi.common.AltrmiCallbackException;
import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
@@ -20,10 +21,10 @@
* Class CallbackEnabledSocketCustomStreamInvocationHandler
*
* @author <a href="mailto:[EMAIL PROTECTED]">Vinay Chandran</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public final class CallbackEnabledSocketCustomStreamInvocationHandler
- extends AbstractSocketStreamInvocationHandler
+ extends AbstractSocketStreamInvocationHandler implements
CallbackEnabledClientInvocationHandler
{
private CallbackEnabledClientCustomStreamReadWriter
mCallbackEnabledClientCustomStreamReadWriter;
@@ -58,11 +59,6 @@
public String getPublishedName( Object tobeExposedObject )
{
return
mCallbackEnabledClientCustomStreamReadWriter.getPublishedName(
tobeExposedObject );
- }
-
- public boolean isCallbackEnabled()
- {
- return true;
}
}
1.5 +1 -6
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/direct/DirectInvocationHandler.java
Index: DirectInvocationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/direct/DirectInvocationHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DirectInvocationHandler.java 24 Apr 2002 12:42:57 -0000 1.4
+++ DirectInvocationHandler.java 6 May 2002 18:14:37 -0000 1.5
@@ -18,7 +18,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public final class DirectInvocationHandler extends
AbstractDirectInvocationHandler
{
@@ -43,11 +43,6 @@
protected AltrmiReply performInvocation( AltrmiRequest request ) throws
IOException
{
return mAltrmiInvocationHandler.handleInvocation( request );
- }
-
- public boolean isCallbackEnabled()
- {
- return false;
}
}
1.5 +1 -13
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/direct/DirectMarshalledInvocationHandler.java
Index: DirectMarshalledInvocationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/direct/DirectMarshalledInvocationHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DirectMarshalledInvocationHandler.java 24 Apr 2002 12:42:57 -0000
1.4
+++ DirectMarshalledInvocationHandler.java 6 May 2002 18:14:37 -0000
1.5
@@ -20,7 +20,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public final class DirectMarshalledInvocationHandler extends
AbstractDirectInvocationHandler
{
@@ -99,18 +99,6 @@
public ClassLoader getInterfacesClassLoader()
{
return mInterfacesClassLoader;
- }
-
- /**
- * Method isCallbackEnabled
- *
- *
- * @return
- *
- */
- public boolean isCallbackEnabled()
- {
- return false;
}
}
1.3 +2 -2
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractMultipleHostContext.java 24 Apr 2002 12:42:57 -0000 1.2
+++ AbstractMultipleHostContext.java 6 May 2002 18:14:37 -0000 1.3
@@ -17,7 +17,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public abstract class AbstractMultipleHostContext implements
AltrmiHostContext
{
@@ -77,7 +77,7 @@
* @return
*
*/
- public AltrmiClientInvocationHandler getInvocationHandler()
+ public AltrmiClientInvocationHandler getClientInvocationHandler()
{
return mAbstractMultipleInvocationHandler;
}
1.5 +1 -14
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RotatingMultipleInvocationHandler.java 24 Apr 2002 12:42:57 -0000
1.4
+++ RotatingMultipleInvocationHandler.java 6 May 2002 18:14:37 -0000
1.5
@@ -18,7 +18,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class RotatingMultipleInvocationHandler extends
AbstractMultipleInvocationHandler
{
@@ -112,17 +112,4 @@
.handleInvocation( request );
}
}
-
- /**
- * Method isCallbackEnabled
- *
- *
- * @return
- *
- */
- public boolean isCallbackEnabled()
- {
- return false;
- }
-
}
1.5 +1 -13
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/piped/AbstractPipedStreamInvocationHandler.java
Index: AbstractPipedStreamInvocationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/piped/AbstractPipedStreamInvocationHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractPipedStreamInvocationHandler.java 24 Apr 2002 12:42:57 -0000
1.4
+++ AbstractPipedStreamInvocationHandler.java 6 May 2002 18:14:37 -0000
1.5
@@ -22,7 +22,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public abstract class AbstractPipedStreamInvocationHandler extends
StreamInvocationHandler
{
@@ -74,17 +74,5 @@
protected abstract ClientStreamReadWriter createClientStreamReadWriter(
InputStream in, OutputStream out ) throws IOException;
-
- /**
- * Method isCallbackEnabled
- *
- *
- * @return
- *
- */
- public boolean isCallbackEnabled()
- {
- return false;
- }
}
1.5 +1 -14
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RmiInvocationHandler.java 24 Apr 2002 12:42:57 -0000 1.4
+++ RmiInvocationHandler.java 6 May 2002 18:14:37 -0000 1.5
@@ -33,7 +33,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public final class RmiInvocationHandler extends
AbstractClientInvocationHandler
{
@@ -222,17 +222,4 @@
{
return mLastRealRequest;
}
-
- /**
- * Method isCallbackEnabled
- *
- *
- * @return
- *
- */
- public boolean isCallbackEnabled()
- {
- return false;
- }
-
}
1.5 +1 -13
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StreamInvocationHandler.java 24 Apr 2002 12:42:58 -0000 1.4
+++ StreamInvocationHandler.java 6 May 2002 18:14:37 -0000 1.5
@@ -29,7 +29,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public abstract class StreamInvocationHandler extends
AbstractClientInvocationHandler
{
@@ -219,17 +219,5 @@
public long getLastRealRequest()
{
return mLastRealRequest;
- }
-
- /**
- * Method isCallbackEnabled
- *
- *
- * @return
- *
- */
- public boolean isCallbackEnabled()
- {
- return false;
}
}
1.3 +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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CallbackServerClassAltrmiFactory.java 24 Apr 2002 12:43:01 -0000
1.2
+++ CallbackServerClassAltrmiFactory.java 6 May 2002 18:14:37 -0000
1.3
@@ -28,7 +28,7 @@
* PublishedName during this part of the protocol.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Vinay Chandran</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class CallbackServerClassAltrmiFactory extends
ServerClassAltrmiFactory
{
@@ -78,7 +78,7 @@
String modifiedPublishedName =
publishedServiceName.substring( 0,
publishedServiceName.lastIndexOf( "_" ) );
AltrmiReply ar =
- mHostContext.getInvocationHandler()
+ mHostContext.getClientInvocationHandler()
.handleInvocation( new LookupRequest( modifiedPublishedName,
altrmiAuthentication,
mSession ) );
@@ -103,7 +103,7 @@
LookupReply lr = (LookupReply)ar;
DefaultProxyHelper baseObj = new DefaultProxyHelper( this,
-
mHostContext.getInvocationHandler(),
+
mHostContext.getClientInvocationHandler(),
publishedServiceName, "Main",
lr.getReferenceID(), mSession );
Object retVal = getInstance( modifiedPublishedName, "Main", baseObj,
isBeanOnly() );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
