Author: darran.lofthouse(a)jboss.com Date: 2008-05-12 08:02:53 -0400 (Mon, 12 May 2008) New Revision: 7010 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/StubExt.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/client/RemotingConnectionImpl.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxrpc/client/PortProxy.java Log: [JBPAPP-834] Using JRE from vendors other than Sun the Remoting key store and trust store algorithms are not propagated. Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/StubExt.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/StubExt.java 2008-05-11 22:44:53 UTC (rev 7009) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/StubExt.java 2008-05-12 12:02:53 UTC (rev 7010) @@ -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/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/client/RemotingConnectionImpl.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/client/RemotingConnectionImpl.java 2008-05-11 22:44:53 UTC (rev 7009) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/client/RemotingConnectionImpl.java 2008-05-12 12:02:53 UTC (rev 7010) @@ -94,10 +94,15 @@ //configMap.put(StubExt.PROPERTY_TRUST_STORE_PASSWORD, SSLSocketBuilder.REMOTING_TRUST_STORE_PASSWORD); //configMap.put(StubExt.PROPERTY_TRUST_STORE_TYPE, SSLSocketBuilder.REMOTING_TRUST_STORE_TYPE); + 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"); } @@ -222,10 +227,10 @@ { // Get the invoker from Remoting for a given endpoint address log.debug("Get locator for: " + endpoint); - + Marshaller marshaller = getMarshaller(); UnMarshaller unmarshaller = getUnmarshaller(); - + /** * [JBWS-1704] The Use Of Remoting Causes An Additional 'datatype' Parameter To Be Sent On All Requests * @@ -265,7 +270,7 @@ private String getRemotingVersion() { - String version = null; + String version = null; try { // Access the constant dynamically, otherwise it will be the compile time value @@ -276,7 +281,7 @@ { throw new RuntimeException("Cannot obtain remoting version", ex); } - + if (version == null) { URL codeURL = Version.class.getProtectionDomain().getCodeSource().getLocation(); @@ -305,7 +310,7 @@ // Enable chunked encoding. This is the default size. clientConfig.put("chunkedLength", "1024"); - + // May be overridden through endpoint config if (msgContext != null) { Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxrpc/client/PortProxy.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxrpc/client/PortProxy.java 2008-05-11 22:44:53 UTC (rev 7009) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxrpc/client/PortProxy.java 2008-05-12 12:02:53 UTC (rev 7010) @@ -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); }