[jbossws-commits] JBossWS SVN: r16517 - in stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core: client and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: klape
Date: 2012-07-23 17:34:26 -0400 (Mon, 23 Jul 2012)
New Revision: 16517

Modified:
   stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/StubExt.java
   stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java
Log:
[JBPAPP-8912] Add property to allow remoting to use default SSL socket factory

Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/StubExt.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/StubExt.java	2012-07-23 14:38:52 UTC (rev 16516)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/StubExt.java	2012-07-23 21:34:26 UTC (rev 16517)
@@ -49,6 +49,8 @@
    static final String PROPERTY_KEY_STORE_TYPE = "org.jboss.ws.keyStoreType";
    /** SocketFactory property: org.jboss.ws.socketFactory */
    static final String PROPERTY_SOCKET_FACTORY = "org.jboss.ws.socketFactory";
+   /** DefaultSslSocketFactory property: org.jboss.ws.defaultSslSocketFactory */
+   static final String PROPERTY_DEFAULT_SSL_SOCKET_FACTORY = "org.jboss.ws.defaultSslSocketFactory";
    /** Remoting SSL Protocol property: org.jboss.ws.sslProtocol */
    static final String PROPERTY_SSL_PROTOCOL = "org.jboss.ws.sslProtocol";
    /** Remoting SSL Provider Name property: org.jboss.ws.sslProviderName */

Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java	2012-07-23 14:38:52 UTC (rev 16516)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java	2012-07-23 21:34:26 UTC (rev 16517)
@@ -97,6 +97,7 @@
       configMap.put(StubExt.PROPERTY_KEY_STORE_PASSWORD, "org.jboss.remoting.keyStorePassword");
       configMap.put(StubExt.PROPERTY_KEY_STORE_TYPE, "org.jboss.remoting.keyStoreType");
       configMap.put(StubExt.PROPERTY_SOCKET_FACTORY, "socketFactoryClassName");
+      configMap.put(StubExt.PROPERTY_DEFAULT_SSL_SOCKET_FACTORY, "useDefaultSslSocketFactory");
       configMap.put(StubExt.PROPERTY_SSL_PROTOCOL, "org.jboss.remoting.sslProtocol");
       configMap.put(StubExt.PROPERTY_SSL_PROVIDER_NAME, "org.jboss.remoting.sslProviderName");
       configMap.put(StubExt.PROPERTY_TRUST_STORE, "org.jboss.remoting.trustStore");