[jboss-cvs] JBoss Messaging SVN: r7597 - in branches/Branch_1_4: src/main/org/jboss/jms/client/delegate and 1 other directories.

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

Author: gaohoward
Date: 2009-07-21 10:49:14 -0400 (Tue, 21 Jul 2009)
New Revision: 7597

Modified:
   branches/Branch_1_4/docs/examples/secure-socket/build.xml
   branches/Branch_1_4/docs/examples/secure-socket/build.xml.AS5
   branches/Branch_1_4/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java
   branches/Branch_1_4/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java
Log:
JBMESSAGING-1689


Modified: branches/Branch_1_4/docs/examples/secure-socket/build.xml
===================================================================
--- branches/Branch_1_4/docs/examples/secure-socket/build.xml	2009-07-20 22:34:58 UTC (rev 7596)
+++ branches/Branch_1_4/docs/examples/secure-socket/build.xml	2009-07-21 14:49:14 UTC (rev 7597)
@@ -84,8 +84,8 @@
            'example.queue.name' property, which *may* be defined by calling ants when this example
             is used in a smoke test -->
 		<java classname="org.jboss.example.jms.securesocket.SecureSocketExample" classpathref="execution.classpath" fork="yes" failonerror="true">
-			<sysproperty key="javax.net.ssl.trustStorePassword" value="secureexample" />
-			<sysproperty key="javax.net.ssl.trustStore" value="./etc/messaging.truststore" />
+			<sysproperty key="org.jboss.remoting.trustStorePassword" value="secureexample" />
+			<sysproperty key="org.jboss.remoting.trustStore" value="./etc/messaging.truststore" />
 			<sysproperty key="example.queue.name" value="${example.queue.name}" />
 			<!--
          <jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=y,suspend=y,address=example"/>

Modified: branches/Branch_1_4/docs/examples/secure-socket/build.xml.AS5
===================================================================
--- branches/Branch_1_4/docs/examples/secure-socket/build.xml.AS5	2009-07-20 22:34:58 UTC (rev 7596)
+++ branches/Branch_1_4/docs/examples/secure-socket/build.xml.AS5	2009-07-21 14:49:14 UTC (rev 7597)
@@ -82,8 +82,8 @@
            'example.queue.name' property, which *may* be defined by calling ants when this example
             is used in a smoke test -->
 		<java classname="org.jboss.example.jms.securesocket.SecureSocketExample" classpathref="execution.classpath" fork="yes" failonerror="true">
-			<sysproperty key="javax.net.ssl.trustStorePassword" value="secureexample" />
-			<sysproperty key="javax.net.ssl.trustStore" value="./etc/messaging.truststore" />
+			<sysproperty key="org.jboss.remoting.trustStorePassword" value="secureexample" />
+			<sysproperty key="org.jboss.remoting.trustStore" value="./etc/messaging.truststore" />
 			<sysproperty key="example.queue.name" value="${example.queue.name}" />
 			<!--
          <jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=y,suspend=y,address=example"/>

Modified: branches/Branch_1_4/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java	2009-07-20 22:34:58 UTC (rev 7596)
+++ branches/Branch_1_4/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java	2009-07-21 14:49:14 UTC (rev 7597)
@@ -307,6 +307,17 @@
       // Create a client - make sure pinging is off
 
       Map configuration = new HashMap();
+      
+      String trustStoreLoc = System.getProperty("org.jboss.remoting.trustStore");
+      if (trustStoreLoc != null)
+      {
+         configuration.put("org.jboss.remoting.trustStore", trustStoreLoc);
+         String trustStorePassword = System.getProperty("org.jboss.remoting.trustStorePassword");
+         if (trustStorePassword != null)
+         {
+            configuration.put("org.jboss.remoting.trustStorePassword", trustStorePassword);
+         }
+      }
 
       configuration.put(Client.ENABLE_LEASE, String.valueOf(false));
 

Modified: branches/Branch_1_4/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java	2009-07-20 22:34:58 UTC (rev 7596)
+++ branches/Branch_1_4/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java	2009-07-21 14:49:14 UTC (rev 7597)
@@ -310,7 +310,21 @@
       // Enable client pinging. Server leasing is enabled separately on the server side.
 
       Map config = new HashMap();
+      Map config2 = new HashMap();
       
+      String trustStoreLoc = System.getProperty("org.jboss.remoting.trustStore");
+      if (trustStoreLoc != null)
+      {
+         config.put("org.jboss.remoting.trustStore", trustStoreLoc);
+         config2.put("org.jboss.remoting.trustStore", trustStoreLoc);
+         String trustStorePassword = System.getProperty("org.jboss.remoting.trustStorePassword");
+         if (trustStorePassword != null)
+         {
+            config.put("org.jboss.remoting.trustStorePassword", trustStorePassword);
+            config2.put("org.jboss.remoting.trustStorePassword", trustStorePassword);
+         }
+      }
+
       config.put(Client.ENABLE_LEASE, String.valueOf(clientPing));
       
       if (serverLocator.getParameters().containsKey(MicroSocketClientInvoker.MAX_POOL_SIZE_FLAG))
@@ -337,8 +351,6 @@
 
       client.setSubsystem(ServerPeer.REMOTING_JMS_SUBSYSTEM);
       
-      Map config2 = new HashMap();
-      
       config2.put(Client.ENABLE_LEASE, "false");
       config2.put(MicroSocketClientInvoker.MAX_POOL_SIZE_FLAG, "1");