Author: mageshbk(a)jboss.com Date: 2007-09-26 10:01:53 -0400 (Wed, 26 Sep 2007) New Revision: 4633 Modified: legacy/branches/jbossws-1.0.0.GA_JBWS-1821/build-thirdparty.xml legacy/branches/jbossws-1.0.0.GA_JBWS-1821/src/main/java/org/jboss/ws/jaxrpc/CallProxy.java legacy/branches/jbossws-1.0.0.GA_JBWS-1821/src/main/java/org/jboss/ws/jaxrpc/StubExt.java legacy/branches/jbossws-1.0.0.GA_JBWS-1821/src/main/java/org/jboss/ws/soap/SOAPConnectionImpl.java Log: [JBWS-1821] Patch for [JBWS-1820] Using JRE from vendors other than Sun the Remoting key store and trust store algorithms are not propagated Modified: legacy/branches/jbossws-1.0.0.GA_JBWS-1821/build-thirdparty.xml =================================================================== --- legacy/branches/jbossws-1.0.0.GA_JBWS-1821/build-thirdparty.xml 2007-09-26 13:11:47 UTC (rev 4632) +++ legacy/branches/jbossws-1.0.0.GA_JBWS-1821/build-thirdparty.xml 2007-09-26 14:01:53 UTC (rev 4633) @@ -42,7 +42,7 @@ <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xercesImpl.jar" dest="${thirdparty.dir}/xercesImpl.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xml-apis.jar" dest="${thirdparty.dir}/xml-apis.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xmlsec/${apache-xmlsec}/lib/xmlsec.jar" dest="${thirdparty.dir}/xmlsec.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/dom4j-dom4j/${dom4j}/lib/dom4j.jar" dest="${thirdparty.dir}/dom4j.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar" dest="${thirdparty.dir}/dom4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar" dest="${thirdparty.dir}/javassist.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/backport-concurrent/${jboss-backport-concurrent}/lib/jboss-backport-concurrent.jar" dest="${thirdparty.dir}/jboss-backport-concurrent.jar" usetimestamp="true" verbose="true"/> Modified: legacy/branches/jbossws-1.0.0.GA_JBWS-1821/src/main/java/org/jboss/ws/jaxrpc/CallProxy.java =================================================================== --- legacy/branches/jbossws-1.0.0.GA_JBWS-1821/src/main/java/org/jboss/ws/jaxrpc/CallProxy.java 2007-09-26 13:11:47 UTC (rev 4632) +++ legacy/branches/jbossws-1.0.0.GA_JBWS-1821/src/main/java/org/jboss/ws/jaxrpc/CallProxy.java 2007-09-26 14:01:53 UTC (rev 4633) @@ -77,9 +77,11 @@ { jbosswsProperties.add(StubExt.PROPERTY_CLIENT_TIMEOUT); jbosswsProperties.add(StubExt.PROPERTY_KEY_STORE); + jbosswsProperties.add(StubExt.PROPERTY_KEY_STORE_ALGORITHM); jbosswsProperties.add(StubExt.PROPERTY_KEY_STORE_PASSWORD); jbosswsProperties.add(StubExt.PROPERTY_KEY_STORE_TYPE); jbosswsProperties.add(StubExt.PROPERTY_TRUST_STORE); + jbosswsProperties.add(StubExt.PROPERTY_TRUST_STORE_ALGORITHM); jbosswsProperties.add(StubExt.PROPERTY_TRUST_STORE_PASSWORD); jbosswsProperties.add(StubExt.PROPERTY_TRUST_STORE_TYPE); jbosswsProperties.add(StubExt.PROPERTY_AUTH_TYPE); @@ -93,9 +95,11 @@ { legacyPropertyMap.put("org.jboss.webservice.client.timeout", StubExt.PROPERTY_CLIENT_TIMEOUT); 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.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); } Modified: legacy/branches/jbossws-1.0.0.GA_JBWS-1821/src/main/java/org/jboss/ws/jaxrpc/StubExt.java =================================================================== --- legacy/branches/jbossws-1.0.0.GA_JBWS-1821/src/main/java/org/jboss/ws/jaxrpc/StubExt.java 2007-09-26 13:11:47 UTC (rev 4632) +++ legacy/branches/jbossws-1.0.0.GA_JBWS-1821/src/main/java/org/jboss/ws/jaxrpc/StubExt.java 2007-09-26 14:01:53 UTC (rev 4633) @@ -40,12 +40,16 @@ static final String PROPERTY_CLIENT_TIMEOUT = "org.jboss.ws.timeout"; /** KeyStore property: org.jboss.ws.keyStore */ static final String PROPERTY_KEY_STORE = "org.jboss.ws.keyStore"; + /** KeyStore 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"; /** TrustStore property: org.jboss.ws.trustStore */ static final String PROPERTY_TRUST_STORE = "org.jboss.ws.trustStore"; + /** TrustStore 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: legacy/branches/jbossws-1.0.0.GA_JBWS-1821/src/main/java/org/jboss/ws/soap/SOAPConnectionImpl.java =================================================================== --- legacy/branches/jbossws-1.0.0.GA_JBWS-1821/src/main/java/org/jboss/ws/soap/SOAPConnectionImpl.java 2007-09-26 13:11:47 UTC (rev 4632) +++ legacy/branches/jbossws-1.0.0.GA_JBWS-1821/src/main/java/org/jboss/ws/soap/SOAPConnectionImpl.java 2007-09-26 14:01:53 UTC (rev 4633) @@ -72,9 +72,11 @@ static { configMap.put(StubExt.PROPERTY_KEY_STORE, RemotingSSLSocketFactory.REMOTING_KEY_STORE_FILE_PATH); + configMap.put(StubExt.PROPERTY_KEY_STORE_ALGORITHM, RemotingSSLSocketFactory.REMOTING_ALGORITHM); configMap.put(StubExt.PROPERTY_KEY_STORE_PASSWORD, RemotingSSLSocketFactory.REMOTING_KEY_STORE_PASSWORD); configMap.put(StubExt.PROPERTY_KEY_STORE_TYPE, RemotingSSLSocketFactory.REMOTING_KEY_STORE_TYPE); configMap.put(StubExt.PROPERTY_TRUST_STORE, RemotingSSLSocketFactory.REMOTING_TRUST_STORE_FILE_PATH); + configMap.put(StubExt.PROPERTY_TRUST_STORE_ALGORITHM, RemotingSSLSocketFactory.REMOTING_TRUST_ALGORITHM); configMap.put(StubExt.PROPERTY_TRUST_STORE_PASSWORD, RemotingSSLSocketFactory.REMOTING_TRUST_STORE_PASSWORD); configMap.put(StubExt.PROPERTY_TRUST_STORE_TYPE, RemotingSSLSocketFactory.REMOTING_TRUST_STORE_TYPE); }