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/20 01:13:40 UTC
cvs commit: jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/stream ClientCustomStreamReadWriter.java ClientObjectStreamReadWriter.java ClientStreamReadWriter.java StreamInvocationHandler.java
hammant 02/01/19 16:13:40
Modified: altrmi/src/java/org/apache/commons/altrmi/client/impl/piped
AbstractPipedStreamInvocationHandler.java
PipedCustomStreamInvocationHandler.java
PipedObjectStreamInvocationHandler.java
altrmi/src/java/org/apache/commons/altrmi/client/impl/socket
AbstractSocketStreamInvocationHandler.java
SocketCustomStreamInvocationHandler.java
SocketObjectStreamInvocationHandler.java
Added: altrmi/src/java/org/apache/commons/altrmi/client/impl/stream
ClientCustomStreamReadWriter.java
ClientObjectStreamReadWriter.java
ClientStreamReadWriter.java
StreamInvocationHandler.java
Removed: altrmi/src/java/org/apache/commons/altrmi/client/impl
ClientCustomStreamReadWriter.java
ClientObjectStreamReadWriter.java
ClientStreamReadWriter.java
StreamInvocationHandler.java
Log:
refactored to separate package
Revision Changes Path
1.4 +5 -5 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/piped/AbstractPipedStreamInvocationHandler.java
Index: AbstractPipedStreamInvocationHandler.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/piped/AbstractPipedStreamInvocationHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractPipedStreamInvocationHandler.java 19 Jan 2002 13:30:19 -0000 1.3
+++ AbstractPipedStreamInvocationHandler.java 20 Jan 2002 00:13:40 -0000 1.4
@@ -10,10 +10,10 @@
-import org.apache.commons.altrmi.client.impl.StreamInvocationHandler;
-import org.apache.commons.altrmi.client.impl.ClientCustomStreamReadWriter;
-import org.apache.commons.altrmi.client.impl.ClientObjectStreamReadWriter;
-import org.apache.commons.altrmi.client.impl.ClientStreamReadWriter;
+import org.apache.commons.altrmi.client.impl.stream.StreamInvocationHandler;
+import org.apache.commons.altrmi.client.impl.stream.ClientCustomStreamReadWriter;
+import org.apache.commons.altrmi.client.impl.stream.ClientObjectStreamReadWriter;
+import org.apache.commons.altrmi.client.impl.stream.ClientStreamReadWriter;
import org.apache.commons.altrmi.common.AltrmiConnectionException;
import org.apache.commons.altrmi.common.AltrmiInvocationException;
@@ -31,7 +31,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 abstract class AbstractPipedStreamInvocationHandler extends StreamInvocationHandler {
1.3 +3 -3 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/piped/PipedCustomStreamInvocationHandler.java
Index: PipedCustomStreamInvocationHandler.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/piped/PipedCustomStreamInvocationHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PipedCustomStreamInvocationHandler.java 17 Jan 2002 12:14:29 -0000 1.2
+++ PipedCustomStreamInvocationHandler.java 20 Jan 2002 00:13:40 -0000 1.3
@@ -11,8 +11,8 @@
import org.apache.commons.altrmi.common.AltrmiConnectionException;
-import org.apache.commons.altrmi.client.impl.ClientStreamReadWriter;
-import org.apache.commons.altrmi.client.impl.ClientCustomStreamReadWriter;
+import org.apache.commons.altrmi.client.impl.stream.ClientStreamReadWriter;
+import org.apache.commons.altrmi.client.impl.stream.ClientCustomStreamReadWriter;
import java.io.InputStream;
import java.io.OutputStream;
@@ -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 final class PipedCustomStreamInvocationHandler
extends AbstractPipedStreamInvocationHandler {
1.5 +3 -3 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/piped/PipedObjectStreamInvocationHandler.java
Index: PipedObjectStreamInvocationHandler.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/piped/PipedObjectStreamInvocationHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PipedObjectStreamInvocationHandler.java 18 Jan 2002 12:22:31 -0000 1.4
+++ PipedObjectStreamInvocationHandler.java 20 Jan 2002 00:13:40 -0000 1.5
@@ -11,8 +11,8 @@
import org.apache.commons.altrmi.common.AltrmiConnectionException;
-import org.apache.commons.altrmi.client.impl.ClientStreamReadWriter;
-import org.apache.commons.altrmi.client.impl.ClientObjectStreamReadWriter;
+import org.apache.commons.altrmi.client.impl.stream.ClientStreamReadWriter;
+import org.apache.commons.altrmi.client.impl.stream.ClientObjectStreamReadWriter;
import java.io.InputStream;
import java.io.OutputStream;
@@ -26,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 final class PipedObjectStreamInvocationHandler
extends AbstractPipedStreamInvocationHandler {
1.6 +5 -5 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/socket/AbstractSocketStreamInvocationHandler.java
Index: AbstractSocketStreamInvocationHandler.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/socket/AbstractSocketStreamInvocationHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractSocketStreamInvocationHandler.java 19 Jan 2002 13:30:19 -0000 1.5
+++ AbstractSocketStreamInvocationHandler.java 20 Jan 2002 00:13:40 -0000 1.6
@@ -10,10 +10,10 @@
-import org.apache.commons.altrmi.client.impl.StreamInvocationHandler;
-import org.apache.commons.altrmi.client.impl.ClientCustomStreamReadWriter;
-import org.apache.commons.altrmi.client.impl.ClientObjectStreamReadWriter;
-import org.apache.commons.altrmi.client.impl.ClientStreamReadWriter;
+import org.apache.commons.altrmi.client.impl.stream.StreamInvocationHandler;
+import org.apache.commons.altrmi.client.impl.stream.ClientCustomStreamReadWriter;
+import org.apache.commons.altrmi.client.impl.stream.ClientObjectStreamReadWriter;
+import org.apache.commons.altrmi.client.impl.stream.ClientStreamReadWriter;
import org.apache.commons.altrmi.common.AltrmiConnectionException;
import java.net.Socket;
@@ -30,7 +30,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 abstract class AbstractSocketStreamInvocationHandler extends StreamInvocationHandler {
1.3 +3 -3 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/socket/SocketCustomStreamInvocationHandler.java
Index: SocketCustomStreamInvocationHandler.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/socket/SocketCustomStreamInvocationHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SocketCustomStreamInvocationHandler.java 17 Jan 2002 12:14:29 -0000 1.2
+++ SocketCustomStreamInvocationHandler.java 20 Jan 2002 00:13:40 -0000 1.3
@@ -11,8 +11,8 @@
import org.apache.commons.altrmi.common.AltrmiConnectionException;
-import org.apache.commons.altrmi.client.impl.ClientStreamReadWriter;
-import org.apache.commons.altrmi.client.impl.ClientCustomStreamReadWriter;
+import org.apache.commons.altrmi.client.impl.stream.ClientStreamReadWriter;
+import org.apache.commons.altrmi.client.impl.stream.ClientCustomStreamReadWriter;
import java.io.InputStream;
import java.io.OutputStream;
@@ -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 final class SocketCustomStreamInvocationHandler
extends AbstractSocketStreamInvocationHandler {
1.7 +3 -3 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SocketObjectStreamInvocationHandler.java 18 Jan 2002 17:33:07 -0000 1.6
+++ SocketObjectStreamInvocationHandler.java 20 Jan 2002 00:13:40 -0000 1.7
@@ -11,8 +11,8 @@
import org.apache.commons.altrmi.common.AltrmiConnectionException;
-import org.apache.commons.altrmi.client.impl.ClientStreamReadWriter;
-import org.apache.commons.altrmi.client.impl.ClientObjectStreamReadWriter;
+import org.apache.commons.altrmi.client.impl.stream.ClientStreamReadWriter;
+import org.apache.commons.altrmi.client.impl.stream.ClientObjectStreamReadWriter;
import java.io.InputStream;
import java.io.OutputStream;
@@ -24,7 +24,7 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
public final class SocketObjectStreamInvocationHandler
extends AbstractSocketStreamInvocationHandler {
1.1 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/stream/ClientCustomStreamReadWriter.java
Index: ClientCustomStreamReadWriter.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.stream;
import org.apache.commons.altrmi.common.AltrmiRequest;
import org.apache.commons.altrmi.common.AltrmiReply;
import java.io.ObjectOutputStream;
import java.io.ObjectInputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.BufferedOutputStream;
/**
* Class ClientCustomStreamReadWriter
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
* @version $Revision: 1.1 $
*/
public class ClientCustomStreamReadWriter extends ClientStreamReadWriter {
private DataInputStream mDataInputStream;
private DataOutputStream mDataOutputStream;
/**
* Constructor ClientCustomStreamReadWriter
*
*
* @param inputStream
* @param outputStream
*
* @throws IOException
*
*/
public ClientCustomStreamReadWriter(InputStream inputStream, OutputStream outputStream)
throws IOException {
mDataOutputStream = new DataOutputStream(new BufferedOutputStream(outputStream));
mDataInputStream = new DataInputStream(inputStream);
}
protected synchronized AltrmiReply postRequest(AltrmiRequest altrmiRequest)
throws IOException, ClassNotFoundException {
writeRequest(altrmiRequest);
return readReply();
}
private void writeRequest(AltrmiRequest altrmiRequest) throws IOException {
ByteArrayOutputStream bAOS = new ByteArrayOutputStream();
ObjectOutputStream objectOutputStream;
objectOutputStream = new ObjectOutputStream(bAOS);
objectOutputStream.writeObject(altrmiRequest);
objectOutputStream.flush();
byte[] aBytes = bAOS.toByteArray();
objectOutputStream.close();
bAOS.close();
mDataOutputStream.writeInt(aBytes.length);
mDataOutputStream.write(aBytes);
mDataOutputStream.flush();
}
private AltrmiReply readReply() throws IOException, ClassNotFoundException {
int byteArraySize = (int) mDataInputStream.readInt();
byte[] byteArray = new byte[byteArraySize];
mDataInputStream.read(byteArray);
ByteArrayInputStream bAIS = new ByteArrayInputStream(byteArray);
ObjectInputStream oOs = new ObjectInputStream(bAIS);
return (AltrmiReply) oOs.readObject();
}
}
1.1 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/stream/ClientObjectStreamReadWriter.java
Index: ClientObjectStreamReadWriter.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.stream;
import org.apache.commons.altrmi.common.AltrmiRequest;
import org.apache.commons.altrmi.common.AltrmiReply;
import java.io.ObjectOutputStream;
import java.io.ObjectInputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.IOException;
import java.lang.reflect.Constructor;
/**
* Class ClientObjectStreamReadWriter
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
* @version $Revision: 1.1 $
*/
public class ClientObjectStreamReadWriter extends ClientStreamReadWriter {
private ObjectInputStream mObjectInputStream;
private ObjectOutputStream mObjectOutputStream;
private String mObjectOutputStreamClassName = "java.io.ObjectOutputStream";
private String mObjectInputStreamClassName = "java.io.ObjectInputStream";
/**
* Constructor ClientObjectStreamReadWriter
*
*
* @param inputStream
* @param outputStream
* @param objectOutputStreamClassName
* @param objectInputStreamClassName
*
* @throws IOException
*
*/
public ClientObjectStreamReadWriter(InputStream inputStream, OutputStream outputStream, String objectOutputStreamClassName, String objectInputStreamClassName)
throws IOException {
if (objectOutputStreamClassName != null) {
mObjectOutputStreamClassName = objectOutputStreamClassName;
}
if (objectInputStreamClassName != null) {
mObjectInputStreamClassName = objectInputStreamClassName;
}
try {
Class clazz = Class.forName(mObjectOutputStreamClassName);
Constructor con = clazz.getConstructor(new Class[] {OutputStream.class});
mObjectOutputStream = (ObjectOutputStream) con.newInstance(new Object[] {outputStream});
clazz = Class.forName(mObjectInputStreamClassName);
con = clazz.getConstructor(new Class[] {InputStream.class});
mObjectInputStream = (ObjectInputStream) con.newInstance(new Object[] {inputStream});
} catch (Exception e) {
e.printStackTrace();
throw new IOException("Some problem instantiating ObjectStream classes: " + e.getMessage());
}
}
protected synchronized AltrmiReply postRequest(AltrmiRequest altrmiRequest)
throws IOException, ClassNotFoundException {
writeRequest(altrmiRequest);
return readReply();
}
private void writeRequest(AltrmiRequest altrmiRequest) throws IOException {
mObjectOutputStream.writeObject(altrmiRequest);
mObjectOutputStream.flush();
//mObjectOutputStream.reset();
}
private AltrmiReply readReply() throws IOException, ClassNotFoundException {
return (AltrmiReply) mObjectInputStream.readObject();
}
}
1.1 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/stream/ClientStreamReadWriter.java
Index: ClientStreamReadWriter.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.stream;
import org.apache.commons.altrmi.common.AltrmiRequest;
import org.apache.commons.altrmi.common.AltrmiReply;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.IOException;
/**
* Class ClientStreamReadWriter
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
* @version $Revision: 1.1 $
*/
public abstract class ClientStreamReadWriter {
protected abstract AltrmiReply postRequest(AltrmiRequest altrmiRequest)
throws IOException, ClassNotFoundException;
}
1.1 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/stream/StreamInvocationHandler.java
Index: StreamInvocationHandler.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.stream;
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.common.MethodRequest;
import org.apache.commons.altrmi.common.AltrmiInvocationException;
import org.apache.commons.altrmi.common.TryLaterReply;
import org.apache.commons.altrmi.common.NotPublishedReply;
import org.apache.commons.altrmi.common.NotPublishedException;
import org.apache.commons.altrmi.common.PublishedNameRequest;
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 java.io.IOException;
import java.io.ObjectOutputStream;
import java.io.ObjectInputStream;
import java.io.EOFException;
import java.net.SocketException;
/**
* Class StreamInvocationHandler
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
* @version $Revision: 1.1 $
*/
public abstract class StreamInvocationHandler extends AbstractAltrmiClientInvocationHandler {
private ClientStreamReadWriter mObjectReadWriter;
private boolean mMethodLogging = false;
private long mLastRealRequest = System.currentTimeMillis();
/**
* Method setAltrmiConnectionListener
*
*
* @param altrmiConnectionListener
*
*/
public void setAltrmiConnectionListener(AltrmiConnectionListener altrmiConnectionListener) {
super.setAltrmiConnectionListener(altrmiConnectionListener);
mMethodLogging = altrmiConnectionListener.methodLogging();
}
protected void setObjectReadWriter(ClientStreamReadWriter objectReadWriter) {
mObjectReadWriter = objectReadWriter;
}
protected void requestWritten() {}
/**
* Method handleInvocation
*
*
* @param request
*
* @return
*
*/
public synchronized AltrmiReply handleInvocation(AltrmiRequest request) {
if (request.getRequestCode() != AltrmiRequest.PINGREQUEST) {
mLastRealRequest = System.currentTimeMillis();
}
try {
while (true) {
boolean again = true;
AltrmiReply reply = null;
int tries = 0;
long start = 0;
if (mMethodLogging) {
start = System.currentTimeMillis();
}
while (again) {
tries++;
again = false;
try {
long t1 = System.currentTimeMillis();
reply = (AltrmiReply) mObjectReadWriter.postRequest(request);
long t2 = System.currentTimeMillis();
if (reply.getReplyCode() >= 100) {
if (reply instanceof TryLaterReply) {
int millis = ((TryLaterReply) reply).getSuggestedDelayMillis();
mAltrmiConnectionListener.serviceSuspended(request, tries,
millis);
again = true;
} else if (reply instanceof NoSuchReferenceReply) {
throw new NotSuchReferenceException();
} else if (reply instanceof NotPublishedReply) {
PublishedNameRequest pnr = (PublishedNameRequest) request;
throw new NotPublishedException(pnr.getPublishedServiceName(),
pnr.getObjectName());
}
}
} catch (IOException ioe) {
if (ioe instanceof SocketException | ioe instanceof EOFException) {
int retryConnectTries = 0;
while (!tryReconnect()) {
mAltrmiConnectionListener.serviceAbend(retryConnectTries);
retryConnectTries++;
}
} else {
ioe.printStackTrace();
throw new AltrmiInvocationException(
"IO Exception during invocation to server :" + ioe.getMessage());
}
}
}
if (mMethodLogging) {
if (request instanceof MethodRequest) {
mAltrmiConnectionListener.methodCalled(
((MethodRequest) request).getMethodSignature(),
System.currentTimeMillis() - start);
}
}
return reply;
}
} catch (ClassNotFoundException e) {
throw new AltrmiInvocationException("Class definition missing on Deserialization"
+ e.getMessage());
}
}
/**
* Method getLastRealRequest
*
*
* @return
*
*/
public long getLastRealRequest() {
return mLastRealRequest;
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>