You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by ha...@apache.org on 2002/01/21 16:38:21 UTC
cvs commit: jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/test DirectTest.java RmiClientTest.java
hammant 02/01/21 07:38:21
Modified: altrmi README.txt
altrmi/src/java/org/apache/commons/altrmi/client/impl
AbstractAltrmiFactory.java
altrmi/src/java/org/apache/commons/altrmi/client/impl/direct
DirectInvocationHandler.java
altrmi/src/java/org/apache/commons/altrmi/client/impl/piped
PipedObjectStreamHostContext.java
altrmi/src/java/org/apache/commons/altrmi/client/impl/rmi
RmiInvocationHandler.java
altrmi/src/java/org/apache/commons/altrmi/client/impl/socket
SocketCustomStreamHostContext.java
SocketObjectStreamHostContext.java
altrmi/src/java/org/apache/commons/altrmi/client/impl/stream
StreamInvocationHandler.java
altrmi/src/java/org/apache/commons/altrmi/server
AltrmiPublisher.java ClassRetriever.java
altrmi/src/java/org/apache/commons/altrmi/server/impl
AbstractClassRetriever.java AbstractServer.java
DefaultInvocationHandler.java
altrmi/src/java/org/apache/commons/altrmi/server/impl/classretrievers
BaseMobileClassRetriever.java
JarFileClassRetriever.java NoClassRetriever.java
PlainClassRetriever.java
altrmi/src/java/org/apache/commons/altrmi/server/impl/rmi
RmiServer.java
altrmi/src/java/org/apache/commons/altrmi/test
DirectTest.java RmiClientTest.java
Added: altrmi tests.xml
altrmi/src/java/org/apache/commons/altrmi/client/impl
AbstractClientInvocationHandler.java
AbstractHostContext.java
DefaultConnectionListener.java
altrmi/src/java/org/apache/commons/altrmi/client/impl/direct
DirectHostContext.java
altrmi/src/java/org/apache/commons/altrmi/client/impl/rmi
RmiHostContext.java
altrmi/src/java/org/apache/commons/altrmi/server
ClassRetrievalException.java
PublicationException.java
ServerInvocationHandler.java
altrmi/src/java/org/apache/commons/altrmi/server/impl/direct
DirectInovcationAdapter.java
altrmi/src/java/org/apache/commons/altrmi/server/impl/rmi
RmiInovcationAdapter.java
Removed: altrmi altrmi-tests.xml
altrmi/src/java/org/apache/commons/altrmi/client/impl
AbstractAltrmiClientInvocationHandler.java
AbstractAltrmiHostContext.java
DefaultAltrmiConnectionListener.java
altrmi/src/java/org/apache/commons/altrmi/client/impl/direct
DirectAltrmiHostContext.java
altrmi/src/java/org/apache/commons/altrmi/client/impl/rmi
RmiAltrmiHostContext.java
altrmi/src/java/org/apache/commons/altrmi/server
AltrmiClassRetrievalException.java
AltrmiPublicationException.java
AltrmiServerInvocationHandler.java
altrmi/src/java/org/apache/commons/altrmi/server/impl/direct
DirectAltrmiInovcationAdapter.java
altrmi/src/java/org/apache/commons/altrmi/server/impl/rmi
RmiAltrmiInovcationAdapter.java
Log:
renames of classes, test targets and the test file itself
Revision Changes Path
1.2 +6 -6 jakarta-commons-sandbox/altrmi/README.txt
Index: README.txt
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/README.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.txt 9 Jan 2002 19:25:53 -0000 1.1
+++ README.txt 21 Jan 2002 15:38:20 -0000 1.2
@@ -11,21 +11,21 @@
To test ObjectStream over Socket transport:
- In DOS shell #1 - "ant -buildfile altrmi-tests.xml test1a-serve"
- In DOS shell #2 - "ant -buildfile altrmi-tests.xml test1a-client"
+ In DOS shell #1 - "ant -buildfile tests.xml socketa-serve"
+ In DOS shell #2 - "ant -buildfile tests.xml socketa-client"
To test ObjectStream Piped transport
- In DOS shell #1 - "ant -buildfile altrmi-tests.xml test2a"
+ In DOS shell #1 - "ant -buildfile tests.xml pipeda"
To test (AltRMI over) RMI transport:
- In DOS shell #1 - "ant -buildfile altrmi-tests.xml test3a-serve"
- In DOS shell #2 - "ant -buildfile altrmi-tests.xml test3a-client"
+ In DOS shell #1 - "ant -buildfile tests.xml rmia-serve"
+ In DOS shell #2 - "ant -buildfile tests.xml rmia-client"
To test Direct transport
- In DOS shell #1 - "ant -buildfile altrmi-tests.xml test4a"
+ In DOS shell #1 - "ant -buildfile tests.xml directa"
To test with class definition forwarding (from server to client),
same as above four tests, but with "b" instead of "a" in the target name.
1.1 jakarta-commons-sandbox/altrmi/tests.xml
Index: tests.xml
===================================================================
<project name="Alt (to) RMI" default="generate" basedir=".">
<!--
"Alt (to) RMI" component of the Jakarta Commons Subproject
$Id: tests.xml,v 1.1 2002/01/21 15:38:20 hammant Exp $
-->
<!-- ========== Initialize Properties ===================================== -->
<property file="build.properties"/> <!-- Component local -->
<property file="../build.properties"/> <!-- Commons local -->
<property file="${user.home}/build.properties"/> <!-- User local -->
<!-- ========== Component Declarations ==================================== -->
<!-- The base directory for compilation targets -->
<property name="build.home" value="build"/>
<!-- ========== Compiler Defaults ========================================= -->
<!-- Should Java compilations set the 'debug' compiler option? -->
<property name="compile.debug" value="true"/>
<!-- Should Java compilations set the 'deprecation' compiler option? -->
<property name="compile.deprecation" value="true"/>
<!-- Should Java compilations set the 'optimize' compiler option? -->
<property name="compile.optimize" value="true"/>
<!-- Construct compile classpath -->
<path id="compile.classpath">
<pathelement location="${build.home}/classes"/>
</path>
<!-- For running of tests -->
<path id="testA.classpath">
<pathelement location="${build.home}/classes"/>
<pathelement location="${build.home}/classes2"/>
<pathelement location="lib/JSX0.9.7.1.jar"/>
</path>
<path id="testB1.classpath">
<pathelement location="${build.home}/classes"/>
<pathelement location="${build.home}/classes3"/>
</path>
<path id="testB2.classpath">
<pathelement location="${build.home}/classes"/>
</path>
<taskdef name="altrmiinterfaces" classname="org.apache.commons.altrmi.generator.ant.AltrmiInterfaceTask">
<classpath refid="compile.classpath" />
</taskdef>
<taskdef name="altrmiclassintern" classname="org.apache.commons.altrmi.generator.ant.AltrmiClassInternTask">
<classpath refid="compile.classpath" />
</taskdef>
<!-- ========== Executable Targets ======================================== -->
<target name="prepare"
description="Prepare build directory">
<mkdir dir="${build.home}"/>
<mkdir dir="${build.home}/classes2"/>
<delete>
<fileset dir="${build.home}/classes2" includes="*" defaultexcludes="no"/>
</delete>
<mkdir dir="${build.home}/genjava"/>
<delete>
<fileset dir="${build.home}/genjava" includes="*" defaultexcludes="no"/>
</delete>
<mkdir dir="${build.home}/genjava2"/>
<delete>
<fileset dir="${build.home}/genjava2" includes="*" defaultexcludes="no"/>
</delete>
<mkdir dir="${build.home}/classes3"/>
<delete>
<fileset dir="${build.home}/classes3" includes="*" defaultexcludes="no"/>
</delete>
</target>
<target name="generate" depends="prepare">
<altrmiinterfaces genname="Hello" gendir="${build.home}/genjava"
classesorinterfaces="org.apache.commons.altrmi.test.TestInterface"
additionalfacades="org.apache.commons.altrmi.test.TestInterface2"/>
<javac srcdir="${build.home}/genjava"
destdir="${build.home}/classes2"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}">
<classpath refid="compile.classpath"/>
</javac>
<altrmiclassintern gendir="${build.home}/genjava2"
sourceclassdir="${build.home}/classes2/"
publishedname="Hello" />
<javac srcdir="${build.home}/genjava2"
destdir="${build.home}/classes3"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}">
<classpath refid="compile.classpath"/>
</javac>
</target>
<target name="socketa-serve" description="Socket Server (ObjectStream, client side classes)">
<java classname="org.apache.commons.altrmi.test.SocketServerTest" fork="true">
<classpath refid="testA.classpath"/>
<arg value="C"/>
<arg value="ObjectStream"/>
</java>
</target>
<target name="socketa-client" description="Socket Client (ObjectStream, client side classes)" depends="generate">
<java classname="org.apache.commons.altrmi.test.SocketClientTest" fork="true">
<classpath refid="testA.classpath"/>
<arg value="C"/>
<arg value="ObjectStream"/>
</java>
</target>
<target name="socketc-serve" description="Socket Server (CustomStream, client side classes)">
<java classname="org.apache.commons.altrmi.test.SocketServerTest" fork="true">
<classpath refid="testA.classpath"/>
<arg value="C"/>
<arg value="CustomStream"/>
</java>
</target>
<target name="socketc-client" description="Socket Client (CustomStream, client side classes)" depends="generate">
<java classname="org.apache.commons.altrmi.test.SocketClientTest" fork="true">
<classpath refid="testA.classpath"/>
<arg value="C"/>
<arg value="CustomStream"/>
</java>
</target>
<target name="socketd-serve" description="Socket Server (JSX, client side classes)">
<java classname="org.apache.commons.altrmi.test.SocketServerTest" fork="true">
<classpath refid="testA.classpath"/>
<arg value="C"/>
<arg value="JSX"/>
</java>
</target>
<target name="socketd-client" depends="generate" description="Socket Client (JSX, client side classes)">
<java classname="org.apache.commons.altrmi.test.SocketClientTest" fork="true">
<classpath refid="testA.classpath"/>
<arg value="C"/>
<arg value="JSX"/>
</java>
</target>
<target name="pipeda" depends="generate" description="Pipe Server and Client (ObjectStream, client side classes)">
<java classname="org.apache.commons.altrmi.test.PipeTest" fork="true">
<classpath refid="testA.classpath"/>
<arg value="C"/>
</java>
</target>
<target name="rmia-serve" description="RMI Server (client side classes)">
<java classname="org.apache.commons.altrmi.test.RmiServerTest" fork="true">
<classpath refid="testA.classpath"/>
<arg value="C"/>
</java>
</target>
<target name="rmia-client" depends="generate" description="RMI Client (client side classes)">
<java classname="org.apache.commons.altrmi.test.RmiClientTest" fork="true">
<classpath refid="testA.classpath"/>
<arg value="C"/>
</java>
</target>
<target name="directa" depends="generate" description="Direct Server and Client (client side classes)">
<java classname="org.apache.commons.altrmi.test.DirectTest" fork="true">
<classpath refid="testA.classpath"/>
<arg value="C"/>
</java>
</target>
<target name="dynamicproxy" depends="generate" description="Dynamic Proxy (not AltRMI)">
<java classname="org.apache.commons.altrmi.test.DynamicProxyTest" fork="true">
<classpath refid="testA.classpath"/>
</java>
</target>
<target name="codedproxy" depends="generate" description="Hand Coded Proxy (not AltRMI)">
<java classname="org.apache.commons.altrmi.test.CodedProxyTest" fork="true">
<classpath refid="testA.classpath"/>
</java>
</target>
<target name="unproxy" depends="generate" description="No Proxy (not AltRMi)">
<java classname="org.apache.commons.altrmi.test.UnProxyTest" fork="true">
<classpath refid="testA.classpath"/>
</java>
</target>
<target name="socketb-serve">
<java classname="org.apache.commons.altrmi.test.SocketServerTest" fork="true">
<classpath refid="testB1.classpath"/>
<arg value="S"/>
</java>
</target>
<target name="clientb-client" depends="generate">
<java classname="org.apache.commons.altrmi.test.SocketClientTest" fork="true">
<classpath refid="testB2.classpath"/>
<arg value="S"/>
</java>
</target>
<target name="pipedb" depends="generate">
<java classname="org.apache.commons.altrmi.test.PipeTest" fork="true">
<classpath refid="testB1.classpath"/>
<arg value="S"/>
</java>
</target>
<target name="rmib-serve">
<java classname="org.apache.commons.altrmi.test.RmiServerTest" fork="true">
<classpath refid="testB1.classpath"/>
<arg value="S"/>
</java>
</target>
<target name="rmib-client" depends="generate">
<java classname="org.apache.commons.altrmi.test.RmiClientTest" fork="true">
<classpath refid="testB2.classpath"/>
<arg value="S"/>
</java>
</target>
<target name="directb" depends="generate">
<java classname="org.apache.commons.altrmi.test.DirectTest" fork="true">
<classpath refid="testB1.classpath"/>
<arg value="S"/>
</java>
</target>
<target name="directc" depends="generate">
<java classname="org.apache.commons.altrmi.test.DirectTestC" fork="true">
<classpath refid="testA.classpath"/>
<arg value="S"/>
</java>
</target>
</project>
1.8 +4 -4 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/AbstractAltrmiFactory.java
Index: AbstractAltrmiFactory.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/AbstractAltrmiFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractAltrmiFactory.java 19 Jan 2002 13:30:19 -0000 1.7
+++ AbstractAltrmiFactory.java 21 Jan 2002 15:38:20 -0000 1.8
@@ -29,11 +29,11 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*/
public abstract class AbstractAltrmiFactory implements AltrmiFactory {
- protected AbstractAltrmiHostContext mHostContext;
+ protected AbstractHostContext mHostContext;
protected final HashMap mObjRefs = new HashMap();
protected final HashMap mRefObjs = new HashMap();
private final boolean mBeanOnly;
@@ -73,10 +73,10 @@
public final void setHostContext(AltrmiHostContext hostContext) throws IOException {
if (mHostContext == null) {
- mHostContext = (AbstractAltrmiHostContext) hostContext;
+ mHostContext = (AbstractHostContext) hostContext;
}
- ((AbstractAltrmiClientInvocationHandler) mHostContext.getInvocationHandler()).initialize();
+ ((AbstractClientInvocationHandler) mHostContext.getInvocationHandler()).initialize();
AltrmiReply ar =
mHostContext.getInvocationHandler().handleInvocation(new OpenConnectionRequest());
1.1 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/AbstractClientInvocationHandler.java
Index: AbstractClientInvocationHandler.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.commons.altrmi.client.impl;
import org.apache.commons.altrmi.common.AltrmiInvocationHandler;
import org.apache.commons.altrmi.client.AltrmiConnectionListener;
import org.apache.commons.altrmi.client.AltrmiConnectionPinger;
import org.apache.commons.altrmi.client.AltrmiClientInvocationHandler;
import java.io.IOException;
/**
* Class AbstractClientInvocationHandler
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
* @version $Revision: 1.1 $
*/
public abstract class AbstractClientInvocationHandler implements AltrmiInvocationHandler, AltrmiClientInvocationHandler {
protected AltrmiConnectionPinger mConnectionPinger;
protected AltrmiConnectionListener mAltrmiConnectionListener =
new DefaultConnectionListener();
/**
* Method setAltrmiConnectionListener
*
*
* @param altrmiConnectionListener
*
*/
public void setAltrmiConnectionListener(AltrmiConnectionListener altrmiConnectionListener) {
mAltrmiConnectionListener = altrmiConnectionListener;
}
public void initialize() throws IOException {
System.out.println(" initializing ");
if (mConnectionPinger == null) {
mConnectionPinger = new DefaultConnectionPinger();
}
mConnectionPinger.setAltrmiInvocationHandler(this);
mConnectionPinger.start();
}
public void close() {
mConnectionPinger.stop();
}
protected abstract boolean tryReconnect();
/**
* Method setConnectionPinger
*
*
* @param connectionPinger
*
*/
public void setConnectionPinger(AltrmiConnectionPinger connectionPinger) {
mConnectionPinger = connectionPinger;
}
}
1.1 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/AbstractHostContext.java
Index: AbstractHostContext.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.commons.altrmi.client.impl;
import org.apache.commons.altrmi.common.AltrmiInvocationHandler;
import org.apache.commons.altrmi.client.AltrmiHostContext;
import org.apache.commons.altrmi.client.AltrmiConnectionListener;
import org.apache.commons.altrmi.client.AltrmiClientInvocationHandler;
/**
* Class AbstractHostContext
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
* @version $Revision: 1.1 $
*/
public class AbstractHostContext implements AltrmiHostContext {
protected final AltrmiClientInvocationHandler mAltrmiClientInvocationHandler;
/**
* Constructor AbstractHostContext
*
*
*
* @param altrmiClientInvocationHandler
*
*/
public AbstractHostContext(
AltrmiClientInvocationHandler altrmiClientInvocationHandler) {
this.mAltrmiClientInvocationHandler = altrmiClientInvocationHandler;
}
/**
* Method getInvocationHandler
*
*
* @return
*
*/
public AltrmiClientInvocationHandler getInvocationHandler() {
return mAltrmiClientInvocationHandler;
}
/**
* Method setAltrmiConnectionListener
*
*
*
* @param altrmiConnectionListener
*
*/
public void setAltrmiConnectionListener(AltrmiConnectionListener altrmiConnectionListener) {
mAltrmiClientInvocationHandler.setAltrmiConnectionListener(altrmiConnectionListener);
}
}
1.1 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/DefaultConnectionListener.java
Index: DefaultConnectionListener.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.commons.altrmi.client.impl;
import org.apache.commons.altrmi.common.AltrmiInvocationHandler;
import org.apache.commons.altrmi.common.AltrmiInvocationException;
import org.apache.commons.altrmi.common.AltrmiRequest;
import org.apache.commons.altrmi.client.AltrmiConnectionListener;
/**
* Interface AltrmiConnectionListener
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
* @version * $Revision: 1.1 $
*/
public class DefaultConnectionListener implements AltrmiConnectionListener {
/**
* Method methodCalled
*
*
*
* @param methodSignature
* @param duration
*
*/
public void methodCalled(final String methodSignature, final long duration) {
// do mothing in default impl, could do logging.
}
/**
* Method methodLogging tests if the implementing class intends to do method logging.
*
*
* @return
*
*/
public boolean methodLogging() {
return false;
}
/**
* Method serviceSuspended
*
*
*
* @param altrmiRequest
* @param attempt
* @param suggestedWaitMillis
*
*/
public void serviceSuspended(final AltrmiRequest altrmiRequest, final int attempt,
final int suggestedWaitMillis) {
// Lets say that ten retries is too many.
if (attempt == 10) {
throw new AltrmiInvocationException("Too many retries on suspended service");
}
System.out.println("AltRMI service suspended, Trying to reconnect (attempt " + attempt
+ ", waiting for " + suggestedWaitMillis / 1000 + " seconds)");
// We are quite happy with the recommended wait time.
try {
Thread.sleep(suggestedWaitMillis);
} catch (InterruptedException ie) {
// TODO ?
}
}
/**
* Method serviceAbend
*
*
*
* @param attempt
*
*/
public void serviceAbend(int attempt) {
// Lets say that ten retries is too many.
if (attempt == 3) {
throw new AltrmiInvocationException("Too many retries on abended service");
}
System.out.println("AltRMI service abnormally ended, Trying to reconnect (attempt "
+ attempt + ")");
// Increasing wait time.
try {
Thread.sleep((2 ^ attempt) * 500);
} catch (InterruptedException ie) {
// TODO ?
}
}
}
1.5 +3 -3 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/direct/DirectInvocationHandler.java
Index: DirectInvocationHandler.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/direct/DirectInvocationHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DirectInvocationHandler.java 19 Jan 2002 15:06:58 -0000 1.4
+++ DirectInvocationHandler.java 21 Jan 2002 15:38:20 -0000 1.5
@@ -22,7 +22,7 @@
import org.apache.commons.altrmi.common.MethodRequest;
import org.apache.commons.altrmi.common.NoSuchReferenceReply;
import org.apache.commons.altrmi.common.NotSuchReferenceException;
-import org.apache.commons.altrmi.client.impl.AbstractAltrmiClientInvocationHandler;
+import org.apache.commons.altrmi.client.impl.AbstractClientInvocationHandler;
import org.apache.commons.altrmi.client.AltrmiConnectionListener;
import java.io.IOException;
@@ -33,9 +33,9 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
-public final class DirectInvocationHandler extends AbstractAltrmiClientInvocationHandler {
+public final class DirectInvocationHandler extends AbstractClientInvocationHandler {
private AltrmiInvocationHandler mAltrmiInvocationHandler;
private boolean mMethodLogging = false;
1.1 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/direct/DirectHostContext.java
Index: DirectHostContext.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.commons.altrmi.client.impl.direct;
import org.apache.commons.altrmi.client.impl.AbstractHostContext;
import org.apache.commons.altrmi.client.AltrmiConnectionListener;
import org.apache.commons.altrmi.common.AltrmiInvocationHandler;
import org.apache.commons.altrmi.common.AltrmiConnectionException;
/**
* Class DirectHostContext
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
* @version $Revision: 1.1 $
*/
public class DirectHostContext extends AbstractHostContext {
/**
* Constructor DirectHostContext
*
*
* @param altrmiInvocationHandler
*
* @throws AltrmiConnectionException
*
*/
public DirectHostContext(AltrmiInvocationHandler altrmiInvocationHandler)
throws AltrmiConnectionException {
super(new DirectInvocationHandler(altrmiInvocationHandler));
}
//public void setAltrmiConnectionListener(AltrmiConnectionListener altrmiConnectionListener) {
//}
}
1.3 +3 -3 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/piped/PipedObjectStreamHostContext.java
Index: PipedObjectStreamHostContext.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/piped/PipedObjectStreamHostContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PipedObjectStreamHostContext.java 17 Jan 2002 12:14:29 -0000 1.2
+++ PipedObjectStreamHostContext.java 21 Jan 2002 15:38:20 -0000 1.3
@@ -10,7 +10,7 @@
-import org.apache.commons.altrmi.client.impl.AbstractAltrmiHostContext;
+import org.apache.commons.altrmi.client.impl.AbstractHostContext;
import org.apache.commons.altrmi.common.AltrmiConnectionException;
import org.apache.commons.altrmi.server.impl.piped.AbstractPipedServer;
@@ -24,9 +24,9 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
-public class PipedObjectStreamHostContext extends AbstractAltrmiHostContext {
+public class PipedObjectStreamHostContext extends AbstractHostContext {
/**
* Constructor PipedObjectStreamHostContext
1.5 +3 -3 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/rmi/RmiInvocationHandler.java
Index: RmiInvocationHandler.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/rmi/RmiInvocationHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RmiInvocationHandler.java 19 Jan 2002 15:06:58 -0000 1.4
+++ RmiInvocationHandler.java 21 Jan 2002 15:38:20 -0000 1.5
@@ -10,7 +10,7 @@
-import org.apache.commons.altrmi.client.impl.AbstractAltrmiClientInvocationHandler;
+import org.apache.commons.altrmi.client.impl.AbstractClientInvocationHandler;
import org.apache.commons.altrmi.client.AltrmiConnectionListener;
import org.apache.commons.altrmi.common.RmiAltrmiInvocationHandler;
import org.apache.commons.altrmi.common.AltrmiConnectionException;
@@ -41,9 +41,9 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
-public final class RmiInvocationHandler extends AbstractAltrmiClientInvocationHandler {
+public final class RmiInvocationHandler extends AbstractClientInvocationHandler {
private RmiAltrmiInvocationHandler mRmiAltrmiInvocationHandler;
private String mURL;
1.1 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/rmi/RmiHostContext.java
Index: RmiHostContext.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.commons.altrmi.client.impl.rmi;
import org.apache.commons.altrmi.client.impl.AbstractHostContext;
import org.apache.commons.altrmi.common.AltrmiConnectionException;
/**
* Class RmiHostContext
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
* @version $Revision: 1.1 $
*/
public class RmiHostContext extends AbstractHostContext {
/**
* Constructor RmiHostContext
*
*
* @param host
* @param port
*
* @throws AltrmiConnectionException
*
*/
public RmiHostContext(String host, int port) throws AltrmiConnectionException {
super(new RmiInvocationHandler(host, port));
}
}
1.2 +3 -3 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/socket/SocketCustomStreamHostContext.java
Index: SocketCustomStreamHostContext.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/socket/SocketCustomStreamHostContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SocketCustomStreamHostContext.java 17 Jan 2002 12:14:29 -0000 1.1
+++ SocketCustomStreamHostContext.java 21 Jan 2002 15:38:21 -0000 1.2
@@ -10,7 +10,7 @@
-import org.apache.commons.altrmi.client.impl.AbstractAltrmiHostContext;
+import org.apache.commons.altrmi.client.impl.AbstractHostContext;
import org.apache.commons.altrmi.common.AltrmiConnectionException;
import java.net.Socket;
@@ -21,9 +21,9 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
-public class SocketCustomStreamHostContext extends AbstractAltrmiHostContext {
+public class SocketCustomStreamHostContext extends AbstractHostContext {
/**
* Constructor SocketCustomStreamHostContext
1.5 +3 -3 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/socket/SocketObjectStreamHostContext.java
Index: SocketObjectStreamHostContext.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/socket/SocketObjectStreamHostContext.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SocketObjectStreamHostContext.java 18 Jan 2002 17:33:07 -0000 1.4
+++ SocketObjectStreamHostContext.java 21 Jan 2002 15:38:21 -0000 1.5
@@ -10,7 +10,7 @@
-import org.apache.commons.altrmi.client.impl.AbstractAltrmiHostContext;
+import org.apache.commons.altrmi.client.impl.AbstractHostContext;
import org.apache.commons.altrmi.common.AltrmiConnectionException;
import java.net.Socket;
@@ -21,9 +21,9 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
-public class SocketObjectStreamHostContext extends AbstractAltrmiHostContext {
+public class SocketObjectStreamHostContext extends AbstractHostContext {
private String mObjectOutputStreamClassName;
private String mObjectInputStreamClassName;
1.2 +3 -3 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/stream/StreamInvocationHandler.java
Index: StreamInvocationHandler.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/stream/StreamInvocationHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StreamInvocationHandler.java 20 Jan 2002 00:13:40 -0000 1.1
+++ StreamInvocationHandler.java 21 Jan 2002 15:38:21 -0000 1.2
@@ -22,7 +22,7 @@
import org.apache.commons.altrmi.common.NoSuchReferenceReply;
import org.apache.commons.altrmi.common.NotSuchReferenceException;
import org.apache.commons.altrmi.client.AltrmiConnectionListener;
-import org.apache.commons.altrmi.client.impl.AbstractAltrmiClientInvocationHandler;
+import org.apache.commons.altrmi.client.impl.AbstractClientInvocationHandler;
import java.io.IOException;
import java.io.ObjectOutputStream;
@@ -37,9 +37,9 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
-public abstract class StreamInvocationHandler extends AbstractAltrmiClientInvocationHandler {
+public abstract class StreamInvocationHandler extends AbstractClientInvocationHandler {
private ClientStreamReadWriter mObjectReadWriter;
private boolean mMethodLogging = false;
1.2 +7 -7 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/AltrmiPublisher.java
Index: AltrmiPublisher.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/AltrmiPublisher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AltrmiPublisher.java 9 Jan 2002 19:25:55 -0000 1.1
+++ AltrmiPublisher.java 21 Jan 2002 15:38:21 -0000 1.2
@@ -18,7 +18,7 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version * $Revision: 1.1 $
+ * @version * $Revision: 1.2 $
*/
public interface AltrmiPublisher {
@@ -31,7 +31,7 @@
* @param classOrInterfaceToExpose
*
*/
- void publish(Object impl, String asName, Class classOrInterfaceToExpose) throws AltrmiPublicationException;
+ void publish(Object impl, String asName, Class classOrInterfaceToExpose) throws PublicationException;
/**
* Method publish
@@ -43,7 +43,7 @@
* @param additionalFacade
*
*/
- void publish(Object impl, String asName, Class classOrInterfaceToExpose, Class additionalFacade) throws AltrmiPublicationException;
+ void publish(Object impl, String asName, Class classOrInterfaceToExpose, Class additionalFacade) throws PublicationException;
/**
* Method publish
@@ -55,7 +55,7 @@
* @param additionalFacades
*
*/
- void publish(Object impl, String asName, Class classOrInterfaceToExpose, Class[] additionalFacades) throws AltrmiPublicationException;
+ void publish(Object impl, String asName, Class classOrInterfaceToExpose, Class[] additionalFacades) throws PublicationException;
/**
@@ -67,7 +67,7 @@
* @param classesOrInterfacesToExpose
*
*/
- void publish(Object impl, String asName, Class[] classesOrInterfacesToExpose) throws AltrmiPublicationException;
+ void publish(Object impl, String asName, Class[] classesOrInterfacesToExpose) throws PublicationException;
/**
* Method publish
@@ -79,7 +79,7 @@
* @param additionalFacades
*
*/
- void publish(Object impl, String asName, Class[] classesOrInterfacesToExpose, Class[] additionalFacades) throws AltrmiPublicationException;
+ void publish(Object impl, String asName, Class[] classesOrInterfacesToExpose, Class[] additionalFacades) throws PublicationException;
/**
@@ -90,7 +90,7 @@
* @param asName
*
*/
- void unPublish(Object impl, String asName) throws AltrmiPublicationException;
+ void unPublish(Object impl, String asName) throws PublicationException;
/**
* Method replacePublished
@@ -101,7 +101,7 @@
* @param withImpl
*
*/
- void replacePublished(Object oldImpl, String asName, Object withImpl) throws AltrmiPublicationException;
+ void replacePublished(Object oldImpl, String asName, Object withImpl) throws PublicationException;
1.3 +2 -2 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/ClassRetriever.java
Index: ClassRetriever.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/ClassRetriever.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ClassRetriever.java 13 Jan 2002 00:13:53 -0000 1.2
+++ ClassRetriever.java 21 Jan 2002 15:38:21 -0000 1.3
@@ -10,7 +10,7 @@
public interface ClassRetriever {
- byte[] getBeanBytes(String publishedName) throws AltrmiClassRetrievalException;
- byte[] getInterfaceImplementationBytes(String publishedName) throws AltrmiClassRetrievalException;
+ byte[] getBeanBytes(String publishedName) throws ClassRetrievalException;
+ byte[] getInterfaceImplementationBytes(String publishedName) throws ClassRetrievalException;
}
1.1 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/ClassRetrievalException.java
Index: ClassRetrievalException.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.commons.altrmi.server;
import java.io.Serializable;
/**
* Class ClassRetrievalException
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
* @version $Revision: 1.1 $
*/
public class ClassRetrievalException extends Exception {
/**
* Constructor ClassRetrievalException
*
*
* @param s
*
*/
public ClassRetrievalException(String reason) {
super(reason);
}
}
1.1 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/PublicationException.java
Index: PublicationException.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.commons.altrmi.server;
/**
* Class PublicationException
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
* @version $Revision: 1.1 $
*/
public class PublicationException extends Exception {
/**
* Constructor PublicationException
*
*
* @param s
*
*/
public PublicationException(String s) {
super(s);
}
}
1.1 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/ServerInvocationHandler.java
Index: ServerInvocationHandler.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.commons.altrmi.server;
import org.apache.commons.altrmi.common.AltrmiInvocationHandler;
/**
* Class ServerInvocationHandler
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
* @version $Revision: 1.1 $
*/
public interface ServerInvocationHandler extends AltrmiInvocationHandler {
/**
* Method addImplementationBean
*
*
* @param referenceID
* @param beanImpl
*
*/
void addImplementationBean(Long referenceID, Object beanImpl);
/**
* Method replaceImplementationBean
*
*
* @param implBean
* @param withImplBean
*
*/
void replaceImplementationBean(Object implBean, Object withImplBean);
/**
* Method getOrMakeReferenceIDForBean
*
*
* @param implBean
*
*/
Long getOrMakeReferenceIDForBean(Object implBean);
}
1.3 +7 -7 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/impl/AbstractClassRetriever.java
Index: AbstractClassRetriever.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/impl/AbstractClassRetriever.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractClassRetriever.java 17 Jan 2002 12:14:29 -0000 1.2
+++ AbstractClassRetriever.java 21 Jan 2002 15:38:21 -0000 1.3
@@ -11,7 +11,7 @@
import org.apache.commons.altrmi.server.ClassRetriever;
-import org.apache.commons.altrmi.server.AltrmiClassRetrievalException;
+import org.apache.commons.altrmi.server.ClassRetrievalException;
/**
@@ -19,7 +19,7 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public abstract class AbstractClassRetriever implements ClassRetriever {
@@ -31,10 +31,10 @@
*
* @return
*
- * @throws AltrmiClassRetrievalException
+ * @throws ClassRetrievalException
*
*/
- public final byte[] getBeanBytes(String publishedName) throws AltrmiClassRetrievalException {
+ public final byte[] getBeanBytes(String publishedName) throws ClassRetrievalException {
return getThingBytes("AltrmiGenerated" + publishedName);
}
@@ -46,14 +46,14 @@
*
* @return
*
- * @throws AltrmiClassRetrievalException
+ * @throws ClassRetrievalException
*
*/
public final byte[] getInterfaceImplementationBytes(String publishedName)
- throws AltrmiClassRetrievalException {
+ throws ClassRetrievalException {
return getThingBytes("AltrmiGenerated2" + publishedName);
}
protected abstract byte[] getThingBytes(String thingName)
- throws AltrmiClassRetrievalException;
+ throws ClassRetrievalException;
}
1.9 +25 -25 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/impl/AbstractServer.java
Index: AbstractServer.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/impl/AbstractServer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractServer.java 19 Jan 2002 13:30:19 -0000 1.8
+++ AbstractServer.java 21 Jan 2002 15:38:21 -0000 1.9
@@ -11,7 +11,7 @@
import org.apache.commons.altrmi.server.AltrmiServer;
-import org.apache.commons.altrmi.server.AltrmiPublicationException;
+import org.apache.commons.altrmi.server.PublicationException;
import org.apache.commons.altrmi.server.AltrmiServerConnection;
import org.apache.commons.altrmi.common.AltrmiInvocationHandler;
import org.apache.commons.altrmi.common.AltrmiRequest;
@@ -35,9 +35,9 @@
import org.apache.commons.altrmi.common.AltrmiInvocationException;
import org.apache.commons.altrmi.common.OpenConnectionReply;
import org.apache.commons.altrmi.common.PingReply;
-import org.apache.commons.altrmi.server.AltrmiClassRetrievalException;
+import org.apache.commons.altrmi.server.ClassRetrievalException;
import org.apache.commons.altrmi.server.ClassRetriever;
-import org.apache.commons.altrmi.server.AltrmiServerInvocationHandler;
+import org.apache.commons.altrmi.server.ServerInvocationHandler;
import org.apache.commons.altrmi.server.AltrmiAuthenticator;
import org.apache.commons.altrmi.server.impl.classretrievers.BaseMobileClassRetriever;
import org.apache.commons.altrmi.server.impl.classretrievers.NoClassRetriever;
@@ -54,7 +54,7 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public abstract class AbstractServer extends AbstractMethodHandler implements AltrmiServer {
@@ -81,7 +81,7 @@
*
*/
public void publish(Object impl, String asName, Class classOrInterfaceToExpose)
- throws AltrmiPublicationException {
+ throws PublicationException {
publish(impl, asName, new Class[]{ classOrInterfaceToExpose }, new Class[0]);
}
@@ -97,7 +97,7 @@
*/
public void publish(
Object impl, String asName, Class classOrInterfaceToExpose, Class additionalFacade)
- throws AltrmiPublicationException {
+ throws PublicationException {
publish(impl, asName, new Class[]{ classOrInterfaceToExpose },
new Class[]{ additionalFacade });
}
@@ -114,7 +114,7 @@
*/
public void publish(
Object impl, String asName, Class classOrInterfaceToExpose, Class[] additionalFacades)
- throws AltrmiPublicationException {
+ throws PublicationException {
publish(impl, asName, new Class[]{ classOrInterfaceToExpose }, additionalFacades);
}
@@ -128,7 +128,7 @@
*
*/
public void publish(Object impl, String asName, Class[] classesOrInterfacesToExpose)
- throws AltrmiPublicationException {
+ throws PublicationException {
publish(impl, asName, classesOrInterfacesToExpose, new Class[0]);
}
@@ -144,10 +144,10 @@
*/
public void publish(
Object impl, String asName, Class[] classesOrInterfacesToExpose, Class[] additionalFacades)
- throws AltrmiPublicationException {
+ throws PublicationException {
if (mPublishedObjects.containsKey(asName + "_Main")) {
- throw new AltrmiPublicationException("Service '" + asName + "' already published");
+ throw new PublicationException("Service '" + asName + "' already published");
}
String[] interfaceNames = new String[classesOrInterfacesToExpose.length];
@@ -158,7 +158,7 @@
// add method maps for main lookup-able service.
HashMap mainMethodMap = new HashMap();
- AltrmiServerInvocationHandler mainAsih = new DefaultInvocationHandler(this,
+ ServerInvocationHandler mainAsih = new DefaultInvocationHandler(this,
asName + "_Main", mainMethodMap);
mainAsih.addImplementationBean(new Long(0), impl);
@@ -184,7 +184,7 @@
Method methods[] = additionalFacades[x].getMethods();
String encodedClassName = encodeClassName(additionalFacades[x].getName());
HashMap methodMap = new HashMap();
- AltrmiServerInvocationHandler asih = new DefaultInvocationHandler(this,
+ ServerInvocationHandler asih = new DefaultInvocationHandler(this,
asName + "_" + encodedClassName, methodMap);
for (int y = 0; y < methods.length; y++) {
@@ -208,10 +208,10 @@
* @param asName
*
*/
- public void unPublish(Object impl, String asName) throws AltrmiPublicationException {
+ public void unPublish(Object impl, String asName) throws PublicationException {
if (!mPublishedObjects.containsKey(asName + "_Main")) {
- throw new AltrmiPublicationException("Service '" + asName + "' not published");
+ throw new PublicationException("Service '" + asName + "' not published");
}
mPublishedObjects.remove(asName + "_Main");
@@ -227,14 +227,14 @@
*
*/
public void replacePublished(Object oldImpl, String asName, Object withImpl)
- throws AltrmiPublicationException {
+ throws PublicationException {
if (!mPublishedObjects.containsKey(asName + "_Main")) {
- throw new AltrmiPublicationException("Service '" + asName + "' not published");
+ throw new PublicationException("Service '" + asName + "' not published");
}
- AltrmiServerInvocationHandler asih =
- (AltrmiServerInvocationHandler) mPublishedObjects.get(asName + "_Main");
+ ServerInvocationHandler asih =
+ (ServerInvocationHandler) mPublishedObjects.get(asName + "_Main");
asih.replaceImplementationBean(oldImpl, withImpl);
}
@@ -305,8 +305,8 @@
new AltrmiInvocationException("TODO - you dirty rat/hacker"));
}
- AltrmiServerInvocationHandler asih =
- (AltrmiServerInvocationHandler) mPublishedObjects.get(publishedThing);
+ ServerInvocationHandler asih =
+ (ServerInvocationHandler) mPublishedObjects.get(publishedThing);
AltrmiReply ar = asih.handleInvocation(mr);
if (ar.getReplyCode() == AltrmiReply.EXCEPTIONREPLY) {
@@ -318,8 +318,8 @@
}
Object beanImpl = ((MethodReply) ar).getReplyObject();
- AltrmiServerInvocationHandler asih2 =
- (AltrmiServerInvocationHandler) mPublishedObjects
+ ServerInvocationHandler asih2 =
+ (ServerInvocationHandler) mPublishedObjects
.get(mr.getPublishedServiceName() + "_" + mr.getReturnClassNameEncoded());
if (asih2 == null) {
@@ -359,7 +359,7 @@
return new ClassReply(mClassRetriever.getBeanBytes(publishedThing),
mClassRetriever
.getInterfaceImplementationBytes(publishedThing));
- } catch (AltrmiClassRetrievalException e) {
+ } catch (ClassRetrievalException e) {
return new RequestFailedReply(e.getMessage());
}
} else if (request.getRequestCode() == AltrmiRequest.OPENCONNECTIONREQUEST) {
@@ -442,9 +442,9 @@
* @return
*
*/
- public AltrmiServerInvocationHandler getServerInvocationHandler(MethodRequest mr,
+ public ServerInvocationHandler getServerInvocationHandler(MethodRequest mr,
String objectName) {
- return (AltrmiServerInvocationHandler) mPublishedObjects.get(mr.getPublishedServiceName()
+ return (ServerInvocationHandler) mPublishedObjects.get(mr.getPublishedServiceName()
+ "_" + objectName);
}
}
1.6 +3 -3 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/impl/DefaultInvocationHandler.java
Index: DefaultInvocationHandler.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/impl/DefaultInvocationHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultInvocationHandler.java 17 Jan 2002 12:14:29 -0000 1.5
+++ DefaultInvocationHandler.java 21 Jan 2002 15:38:21 -0000 1.6
@@ -19,7 +19,7 @@
import org.apache.commons.altrmi.common.AltrmiInvocationException;
import org.apache.commons.altrmi.common.NoSuchReferenceReply;
import org.apache.commons.altrmi.common.FacadeRefHolder;
-import org.apache.commons.altrmi.server.AltrmiServerInvocationHandler;
+import org.apache.commons.altrmi.server.ServerInvocationHandler;
import java.util.HashMap;
import java.util.Iterator;
@@ -36,9 +36,9 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
-public class DefaultInvocationHandler implements AltrmiServerInvocationHandler {
+public class DefaultInvocationHandler implements ServerInvocationHandler {
private HashMap mRefBeans = new HashMap();
private HashMap mBeanRefs = new HashMap();
1.2 +6 -6 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/impl/classretrievers/BaseMobileClassRetriever.java
Index: BaseMobileClassRetriever.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/impl/classretrievers/BaseMobileClassRetriever.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BaseMobileClassRetriever.java 14 Jan 2002 16:36:07 -0000 1.1
+++ BaseMobileClassRetriever.java 21 Jan 2002 15:38:21 -0000 1.2
@@ -10,7 +10,7 @@
-import org.apache.commons.altrmi.server.AltrmiClassRetrievalException;
+import org.apache.commons.altrmi.server.ClassRetrievalException;
import org.apache.commons.altrmi.server.ClassRetriever;
import org.apache.commons.altrmi.server.impl.AbstractClassRetriever;
@@ -20,11 +20,11 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class BaseMobileClassRetriever extends AbstractClassRetriever {
- protected byte[] getThingBytes(String thingName) throws AltrmiClassRetrievalException {
+ protected byte[] getThingBytes(String thingName) throws ClassRetrievalException {
try {
Class clazz = Class.forName("BaseMobile" + thingName);
@@ -32,13 +32,13 @@
return bmc.getClassBytes();
} catch (ClassNotFoundException cnfe) {
- throw new AltrmiClassRetrievalException("Generated class not found during lookup : "
+ throw new ClassRetrievalException("Generated class not found during lookup : "
+ cnfe.getMessage());
} catch (InstantiationException ie) {
- throw new AltrmiClassRetrievalException(
+ throw new ClassRetrievalException(
"Generated class not instantiable during lookup : " + ie.getMessage());
} catch (IllegalAccessException iae) {
- throw new AltrmiClassRetrievalException(
+ throw new ClassRetrievalException(
"Illegal access to generated class during lookup : " + iae.getMessage());
}
}
1.2 +5 -5 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/impl/classretrievers/JarFileClassRetriever.java
Index: JarFileClassRetriever.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/impl/classretrievers/JarFileClassRetriever.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JarFileClassRetriever.java 14 Jan 2002 16:36:07 -0000 1.1
+++ JarFileClassRetriever.java 21 Jan 2002 15:38:21 -0000 1.2
@@ -9,7 +9,7 @@
-import org.apache.commons.altrmi.server.AltrmiClassRetrievalException;
+import org.apache.commons.altrmi.server.ClassRetrievalException;
import org.apache.commons.altrmi.server.ClassRetriever;
import org.apache.commons.altrmi.server.impl.AbstractClassRetriever;
@@ -27,7 +27,7 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class JarFileClassRetriever extends AbstractClassRetriever {
@@ -96,10 +96,10 @@
*
* @return
*
- * @throws AltrmiClassRetrievalException
+ * @throws ClassRetrievalException
*
*/
- public byte[] getThingBytes(String thingName) throws AltrmiClassRetrievalException {
+ public byte[] getThingBytes(String thingName) throws ClassRetrievalException {
try {
URL rsc = mURLClassLoader.findResource(thingName);
@@ -110,7 +110,7 @@
return bytes;
} catch (java.io.IOException e) {
- throw new AltrmiClassRetrievalException("Generated class not found in Jar on server");
+ throw new ClassRetrievalException("Generated class not found in Jar on server");
}
}
}
1.2 +4 -4 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/impl/classretrievers/NoClassRetriever.java
Index: NoClassRetriever.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/impl/classretrievers/NoClassRetriever.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NoClassRetriever.java 14 Jan 2002 16:36:07 -0000 1.1
+++ NoClassRetriever.java 21 Jan 2002 15:38:21 -0000 1.2
@@ -7,7 +7,7 @@
*/
package org.apache.commons.altrmi.server.impl.classretrievers;
-import org.apache.commons.altrmi.server.AltrmiClassRetrievalException;
+import org.apache.commons.altrmi.server.ClassRetrievalException;
import org.apache.commons.altrmi.server.ClassRetriever;
import org.apache.commons.altrmi.server.impl.AbstractClassRetriever;
@@ -17,12 +17,12 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class NoClassRetriever extends AbstractClassRetriever {
- protected byte[] getThingBytes(String thingName) throws AltrmiClassRetrievalException {
- throw new AltrmiClassRetrievalException("This AltRMI server does not support class forwarding");
+ protected byte[] getThingBytes(String thingName) throws ClassRetrievalException {
+ throw new ClassRetrievalException("This AltRMI server does not support class forwarding");
}
}
1.2 +5 -5 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/impl/classretrievers/PlainClassRetriever.java
Index: PlainClassRetriever.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/impl/classretrievers/PlainClassRetriever.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PlainClassRetriever.java 14 Jan 2002 16:36:07 -0000 1.1
+++ PlainClassRetriever.java 21 Jan 2002 15:38:21 -0000 1.2
@@ -10,7 +10,7 @@
-import org.apache.commons.altrmi.server.AltrmiClassRetrievalException;
+import org.apache.commons.altrmi.server.ClassRetrievalException;
import org.apache.commons.altrmi.server.ClassRetriever;
import org.apache.commons.altrmi.server.impl.AbstractClassRetriever;
@@ -24,7 +24,7 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class PlainClassRetriever extends AbstractClassRetriever {
@@ -50,14 +50,14 @@
mClassLoader = cl;
}
- protected byte[] getThingBytes(String thingName) throws AltrmiClassRetrievalException {
+ protected byte[] getThingBytes(String thingName) throws ClassRetrievalException {
InputStream is = null;
try {
is = mClassLoader.getResourceAsStream(thingName);
} catch (Exception e) {
- throw new AltrmiClassRetrievalException(
+ throw new ClassRetrievalException(
"Generated class not found in classloader specified : " + e.getMessage());
}
@@ -71,7 +71,7 @@
is.close();
} catch (IOException e) {
- throw new AltrmiClassRetrievalException("Error retrieving generated class bytes : "
+ throw new ClassRetrievalException("Error retrieving generated class bytes : "
+ e.getMessage());
}
1.1 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/impl/direct/DirectInovcationAdapter.java
Index: DirectInovcationAdapter.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.commons.altrmi.server.impl.direct;
import org.apache.commons.altrmi.common.AltrmiInvocationHandler;
import org.apache.commons.altrmi.common.AltrmiReply;
import org.apache.commons.altrmi.common.AltrmiRequest;
import org.apache.commons.altrmi.server.AltrmiServer;
/**
* Class DirectInovcationAdapter
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
* @version $Revision: 1.1 $
*/
public class DirectInovcationAdapter implements AltrmiInvocationHandler {
private AltrmiServer mServer;
/**
* Constructor DirectInovcationAdapter
*
*
* @param server
*
*/
public DirectInovcationAdapter(AltrmiServer server) {
mServer = server;
}
/**
* Method handleInvocation
*
*
* @param request
*
* @return
*
*/
public AltrmiReply handleInvocation(AltrmiRequest request) {
return mServer.processRequest(request);
}
}
1.2 +3 -3 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/impl/rmi/RmiServer.java
Index: RmiServer.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/impl/rmi/RmiServer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RmiServer.java 9 Jan 2002 19:25:56 -0000 1.1
+++ RmiServer.java 21 Jan 2002 15:38:21 -0000 1.2
@@ -25,11 +25,11 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class RmiServer extends AbstractServer {
- private RmiAltrmiInovcationAdapter mRmiAltrmiInovcationAdapter;
+ private RmiInovcationAdapter mRmiAltrmiInovcationAdapter;
private String mHost;
private int mPort;
@@ -59,7 +59,7 @@
public void start() throws AltrmiServerException {
mState = STARTED;
try {
- mRmiAltrmiInovcationAdapter = new RmiAltrmiInovcationAdapter(this);
+ mRmiAltrmiInovcationAdapter = new RmiInovcationAdapter(this);
UnicastRemoteObject.exportObject(mRmiAltrmiInovcationAdapter);
1.1 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/impl/rmi/RmiInovcationAdapter.java
Index: RmiInovcationAdapter.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.commons.altrmi.server.impl.rmi;
import org.apache.commons.altrmi.common.AltrmiReply;
import org.apache.commons.altrmi.common.AltrmiRequest;
import org.apache.commons.altrmi.common.AltrmiInvocationHandler;
import org.apache.commons.altrmi.common.RmiAltrmiInvocationHandler;
import org.apache.commons.altrmi.server.impl.AbstractServer;
import java.rmi.RemoteException;
/**
* Class RmiInovcationAdapter
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
* @version $Revision: 1.1 $
*/
public class RmiInovcationAdapter implements RmiAltrmiInvocationHandler {
private AbstractServer mAbstractServer;
/**
* Constructor RmiInovcationAdapter
*
*
* @param abstractServer
*
*/
public RmiInovcationAdapter(AbstractServer abstractServer) {
mAbstractServer = abstractServer;
}
/**
* Method handleInvocation
*
*
* @param request
*
* @return
*
* @throws RemoteException
*
*/
public AltrmiReply handleInvocation(AltrmiRequest request) throws RemoteException {
return mAbstractServer.processRequest(request);
}
}
1.6 +6 -6 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/test/DirectTest.java
Index: DirectTest.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/test/DirectTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DirectTest.java 19 Jan 2002 13:30:19 -0000 1.5
+++ DirectTest.java 21 Jan 2002 15:38:21 -0000 1.6
@@ -10,13 +10,13 @@
import org.apache.commons.altrmi.server.impl.direct.DirectServer;
-import org.apache.commons.altrmi.server.impl.direct.DirectAltrmiInovcationAdapter;
+import org.apache.commons.altrmi.server.impl.direct.DirectInovcationAdapter;
import org.apache.commons.altrmi.server.impl.classretrievers.BaseMobileClassRetriever;
import org.apache.commons.altrmi.common.AltrmiInvocationHandler;
import org.apache.commons.altrmi.common.AltrmiConnectionException;
import org.apache.commons.altrmi.client.AltrmiHostContext;
import org.apache.commons.altrmi.client.AltrmiFactory;
-import org.apache.commons.altrmi.client.impl.direct.DirectAltrmiHostContext;
+import org.apache.commons.altrmi.client.impl.direct.DirectHostContext;
import org.apache.commons.altrmi.client.impl.ServerClassAltrmiFactory;
import org.apache.commons.altrmi.client.impl.ClientClassAltrmiFactory;
@@ -28,7 +28,7 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public class DirectTest {
@@ -58,7 +58,7 @@
ds.publish(ti, "Hello", TestInterface.class, TestInterface2.class);
ds.start();
- DirectTestClient dtc = new DirectTestClient(new DirectAltrmiInovcationAdapter(ds));
+ DirectTestClient dtc = new DirectTestClient(new DirectInovcationAdapter(ds));
Thread thread = new Thread(dtc);
thread.start();
@@ -69,7 +69,7 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
static class DirectTestClient implements Runnable {
@@ -94,7 +94,7 @@
public void run() {
try {
- AltrmiHostContext arhc = new DirectAltrmiHostContext(mInvocationHandler);
+ AltrmiHostContext arhc = new DirectHostContext(mInvocationHandler);
AltrmiFactory af = null;
if (mServerOrClientFactory.equals("S")) {
1.4 +3 -3 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/test/RmiClientTest.java
Index: RmiClientTest.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/test/RmiClientTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RmiClientTest.java 19 Jan 2002 13:30:19 -0000 1.3
+++ RmiClientTest.java 21 Jan 2002 15:38:21 -0000 1.4
@@ -11,7 +11,7 @@
import org.apache.commons.altrmi.client.AltrmiHostContext;
import org.apache.commons.altrmi.client.AltrmiFactory;
-import org.apache.commons.altrmi.client.impl.rmi.RmiAltrmiHostContext;
+import org.apache.commons.altrmi.client.impl.rmi.RmiHostContext;
import org.apache.commons.altrmi.client.impl.ServerClassAltrmiFactory;
import org.apache.commons.altrmi.client.impl.ClientClassAltrmiFactory;
@@ -21,7 +21,7 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class RmiClientTest {
@@ -38,7 +38,7 @@
System.out.println("AltRMI over RMI Client");
- AltrmiHostContext arhc = new RmiAltrmiHostContext("127.0.0.1", 4321);
+ AltrmiHostContext arhc = new RmiHostContext("127.0.0.1", 4321);
AltrmiFactory af = null;
if (args[0].equals("S")) {
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>