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/18 18:33:07 UTC
cvs commit: jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/test SocketClientTest.java SocketServerTest.java
hammant 02/01/18 09:33:07
Modified: altrmi altrmi-tests.xml
altrmi/src/java/org/apache/commons/altrmi/client/impl/socket
SocketObjectStreamHostContext.java
SocketObjectStreamInvocationHandler.java
altrmi/src/java/org/apache/commons/altrmi/server/impl
ServerObjectStreamReadWriter.java
altrmi/src/java/org/apache/commons/altrmi/server/impl/socket
CompleteSocketObjectStreamServer.java
altrmi/src/java/org/apache/commons/altrmi/test
SocketClientTest.java SocketServerTest.java
Log:
JSX compatability one step further.
Revision Changes Path
1.6 +19 -2 jakarta-commons-sandbox/altrmi/altrmi-tests.xml
Index: altrmi-tests.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/altrmi-tests.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- altrmi-tests.xml 17 Jan 2002 23:42:13 -0000 1.5
+++ altrmi-tests.xml 18 Jan 2002 17:33:07 -0000 1.6
@@ -3,7 +3,7 @@
<!--
"Alt (to) RMI" component of the Jakarta Commons Subproject
- $Id: altrmi-tests.xml,v 1.5 2002/01/17 23:42:13 hammant Exp $
+ $Id: altrmi-tests.xml,v 1.6 2002/01/18 17:33:07 hammant Exp $
-->
@@ -43,7 +43,7 @@
<path id="testA.classpath">
<pathelement location="${build.home}/classes"/>
<pathelement location="${build.home}/classes2"/>
- <pathelement location="lib/bcel.jar"/>
+ <pathelement location="lib/JSX0.9.7.1.jar"/>
</path>
<path id="testB1.classpath">
@@ -149,6 +149,23 @@
<arg value="CustomStream"/>
</java>
</target>
+
+ <target name="test1d-serve">
+ <java classname="org.apache.commons.altrmi.test.SocketServerTest" fork="true">
+ <classpath refid="testA.classpath"/>
+ <arg value="C"/>
+ <arg value="JSX"/>
+ </java>
+ </target>
+
+ <target name="test1d-client" depends="generate">
+ <java classname="org.apache.commons.altrmi.test.SocketClientTest" fork="true">
+ <classpath refid="testA.classpath"/>
+ <arg value="C"/>
+ <arg value="JSX"/>
+ </java>
+ </target>
+
<target name="test2a" depends="generate">
<java classname="org.apache.commons.altrmi.test.PipeTest" fork="true">
1.4 +24 -2 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SocketObjectStreamHostContext.java 17 Jan 2002 12:14:29 -0000 1.3
+++ SocketObjectStreamHostContext.java 18 Jan 2002 17:33:07 -0000 1.4
@@ -21,10 +21,13 @@
*
*
* @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 SocketObjectStreamHostContext extends AbstractAltrmiHostContext {
+ private String mObjectOutputStreamClassName;
+ private String mObjectInputStreamClassName;
+
/**
* Constructor SocketObjectStreamHostContext
*
@@ -36,6 +39,25 @@
*
*/
public SocketObjectStreamHostContext(String host, int port) throws AltrmiConnectionException {
- super(new SocketObjectStreamInvocationHandler(host, port));
+ super(new SocketObjectStreamInvocationHandler(host, port, null, null));
+ }
+
+ /**
+ * Constructor SocketObjectStreamHostContext
+ *
+ *
+ * @param host
+ * @param port
+ * @param objectInputStreamClassName
+ * @param objectOutputStreamClassName
+ *
+ * @throws AltrmiConnectionException
+ *
+ */
+ public SocketObjectStreamHostContext(
+ String host, int port, String objectInputStreamClassName, String objectOutputStreamClassName)
+ throws AltrmiConnectionException {
+ super(new SocketObjectStreamInvocationHandler(host, port, objectInputStreamClassName,
+ objectOutputStreamClassName));
}
}
1.6 +14 -7 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/socket/SocketObjectStreamInvocationHandler.java
Index: SocketObjectStreamInvocationHandler.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/socket/SocketObjectStreamInvocationHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SocketObjectStreamInvocationHandler.java 18 Jan 2002 12:22:31 -0000 1.5
+++ SocketObjectStreamInvocationHandler.java 18 Jan 2002 17:33:07 -0000 1.6
@@ -24,31 +24,38 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public final class SocketObjectStreamInvocationHandler
extends AbstractSocketStreamInvocationHandler {
- private String mHost;
- private int mPort;
+ private String mObjectOutputStreamClassName;
+ private String mObjectInputStreamClassName;
/**
- * Constructor SocketObjectStreamInvocationHandler
+ * Constructor SocketObjectStreamInvocationHandler.
*
*
* @param host
* @param port
+ * @param objectInputStreamClassName
+ * @param objectOutputStreamClassName
*
* @throws AltrmiConnectionException
*
*/
- public SocketObjectStreamInvocationHandler(String host, int port)
- throws AltrmiConnectionException {
+ public SocketObjectStreamInvocationHandler(
+ String host, int port, String objectInputStreamClassName, String objectOutputStreamClassName)
+ throws AltrmiConnectionException {
+
super(host, port);
+
+ mObjectInputStreamClassName = objectInputStreamClassName;
+ mObjectOutputStreamClassName = objectOutputStreamClassName;
}
protected ClientStreamReadWriter createClientStreamReadWriter(
InputStream in, OutputStream out) throws IOException {
- return new ClientObjectStreamReadWriter(in, out, null, null);
+ return new ClientObjectStreamReadWriter(in, out, mObjectOutputStreamClassName, mObjectInputStreamClassName);
}
}
1.5 +1 -2 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/impl/ServerObjectStreamReadWriter.java
Index: ServerObjectStreamReadWriter.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/impl/ServerObjectStreamReadWriter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServerObjectStreamReadWriter.java 18 Jan 2002 12:22:31 -0000 1.4
+++ ServerObjectStreamReadWriter.java 18 Jan 2002 17:33:07 -0000 1.5
@@ -19,7 +19,6 @@
import java.io.OutputStream;
import java.io.IOException;
import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
/**
@@ -27,7 +26,7 @@
*
*
* @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 ServerObjectStreamReadWriter extends ServerStreamReadWriter {
1.5 +13 -2 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/impl/socket/CompleteSocketObjectStreamServer.java
Index: CompleteSocketObjectStreamServer.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/impl/socket/CompleteSocketObjectStreamServer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CompleteSocketObjectStreamServer.java 17 Jan 2002 12:14:30 -0000 1.4
+++ CompleteSocketObjectStreamServer.java 18 Jan 2002 17:33:07 -0000 1.5
@@ -30,10 +30,14 @@
*
*
* @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 CompleteSocketObjectStreamServer extends AbstractCompleteSocketStreamServer {
+ private String mObjectOutputStreamClassName = "java.io.ObjectOutputStream";
+ private String mObjectInputStreamClassName = "java.io.ObjectInputStream";
+
+
/**
* Constructor CompleteSocketObjectStreamServer
*
@@ -47,7 +51,14 @@
super(port);
}
+ public CompleteSocketObjectStreamServer(int port, String objectInputStreamClassName, String objectOutputStreamClassName) throws AltrmiServerException {
+ super(port);
+ mObjectInputStreamClassName = objectInputStreamClassName;
+ mObjectOutputStreamClassName = objectOutputStreamClassName;
+ }
+
+
protected ServerStreamReadWriter createServerStreamReadWriter() {
- return new ServerObjectStreamReadWriter();
+ return new ServerObjectStreamReadWriter(mObjectOutputStreamClassName, mObjectInputStreamClassName);
}
}
1.6 +4 -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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SocketClientTest.java 17 Jan 2002 17:48:46 -0000 1.5
+++ SocketClientTest.java 18 Jan 2002 17:33:07 -0000 1.6
@@ -26,7 +26,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 SocketClientTest {
@@ -47,11 +47,12 @@
if (args[1].equals("ObjectStream")) {
System.out.println("(Object Stream)");
-
arhc = new SocketObjectStreamHostContext("127.0.0.1", 1234);
+ } else if (args[1].equals("JSX")) {
+ System.out.println("(JSX Object Stream)");
+ arhc = new SocketObjectStreamHostContext("127.0.0.1", 1234, "JSX.ObjIn", "JSX.ObjOut");
} else {
System.out.println("(Custom Stream)");
-
arhc = new SocketCustomStreamHostContext("127.0.0.1", 1235);
}
1.6 +4 -2 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/test/SocketServerTest.java
Index: SocketServerTest.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/test/SocketServerTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SocketServerTest.java 17 Jan 2002 17:48:46 -0000 1.5
+++ SocketServerTest.java 18 Jan 2002 17:33:07 -0000 1.6
@@ -23,7 +23,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 SocketServerTest {
@@ -44,8 +44,10 @@
if (args[1].equals("ObjectStream")) {
System.out.println("(Object Stream)");
-
as = new CompleteSocketObjectStreamServer(1234);
+ } else if (args[1].equals("JSX")) {
+ System.out.println("(JSX Object Stream)");
+ as = new CompleteSocketObjectStreamServer(1234, "JSX.ObjIn", "JSX.ObjOut");
} else {
// CustomStream
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>