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/14 13:11:07 UTC
cvs commit: jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/test DirectTest.java PipeTest.java RmiClientTest.java SocketClientTest.java
hammant 02/01/14 04:11:07
Modified: altrmi/src/java/org/apache/commons/altrmi/client
AltrmiInterfaceLookup.java
altrmi/src/java/org/apache/commons/altrmi/client/impl
AbstractAltrmiFactory.java BaseServedObject.java
ClientClassAltrmiFactory.java
ServerClassAltrmiFactory.java
altrmi/src/java/org/apache/commons/altrmi/test
DirectTest.java PipeTest.java RmiClientTest.java
SocketClientTest.java
Log:
'beanonly' refactored to be global for the whole client side connection
Revision Changes Path
1.3 +2 -14 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/AltrmiInterfaceLookup.java
Index: AltrmiInterfaceLookup.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/AltrmiInterfaceLookup.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AltrmiInterfaceLookup.java 13 Jan 2002 00:13:52 -0000 1.2
+++ AltrmiInterfaceLookup.java 14 Jan 2002 12:11:07 -0000 1.3
@@ -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 interface AltrmiInterfaceLookup {
@@ -36,17 +36,5 @@
*/
Object lookup(String publishedServiceName) throws AltrmiConnectionException;
- /**
- * Method lookupBeanOnly
- *
- *
- * @param publishedServiceName
- * @param beanOnly
- *
- * @return
- *
- * @throws AltrmiConnectionException
- *
- */
- Object lookup(String publishedServiceName, boolean beanOnly) throws AltrmiConnectionException;
+
}
1.3 +54 -25 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractAltrmiFactory.java 13 Jan 2002 00:13:52 -0000 1.2
+++ AbstractAltrmiFactory.java 14 Jan 2002 12:11:07 -0000 1.3
@@ -1,3 +1,4 @@
+
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
@@ -7,25 +8,50 @@
*/
package org.apache.commons.altrmi.client.impl;
+
+
import org.apache.commons.altrmi.client.AltrmiFactory;
import org.apache.commons.altrmi.client.AltrmiHostContext;
import org.apache.commons.altrmi.common.AltrmiConnectionException;
import java.util.HashMap;
+
/**
* Class AbstractAltrmiFactory
*
*
* @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 AbstractAltrmiFactory implements AltrmiFactory {
protected AltrmiHostContext mHostContext;
- protected HashMap mObjRefs = new HashMap();
- protected HashMap mRefObjs = new HashMap();
+ protected final HashMap mObjRefs = new HashMap();
+ protected final HashMap mRefObjs = new HashMap();
+ private final boolean mBeanOnly;
+ /**
+ * Constructor AbstractAltrmiFactory
+ *
+ *
+ * @param beanOnly
+ *
+ */
+ public AbstractAltrmiFactory(boolean beanOnly) {
+ mBeanOnly = beanOnly;
+ }
+
+ /**
+ * Method isBeanOnly
+ *
+ *
+ * @return
+ *
+ */
+ public final boolean isBeanOnly() {
+ return mBeanOnly;
+ }
/**
* Method setHostContext
@@ -33,12 +59,11 @@
*
* @param hostContext
*
- * @return
*
- * @throws AltrmiConnectionException
*
*/
- public void setHostContext(AltrmiHostContext hostContext) {
+ public final void setHostContext(AltrmiHostContext hostContext) {
+
if (mHostContext == null) {
mHostContext = hostContext;
}
@@ -57,45 +82,49 @@
* @throws AltrmiConnectionException
*
*/
- protected abstract Object getInstance(String publishedServiceName, String objectName, BaseServedObject baseServedObject, boolean beanOnly) throws AltrmiConnectionException;
+ protected abstract Object getInstance(
+ String publishedServiceName, String objectName, BaseServedObject baseServedObject,
+ boolean beanOnly) throws AltrmiConnectionException;
/**
- * Method lookup
+ * Method registerReferenceObject
*
*
- * @param publishedServiceName
*
- * @return
+ * @param obj
+ * @param referenceID
+ *
*
- * @throws AltrmiConnectionException
*
*/
- public final Object lookup(String publishedServiceName) throws AltrmiConnectionException {
- return lookup(publishedServiceName, false);
+ public final void registerReferenceObject(Object obj, String referenceID) {
+ mObjRefs.put(obj, referenceID);
+ mRefObjs.put(referenceID, obj);
}
/**
- * Method registerReferenceObject
+ * Method getReferenceID
*
*
- * @param ojb
- * @param String referenceID
+ * @param obj
*
* @return
*
- *
*/
- public void registerReferenceObject(Object obj, String referenceID) {
- mObjRefs.put(obj, referenceID);
- mRefObjs.put(referenceID, obj);
- }
-
- public String getReferenceID(Object obj) {
+ public final String getReferenceID(Object obj) {
return (String) mObjRefs.get(obj);
}
- public Object getImplObj(String referenceID) {
+ /**
+ * Method getImplObj
+ *
+ *
+ * @param referenceID
+ *
+ * @return
+ *
+ */
+ public final Object getImplObj(String referenceID) {
return mRefObjs.get(referenceID);
}
-
}
1.4 +4 -7 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/BaseServedObject.java
Index: BaseServedObject.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/BaseServedObject.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BaseServedObject.java 13 Jan 2002 10:30:23 -0000 1.3
+++ BaseServedObject.java 14 Jan 2002 12:11:07 -0000 1.4
@@ -27,7 +27,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 final class BaseServedObject {
@@ -36,7 +36,6 @@
private final String mPublishedServiceName;
private final String mObjectName;
private final String mReferenceID;
- private final boolean mBeanOnly;
/**
* Constructor BaseServedObject
@@ -52,10 +51,8 @@
*/
public BaseServedObject(AbstractAltrmiFactory altrmiFactory,
AltrmiInvocationHandler invocationHandler,
- String pubishedServiceName, String objectName, String referenceID,
- boolean beanOnly) {
+ String pubishedServiceName, String objectName, String referenceID) {
- mBeanOnly = beanOnly;
mAltrmiFactory = altrmiFactory;
mInvocationHandler = invocationHandler;
mPublishedServiceName = pubishedServiceName;
@@ -103,9 +100,9 @@
if (implBean == null) {
BaseServedObject bo2 = new BaseServedObject(mAltrmiFactory, mInvocationHandler,
mPublishedServiceName, objectName,
- ref, mBeanOnly);
+ ref);
Object retFacade = mAltrmiFactory.getInstance(mPublishedServiceName, objectName,
- bo2, mBeanOnly);
+ bo2, mAltrmiFactory.isBeanOnly());
bo2.registerImplObject(retFacade);
1.3 +15 -4 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/ClientClassAltrmiFactory.java
Index: ClientClassAltrmiFactory.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/ClientClassAltrmiFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ClientClassAltrmiFactory.java 13 Jan 2002 00:13:53 -0000 1.2
+++ ClientClassAltrmiFactory.java 14 Jan 2002 12:11:07 -0000 1.3
@@ -27,11 +27,22 @@
*
*
* @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 ClientClassAltrmiFactory extends AbstractAltrmiFactory {
/**
+ * Constructor ClientClassAltrmiFactory
+ *
+ *
+ * @param beanOnly
+ *
+ */
+ public ClientClassAltrmiFactory(boolean beanOnly) {
+ super(beanOnly);
+ }
+
+ /**
* Method lookup
*
*
@@ -43,7 +54,7 @@
* @throws AltrmiConnectionException
*
*/
- public Object lookup(String publishedServiceName, boolean beanOnly)
+ public Object lookup(String publishedServiceName)
throws AltrmiConnectionException {
AltrmiReply ar =
@@ -63,8 +74,8 @@
BaseServedObject baseObj = new BaseServedObject(this,
mHostContext.getInvocationHandler(),
publishedServiceName, "Main",
- lr.getReferenceID(), beanOnly);
- Object retVal = getInstance(publishedServiceName, "Main", baseObj, beanOnly);
+ lr.getReferenceID());
+ Object retVal = getInstance(publishedServiceName, "Main", baseObj, isBeanOnly());
baseObj.registerImplObject(retVal);
1.3 +16 -5 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/ServerClassAltrmiFactory.java
Index: ServerClassAltrmiFactory.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/ServerClassAltrmiFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServerClassAltrmiFactory.java 13 Jan 2002 00:13:53 -0000 1.2
+++ ServerClassAltrmiFactory.java 14 Jan 2002 12:11:07 -0000 1.3
@@ -33,25 +33,36 @@
*
*
* @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 ServerClassAltrmiFactory extends AbstractAltrmiFactory {
private HashMap mPublishedServiceClassLoaders = new HashMap();
/**
+ * Constructor ServerClassAltrmiFactory
+ *
+ *
+ * @param beanOnly
+ *
+ */
+ public ServerClassAltrmiFactory(boolean beanOnly) {
+ super(beanOnly);
+ }
+
+
+ /**
* Method lookup
*
*
* @param publishedServiceName
- * @param beanOnly
*
* @return
*
* @throws AltrmiConnectionException
*
*/
- public Object lookup(String publishedServiceName, boolean beanOnly)
+ public Object lookup(String publishedServiceName)
throws AltrmiConnectionException {
AltrmiReply ar =
@@ -71,8 +82,8 @@
BaseServedObject baseObj = new BaseServedObject(this,
mHostContext.getInvocationHandler(),
publishedServiceName, "Main",
- lr.getReferenceID(), beanOnly);
- Object retVal = getInstance(publishedServiceName, "Main", baseObj, beanOnly);
+ lr.getReferenceID());
+ Object retVal = getInstance(publishedServiceName, "Main", baseObj, isBeanOnly());
baseObj.registerImplObject(retVal);
1.2 +4 -4 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DirectTest.java 9 Jan 2002 19:25:56 -0000 1.1
+++ DirectTest.java 14 Jan 2002 12:11:07 -0000 1.2
@@ -25,7 +25,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 DirectTest {
@@ -63,7 +63,7 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
static class DirectTestClient implements Runnable {
@@ -92,9 +92,9 @@
AltrmiFactory af = null;
if (mServerOrClientFactory.equals("S")) {
- af = new ServerClassAltrmiFactory();
+ af = new ServerClassAltrmiFactory(false);
} else {
- af = new ClientClassAltrmiFactory();
+ af = new ClientClassAltrmiFactory(false);
}
af.setHostContext(arhc);
1.3 +4 -4 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/test/PipeTest.java
Index: PipeTest.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/test/PipeTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PipeTest.java 10 Jan 2002 00:08:59 -0000 1.2
+++ PipeTest.java 14 Jan 2002 12:11:07 -0000 1.3
@@ -26,7 +26,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 class PipeTest {
@@ -64,7 +64,7 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
static class PipedTestClient implements Runnable {
@@ -93,9 +93,9 @@
AltrmiFactory af = null;
if (mServerOrClientFactory.equals("S")) {
- af = new ServerClassAltrmiFactory();
+ af = new ServerClassAltrmiFactory(false);
} else {
- af = new ClientClassAltrmiFactory();
+ af = new ClientClassAltrmiFactory(false);
}
af.setHostContext(arhc);
1.2 +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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RmiClientTest.java 9 Jan 2002 19:25:56 -0000 1.1
+++ RmiClientTest.java 14 Jan 2002 12:11:07 -0000 1.2
@@ -21,7 +21,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 RmiClientTest {
@@ -42,9 +42,9 @@
AltrmiFactory af = null;
if (args[0].equals("S")) {
- af = new ServerClassAltrmiFactory();
+ af = new ServerClassAltrmiFactory(false);
} else {
- af = new ClientClassAltrmiFactory();
+ af = new ClientClassAltrmiFactory(false);
}
af.setHostContext(arhc);
1.3 +3 -3 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/test/SocketClientTest.java
Index: SocketClientTest.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/test/SocketClientTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SocketClientTest.java 10 Jan 2002 00:08:59 -0000 1.2
+++ SocketClientTest.java 14 Jan 2002 12:11:07 -0000 1.3
@@ -24,7 +24,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 class SocketClientTest {
@@ -45,9 +45,9 @@
AltrmiFactory af = null;
if (args[0].equals("S")) {
- af = new ServerClassAltrmiFactory();
+ af = new ServerClassAltrmiFactory(false);
} else {
- af = new ClientClassAltrmiFactory();
+ af = new ClientClassAltrmiFactory(false);
}
af.setHostContext(arhc);
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>