[Jboss-cvs] JBoss Messaging SVN: r1210 - in trunk: . docs/examples/secure-socket/etc lib src/main/org/jboss/jms/client/remoting

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

Author: ovidiu.feodorov at jboss.com
Date: 2006-08-08 00:30:11 -0400 (Tue, 08 Aug 2006)
New Revision: 1210

Modified:
   trunk/docs/examples/secure-socket/etc/messaging-secure-socket-service.xml
   trunk/lib/jboss-remoting.jar
   trunk/messaging.iml
   trunk/src/main/org/jboss/jms/client/remoting/CallbackServerFactory.java
Log:
Fix for http://jira.jboss.org/jira/browse/JBMESSAGING-487. Required code changes and also remoting upgrade. As soon as 2.0.0.CR2 is out, will use that one

Modified: trunk/docs/examples/secure-socket/etc/messaging-secure-socket-service.xml
===================================================================
--- trunk/docs/examples/secure-socket/etc/messaging-secure-socket-service.xml	2006-08-08 02:32:51 UTC (rev 1209)
+++ trunk/docs/examples/secure-socket/etc/messaging-secure-socket-service.xml	2006-08-08 04:30:11 UTC (rev 1210)
@@ -95,7 +95,7 @@
       <!-- The protocol for the SSLContext. Default is TLS. -->
       <attribute name="SecureSocketProtocol">TLS</attribute>
       <!-- The algorithm for the key manager factory.  Default is SunX509. -->
-      <attribute name="KeyManagementAlgorithm">SunX509</attribute>
+      <attribute name="KeyStoreAlgorithm">SunX509</attribute>
       <!--
            The type to be used for the key store.
            Defaults to JKS. Some acceptable values are JKS (Java Keystore - Sun's keystore format),

Modified: trunk/lib/jboss-remoting.jar
===================================================================
(Binary files differ)

Modified: trunk/messaging.iml
===================================================================
--- trunk/messaging.iml	2006-08-08 02:32:51 UTC (rev 1209)
+++ trunk/messaging.iml	2006-08-08 04:30:11 UTC (rev 1210)
@@ -83,17 +83,6 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/jboss-remoting.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$MODULE_DIR$/../../cvs/JBossRemoting-2.0.0.Beta2/src/main" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
           <root url="jar://$MODULE_DIR$/lib/jboss-system.jar!/" />
         </CLASSES>
         <JAVADOC />
@@ -176,6 +165,17 @@
         </SOURCES>
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/jboss-remoting.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://$MODULE_DIR$/../../cvs/JBossRemoting/src/main" />
+        </SOURCES>
+      </library>
+    </orderEntry>
     <orderEntryProperties />
   </component>
 </module>

Modified: trunk/src/main/org/jboss/jms/client/remoting/CallbackServerFactory.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/remoting/CallbackServerFactory.java	2006-08-08 02:32:51 UTC (rev 1209)
+++ trunk/src/main/org/jboss/jms/client/remoting/CallbackServerFactory.java	2006-08-08 04:30:11 UTC (rev 1210)
@@ -28,6 +28,7 @@
 import org.jboss.jms.util.MessagingJMSException;
 import org.jboss.logging.Logger;
 import org.jboss.remoting.InvokerLocator;
+import org.jboss.remoting.security.SSLSocketBuilder;
 import org.jboss.remoting.transport.Connector;
 import org.jboss.remoting.transport.PortUtil;
 
@@ -120,18 +121,14 @@
 
       final int MAX_RETRIES = 50;
       boolean completed = false;
-      int count = 0;
-      
       Connector server = null;
-      
+      String serializationType = null;
+      int count = 0;
+
       String thisAddress = InetAddress.getLocalHost().getHostAddress();
-      
       boolean isSSL = serverLocator.getProtocol().equals("sslsocket");
-      
       Map params = serverLocator.getParameters();
-      
-      String serializationType = null;
-      
+
       if (params != null)
       {
          serializationType = (String)params.get("serializationtype");
@@ -148,9 +145,10 @@
             if (isSSL)
             {
                // See http://jira.jboss.com/jira/browse/JBREM-470
-               callbackServerURI = "sslsocket://" + thisAddress + ":" + bindPort +
-                                   CALLBACK_SERVER_PARAMS + "&useClientMode=true";
-            }      
+               callbackServerURI =
+                  "sslsocket://" + thisAddress + ":" +  bindPort + CALLBACK_SERVER_PARAMS +
+                  "&" + SSLSocketBuilder.REMOTING_SERVER_SOCKET_USE_CLIENT_MODE + "=true";
+            }
             else
             {
                callbackServerURI = serverLocator.getProtocol() + "://" + thisAddress +
@@ -167,13 +165,9 @@
             log.debug(this + " starting callback server " + callbackServerLocator.getLocatorURI());
       
             server = new Connector();
-      
             server.setInvokerLocator(callbackServerLocator.getLocatorURI());
-      
             server.create();
-            
             server.addInvocationHandler(JMS_CALLBACK_SUBSYSTEM, new CallbackManager());
-      
             server.start();
       
             if (log.isTraceEnabled()) { log.trace("callback server started"); }