Author: mageshbk(a)jboss.com Date: 2008-02-28 02:23:17 -0500 (Thu, 28 Feb 2008) New Revision: 5829 Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/StubExt.java stack/native/trunk/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java stack/native/trunk/src/main/java/org/jboss/ws/core/jaxrpc/client/PortProxy.java Log: [JBWS-1820] Using JRE from vendors other than Sun the Remoting key store and trust store algorithms are not propagated Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/StubExt.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/StubExt.java 2008-02-27 20:14:17 UTC (rev 5828) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/StubExt.java 2008-02-28 07:23:17 UTC (rev 5829) @@ -41,14 +41,24 @@ { /** ClientTimeout property: org.jboss.ws.timeout */ static final String PROPERTY_CLIENT_TIMEOUT = "org.jboss.ws.timeout"; + /** Key Alias property: org.jboss.ws.keyAlias */ + static final String PROPERTY_KEY_ALIAS = "org.jboss.ws.keyAlias"; /** KeyStore property: org.jboss.ws.keyStore */ static final String PROPERTY_KEY_STORE = "org.jboss.ws.keyStore"; + /** KeyStore Management Algorithm property: org.jboss.ws.keyStoreAlgorithm */ + static final String PROPERTY_KEY_STORE_ALGORITHM = "org.jboss.ws.keyStoreAlgorithm"; /** KeyStorePassword property: org.jboss.ws.keyStorePassword */ static final String PROPERTY_KEY_STORE_PASSWORD = "org.jboss.ws.keyStorePassword"; /** KeyStoreType property: org.jboss.ws.keyStoreType */ static final String PROPERTY_KEY_STORE_TYPE = "org.jboss.ws.keyStoreType"; + /** 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 */ + static final String PROPERTY_SSL_PROVIDER_NAME = "org.jboss.ws.sslProviderName"; /** TrustStore property: org.jboss.ws.trustStore */ static final String PROPERTY_TRUST_STORE = "org.jboss.ws.trustStore"; + /** TrustStore Management Algorithm property: org.jboss.ws.trustStoreAlgorithm */ + static final String PROPERTY_TRUST_STORE_ALGORITHM = "org.jboss.ws.trustStoreAlgorithm"; /** TrustStorePassword property: org.jboss.ws.trustStorePassword */ static final String PROPERTY_TRUST_STORE_PASSWORD = "org.jboss.ws.trustStorePassword"; /** TrustStoreType property: org.jboss.ws.trustStoreType */ Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2008-02-27 20:14:17 UTC (rev 5828) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2008-02-28 07:23:17 UTC (rev 5829) @@ -90,10 +90,15 @@ private static Map<String, String> configMap = new HashMap<String, String>(); static { + configMap.put(StubExt.PROPERTY_KEY_ALIAS, "org.jboss.remoting.keyAlias"); configMap.put(StubExt.PROPERTY_KEY_STORE, "org.jboss.remoting.keyStore"); + configMap.put(StubExt.PROPERTY_KEY_STORE_ALGORITHM, "org.jboss.remoting.keyStoreAlgorithm"); 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_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"); + configMap.put(StubExt.PROPERTY_TRUST_STORE_ALGORITHM, "org.jboss.remoting.truststoreAlgorithm"); configMap.put(StubExt.PROPERTY_TRUST_STORE_PASSWORD, "org.jboss.remoting.trustStorePassword"); configMap.put(StubExt.PROPERTY_TRUST_STORE_TYPE, "org.jboss.remoting.trustStoreType"); } Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxrpc/client/PortProxy.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxrpc/client/PortProxy.java 2008-02-27 20:14:17 UTC (rev 5828) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxrpc/client/PortProxy.java 2008-02-28 07:23:17 UTC (rev 5829) @@ -78,10 +78,15 @@ static { legacyPropertyMap.put("org.jboss.webservice.client.timeout", StubExt.PROPERTY_CLIENT_TIMEOUT); + legacyPropertyMap.put("org.jboss.webservice.keyAlias", StubExt.PROPERTY_KEY_ALIAS); legacyPropertyMap.put("org.jboss.webservice.keyStore", StubExt.PROPERTY_KEY_STORE); + legacyPropertyMap.put("org.jboss.webservice.keyStoreAlgorithm", StubExt.PROPERTY_KEY_STORE_ALGORITHM); legacyPropertyMap.put("org.jboss.webservice.keyStorePassword", StubExt.PROPERTY_KEY_STORE_PASSWORD); legacyPropertyMap.put("org.jboss.webservice.keyStoreType", StubExt.PROPERTY_KEY_STORE_TYPE); + legacyPropertyMap.put("org.jboss.webservice.sslProtocol", StubExt.PROPERTY_SSL_PROTOCOL); + legacyPropertyMap.put("org.jboss.webservice.sslProviderName", StubExt.PROPERTY_SSL_PROVIDER_NAME); legacyPropertyMap.put("org.jboss.webservice.trustStore", StubExt.PROPERTY_TRUST_STORE); + legacyPropertyMap.put("org.jboss.webservice.trustStoreAlgorithm", StubExt.PROPERTY_TRUST_STORE_ALGORITHM); legacyPropertyMap.put("org.jboss.webservice.trustStorePassword", StubExt.PROPERTY_TRUST_STORE_PASSWORD); legacyPropertyMap.put("org.jboss.webservice.trustStoreType", StubExt.PROPERTY_TRUST_STORE_TYPE); }