[jbossws-commits] JBossWS SVN: r1353 - in trunk: . src/main/java/org/jboss/ws/soap
Author: thomas.diesler(a)jboss.com
Date: 2006-11-03 03:51:23 -0500 (Fri, 03 Nov 2006)
New Revision: 1353
Modified:
trunk/src/main/java/org/jboss/ws/soap/SOAPConnectionImpl.java
trunk/version.properties
Log:
jboss-remoting=2.2.0.Alpha2
Modified: trunk/src/main/java/org/jboss/ws/soap/SOAPConnectionImpl.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/soap/SOAPConnectionImpl.java 2006-11-03 05:35:10 UTC
(rev 1352)
+++ trunk/src/main/java/org/jboss/ws/soap/SOAPConnectionImpl.java 2006-11-03 08:51:23 UTC
(rev 1353)
@@ -42,7 +42,7 @@
import org.jboss.logging.Logger;
import org.jboss.remoting.Client;
import org.jboss.remoting.InvokerLocator;
-import org.jboss.remoting.util.socket.RemotingSSLSocketFactory;
+import org.jboss.remoting.security.SSLSocketBuilder;
import org.jboss.ws.binding.soap.SOAPMessageMarshaller;
import org.jboss.ws.binding.soap.SOAPMessageUnMarshaller;
import org.jboss.ws.jaxrpc.StubExt;
@@ -74,12 +74,12 @@
private static Map<String, String> configMap = new HashMap<String,
String>();
static
{
- configMap.put(StubExt.PROPERTY_KEY_STORE,
RemotingSSLSocketFactory.REMOTING_KEY_STORE_FILE_PATH);
- 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_PASSWORD,
RemotingSSLSocketFactory.REMOTING_TRUST_STORE_PASSWORD);
- configMap.put(StubExt.PROPERTY_TRUST_STORE_TYPE,
RemotingSSLSocketFactory.REMOTING_TRUST_STORE_TYPE);
+ configMap.put(StubExt.PROPERTY_KEY_STORE,
SSLSocketBuilder.REMOTING_KEY_STORE_FILE_PATH);
+ configMap.put(StubExt.PROPERTY_KEY_STORE_PASSWORD,
SSLSocketBuilder.REMOTING_KEY_STORE_PASSWORD);
+ configMap.put(StubExt.PROPERTY_KEY_STORE_TYPE,
SSLSocketBuilder.REMOTING_KEY_STORE_TYPE);
+ configMap.put(StubExt.PROPERTY_TRUST_STORE,
SSLSocketBuilder.REMOTING_TRUST_STORE_FILE_PATH);
+ configMap.put(StubExt.PROPERTY_TRUST_STORE_PASSWORD,
SSLSocketBuilder.REMOTING_TRUST_STORE_PASSWORD);
+ configMap.put(StubExt.PROPERTY_TRUST_STORE_TYPE,
SSLSocketBuilder.REMOTING_TRUST_STORE_TYPE);
}
private boolean closed;
Modified: trunk/version.properties
===================================================================
--- trunk/version.properties 2006-11-03 05:35:10 UTC (rev 1352)
+++ trunk/version.properties 2006-11-03 08:51:23 UTC (rev 1353)
@@ -20,7 +20,7 @@
jboss-common=1.0.2
jboss-jbossxb=1.0.0.CR6
jboss-microcontainer=snapshot
-jboss-remoting=1.4.3.GA
+jboss-remoting=2.2.0.Alpha2
# thirdparty library versions
apache-ant=1.6.5