[jboss-cvs] JBoss Messaging SVN: r1871 - branches/Branch_Bisocket_Experiment/src/main/org/jboss/jms/client/remoting

[jboss-cvs-commits at lists.jboss.org]

Author: ron_sigal
Date: 2006-12-30 02:15:02 -0500 (Sat, 30 Dec 2006)
New Revision: 1871

Modified:
   branches/Branch_Bisocket_Experiment/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java
Log:
JBMESSAGING-694: Added support for bisocket transport.

Modified: branches/Branch_Bisocket_Experiment/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java
===================================================================
--- branches/Branch_Bisocket_Experiment/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java	2006-12-29 03:02:10 UTC (rev 1870)
+++ branches/Branch_Bisocket_Experiment/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java	2006-12-30 07:15:02 UTC (rev 1871)
@@ -30,6 +30,7 @@
 import org.jboss.remoting.Client;
 import org.jboss.remoting.InvokerLocator;
 import org.jboss.remoting.callback.CallbackPoller;
+import org.jboss.remoting.transport.bisocket.Bisocket;
 import org.jboss.remoting.transport.socket.MicroSocketClientInvoker;
 import org.jboss.remoting.transport.socket.SocketServerInvoker;
 
@@ -103,7 +104,11 @@
 
       // For socket transport allow true push callbacks, with callback Connector.
       // For http transport, simulate push callbacks.
-      boolean doPushCallbacks = "socket".equals(serverLocator.getProtocol());
+      String protocol = serverLocator.getProtocol();
+      boolean isBisocket = "bisocket".equals(protocol) || "sslbisocket".equals(protocol);
+      boolean isSocket   = "socket".equals(protocol)   || "sslsocket".equals(protocol);
+      boolean doPushCallbacks = isBisocket || isSocket;
+      
       if (doPushCallbacks)
       {
          if (log.isTraceEnabled()) log.trace("doing push callbacks");
@@ -112,6 +117,9 @@
          metadata.put(InvokerLocator.SERIALIZATIONTYPE, "jms"); //Not actually used at present - but it does no harm         
          metadata.put(MicroSocketClientInvoker.CLIENT_SOCKET_CLASS_FLAG, "org.jboss.jms.client.remoting.ClientSocketWrapper");
          metadata.put(SocketServerInvoker.SERVER_SOCKET_CLASS_FLAG, "org.jboss.jms.server.remoting.ServerSocketWrapper");
+       
+         if (isBisocket)
+            metadata.put(Bisocket.IS_CALLBACK_SERVER, "true");
          
          String bindAddress = System.getProperty("jboss.messaging.callback.bind.address");
          if (bindAddress != null)