hammant 02/03/06 13:39:49
Modified: altrmi/lib beepcore.jar
altrmi/src/java/org/apache/commons/altrmi/client/impl/beep
BEEPInvocationHandler.java
altrmi/src/java/org/apache/commons/altrmi/server/impl/beep
AltrmiBEEPServerProfile.java
CompleteBEEPServer.java ServerBEEPReadWriter.java
Log:
BEEP upgrade, hopefully to fix GUMP error
Revision Changes Path
1.2 +271 -322 jakarta-commons-sandbox/altrmi/lib/beepcore.jar
<<Binary file>>
1.3 +10 -10
jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/beep/BEEPInvocationHandler.java
Index: BEEPInvocationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/beep/BEEPInvocationHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BEEPInvocationHandler.java 4 Mar 2002 12:10:48 -0000 1.2
+++ BEEPInvocationHandler.java 6 Mar 2002 21:39:49 -0000 1.3
@@ -21,19 +21,19 @@
import org.beepcore.beep.core.BEEPError;
import org.beepcore.beep.core.BEEPException;
import org.beepcore.beep.core.BEEPInterruptedException;
-import org.beepcore.beep.core.ByteDataStream;
import org.beepcore.beep.core.Channel;
import org.beepcore.beep.core.MessageListener;
import org.beepcore.beep.core.Message;
-import org.beepcore.beep.core.DataStream;
import org.beepcore.beep.core.ProfileRegistry;
import org.beepcore.beep.core.Session;
-import org.beepcore.beep.core.StringDataStream;
import org.beepcore.beep.core.ReplyListener;
+import org.beepcore.beep.core.StringOutputDataStream;
+import org.beepcore.beep.core.InputDataStream;
+import org.beepcore.beep.core.ByteOutputDataStream;
import org.beepcore.beep.lib.NullReplyListener;
import org.beepcore.beep.lib.MessageQueue;
import org.beepcore.beep.profile.ProfileConfiguration;
-import org.beepcore.beep.transport.tcp.AutomatedTCPSessionCreator;
+import org.beepcore.beep.transport.tcp.TCPSessionCreator;
@@ -43,7 +43,7 @@
*
*
* @author Vinay Chandrasekharan<a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class BEEPInvocationHandler extends StreamInvocationHandler
{
@@ -74,7 +74,7 @@
//TODO:
// Change here if the client needs to enable callbacks
// Client will have a profiles too advertise
- session = AutomatedTCPSessionCreator.initiate(mHost, mPort,new
ProfileRegistry());
+ session = TCPSessionCreator.initiate(mHost, mPort,new
ProfileRegistry());
}
catch (BEEPException e)
{
@@ -110,7 +110,7 @@
ClientBEEPReadWriter beepReadWriter =(ClientBEEPReadWriter
)createClientStreamReadWriter();
- channel.setDataListener(beepReadWriter.mQueue);
+ channel.setMessageListener(beepReadWriter.mQueue);
setObjectReadWriter(beepReadWriter);
}
@@ -173,7 +173,7 @@
byte[] aBytes =
SerializationHelper.getBytesFromInstance(altrmiRequest);
try
{
- channel.sendMSG(new ByteDataStream(aBytes),replyListener);
+ channel.sendMSG(new
ByteOutputDataStream(aBytes),replyListener);
}
catch(BEEPException be)
{
@@ -205,8 +205,8 @@
try
{
Message message=mQueue.getNextMessage();
- message.sendRPY(new StringDataStream("OK"));
- DataStream ds = message.getDataStream();
+ message.sendRPY(new StringOutputDataStream("OK"));
+ InputDataStream ds = message.getDataStream();
InputStream is = ds.getInputStream();
byte[] buf = new byte[4096];
ByteArrayOutputStream data = new ByteArrayOutputStream();
1.2 +2 -2
jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/impl/beep/AltrmiBEEPServerProfile.java
Index: AltrmiBEEPServerProfile.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/impl/beep/AltrmiBEEPServerProfile.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AltrmiBEEPServerProfile.java 27 Feb 2002 14:47:36 -0000 1.1
+++ AltrmiBEEPServerProfile.java 6 Mar 2002 21:39:49 -0000 1.2
@@ -31,7 +31,7 @@
*
*
* @author Vinay Chandrasekharan
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class AltrmiBEEPServerProfile
implements Profile, StartChannelListener
@@ -54,7 +54,7 @@
{
ServerBEEPReadWriter beepReadWriter = new
ServerBEEPReadWriter(channel);
BEEPServerConnection beepServerConnectoin = new
BEEPServerConnection(abstractServer,beepReadWriter);
- channel.setDataListener(beepReadWriter.mQueue);
+ channel.setMessageListener(beepReadWriter.mQueue);
//spawning BEEP channel
Thread beepConnectionThread= new Thread(beepServerConnectoin);
beepConnectionThread.start();
@@ -62,7 +62,7 @@
public void closeChannel(Channel channel) throws CloseChannelException
{
- channel.setDataListener(null);
+ channel.setMessageListener(null);
channel.setAppData(null);
}
1.2 +2 -2
jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/impl/beep/CompleteBEEPServer.java
Index: CompleteBEEPServer.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/impl/beep/CompleteBEEPServer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CompleteBEEPServer.java 27 Feb 2002 14:47:36 -0000 1.1
+++ CompleteBEEPServer.java 6 Mar 2002 21:39:49 -0000 1.2
@@ -15,14 +15,14 @@
import org.beepcore.beep.core.ProfileRegistry;
import org.beepcore.beep.core.Session;
import org.beepcore.beep.profile.ProfileConfiguration;
-import org.beepcore.beep.transport.tcp.AutomatedTCPSessionCreator;
+import org.beepcore.beep.transport.tcp.TCPSessionCreator;
/**
* Class CompleteBEEPServer
*
*
* @author Vinay Chandrasekharan
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
@@ -130,7 +130,7 @@
System.out.println("Listening at
port["+beepServer.mPort+"]");
// Loop listening for new Sessions
Session session =
-
AutomatedTCPSessionCreator.listen(beepServer.mPort,beepServer.mProfileRegistry);
+
TCPSessionCreator.listen(beepServer.mPort,beepServer.mProfileRegistry);
}
catch (BEEPException e)
1.2 +6 -8
jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/impl/beep/ServerBEEPReadWriter.java
Index: ServerBEEPReadWriter.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/impl/beep/ServerBEEPReadWriter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServerBEEPReadWriter.java 27 Feb 2002 14:47:36 -0000 1.1
+++ ServerBEEPReadWriter.java 6 Mar 2002 21:39:49 -0000 1.2
@@ -19,15 +19,13 @@
import org.beepcore.beep.core.BEEPException;
import org.beepcore.beep.core.BEEPError;
import org.beepcore.beep.core.Channel;
-
import org.beepcore.beep.core.Message;
import org.beepcore.beep.lib.MessageQueue;
import org.beepcore.beep.core.MessageListener;
-
-import org.beepcore.beep.core.StringDataStream;
-import org.beepcore.beep.core.DataStream;
-import org.beepcore.beep.core.ByteDataStream;
import org.beepcore.beep.core.ReplyListener;
+import org.beepcore.beep.core.ByteOutputDataStream;
+import org.beepcore.beep.core.StringOutputDataStream;
+import org.beepcore.beep.core.InputDataStream;
import org.beepcore.beep.lib.NullReplyListener;
import java.util.*;
@@ -42,7 +40,7 @@
*
*
* @author Vinay Chandrasekharan
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class ServerBEEPReadWriter extends ServerStreamReadWriter //implements
MessageListener
{
@@ -82,7 +80,7 @@
byte[] aBytes = SerializationHelper.getBytesFromInstance(altrmiReply);
try
{
- channel.sendMSG(new ByteDataStream(aBytes),replyListener);
+ channel.sendMSG(new ByteOutputDataStream(aBytes),replyListener);
}
catch(BEEPException be)
{
@@ -113,8 +111,8 @@
try
{
Message message=mQueue.getNextMessage();
- message.sendRPY(new StringDataStream("OK"));
- DataStream ds = message.getDataStream();
+ message.sendRPY(new StringOutputDataStream("OK"));
+ InputDataStream ds = message.getDataStream();
InputStream is = ds.getInputStream();
byte[] buf = new byte[4096];
ByteArrayOutputStream data = new ByteArrayOutputStream();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
