[jboss-cvs] JBossAS SVN: r63217 - in branches/Branch_4_2: iiop/src/main/org/jboss/iiop/jacorb and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat May 26 12:02:09 EDT 2007
Author: reverbel
Date: 2007-05-26 12:02:09 -0400 (Sat, 26 May 2007)
New Revision: 63217
Modified:
branches/Branch_4_2/build/build-thirdparty.xml
branches/Branch_4_2/iiop/src/main/org/jboss/iiop/jacorb/SSLServerSocketFactory.java
branches/Branch_4_2/iiop/src/main/org/jboss/iiop/jacorb/SSLSocketFactory.java
branches/Branch_4_2/iiop/src/main/org/jboss/tm/iiop/client/IIOPClientUserTransactionObjectFactory.java
branches/Branch_4_2/security/src/main/org/jboss/security/ssl/DomainSocketFactory.java
Log:
Modifications needed by JacORB 2.3.0jboss.patch1 (JBAS-4146).
The changes in SSLSocketFactory/SSLServerSocketFactory and DomainSocketFactory reflect changes in JacORB's socket factory APIs in JacORB 2.3.0.
The change in IIOPClientUserTransactionObjectFactory is due to the stricter type-checking done by the method narrow in JacORB 2.3.0.
Modified: branches/Branch_4_2/build/build-thirdparty.xml
===================================================================
--- branches/Branch_4_2/build/build-thirdparty.xml 2007-05-25 21:22:36 UTC (rev 63216)
+++ branches/Branch_4_2/build/build-thirdparty.xml 2007-05-26 16:02:09 UTC (rev 63217)
@@ -76,7 +76,7 @@
<componentref name="hibernate-annotations" version="3.2.1.GA"/>
<componentref name="hibernate-entitymanager" version="3.2.1.GA"/>
<componentref name="hsqldb" version="1.8.0.2"/>
- <componentref name="jacorb" version="2.2.4jboss.patch1-brew"/>
+ <componentref name="jacorb" version="2.3.0jboss.patch1"/>
<componentref name="javassist" version="3.5.0.GA-brew"/>
<componentref name="jaxen" version="1.1-brew"/>
<componentref name="jboss/aop" version="1.5.5.GA"/>
Modified: branches/Branch_4_2/iiop/src/main/org/jboss/iiop/jacorb/SSLServerSocketFactory.java
===================================================================
--- branches/Branch_4_2/iiop/src/main/org/jboss/iiop/jacorb/SSLServerSocketFactory.java 2007-05-25 21:22:36 UTC (rev 63216)
+++ branches/Branch_4_2/iiop/src/main/org/jboss/iiop/jacorb/SSLServerSocketFactory.java 2007-05-26 16:02:09 UTC (rev 63217)
@@ -34,7 +34,7 @@
/**
* This implementation of the JacORB-specific interface
- * <code>org.jacorb.orb.factory.SSLServerSocketFactory</code> uses the JSSE
+ * <code>org.jacorb.orb.factory.ServerSocketFactory</code> uses the JSSE
* KeyManagerFactory and TrustManagerFactory objects encapsulated by
* a JBossSX SecurityDomain. It looks up the
* <code>org.jboss.security.SecurityDomain</code> instance bound to the
@@ -44,7 +44,7 @@
* @version $Revision$
*/
public class SSLServerSocketFactory
- implements org.jacorb.orb.factory.SSLServerSocketFactory,
+ implements org.jacorb.orb.factory.ServerSocketFactory,
org.apache.avalon.framework.configuration.Configurable
{
// Static --------------------------------------------------------
@@ -109,8 +109,8 @@
log.info("Created");
}
- // JacORB SSLServerSocketFactory implementation ------------------
- // (interface org.jacorb.orb.factory.SSLServerSocketFactory)
+ // JacORB ServerSocketFactory implementation ------------------
+ // (interface org.jacorb.orb.factory.ServerSocketFactory)
public ServerSocket createServerSocket(int port)
throws IOException
@@ -157,11 +157,6 @@
return s;
}
- public boolean isSSL(java.net.ServerSocket s)
- {
- return (s instanceof SSLServerSocket);
- }
-
public void switchToClientMode(java.net.Socket socket)
{
// no-op
Modified: branches/Branch_4_2/iiop/src/main/org/jboss/iiop/jacorb/SSLSocketFactory.java
===================================================================
--- branches/Branch_4_2/iiop/src/main/org/jboss/iiop/jacorb/SSLSocketFactory.java 2007-05-25 21:22:36 UTC (rev 63216)
+++ branches/Branch_4_2/iiop/src/main/org/jboss/iiop/jacorb/SSLSocketFactory.java 2007-05-26 16:02:09 UTC (rev 63217)
@@ -82,12 +82,35 @@
// JacORB SSLSocketFactory implementation ------------------------
// (interface org.jacorb.orb.factory.SSLSocketFactory)
+ /**
+ * create a connected stream Socket.
+ *
+ * @param host the host name
+ * @param port the port number
+ * @return a connected stream Socket
+ * @throws IOException, UnknownHostException
+ */
public Socket createSocket(String host, int port)
throws IOException, UnknownHostException
{
return domainFactory.createSocket(host, port);
}
+ /**
+ * create a connected stream Socket.
+ *
+ * @param host the host name
+ * @param port the port number
+ * @param timeout the timeout value to be used in milliseconds
+ * @return a connected stream Socket
+ * @throws IOException
+ */
+ public Socket createSocket(String host, int port, int timeout)
+ throws IOException, UnknownHostException
+ {
+ return domainFactory.createSocket(host, port, timeout);
+ }
+
public boolean isSSL (java.net.Socket s)
{
return (s instanceof SSLSocket);
Modified: branches/Branch_4_2/iiop/src/main/org/jboss/tm/iiop/client/IIOPClientUserTransactionObjectFactory.java
===================================================================
--- branches/Branch_4_2/iiop/src/main/org/jboss/tm/iiop/client/IIOPClientUserTransactionObjectFactory.java 2007-05-25 21:22:36 UTC (rev 63216)
+++ branches/Branch_4_2/iiop/src/main/org/jboss/tm/iiop/client/IIOPClientUserTransactionObjectFactory.java 2007-05-26 16:02:09 UTC (rev 63217)
@@ -95,9 +95,11 @@
if (!name.toString().equals("UserTransaction"))
return null;
+ if (!(obj instanceof org.omg.CORBA.Object))
+ return null;
try
{
- TransactionFactoryExtHelper.narrow(obj);
+ TransactionFactoryExtHelper.narrow((org.omg.CORBA.Object)obj);
}
catch (BAD_PARAM e)
{
Modified: branches/Branch_4_2/security/src/main/org/jboss/security/ssl/DomainSocketFactory.java
===================================================================
--- branches/Branch_4_2/security/src/main/org/jboss/security/ssl/DomainSocketFactory.java 2007-05-25 21:22:36 UTC (rev 63216)
+++ branches/Branch_4_2/security/src/main/org/jboss/security/ssl/DomainSocketFactory.java 2007-05-26 16:02:09 UTC (rev 63217)
@@ -24,6 +24,7 @@
import java.io.IOException;
import java.io.Serializable;
import java.net.InetAddress;
+import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.UnknownHostException;
import java.util.Arrays;
@@ -132,6 +133,22 @@
return this.createSocket(serverAddr, serverPort);
}
+ /**
+ * Create a client socket connected to the specified host and port.
+ *
+ * @param serverHost - the host name
+ * @param serverPort - the port number
+ * @param timeout the timeout value to be used in milliseconds
+ * @return a socket connected to the specified host and port.
+ * @exception IOException if an I/O error occurs during socket creation.
+ */
+ public Socket createSocket(String serverHost, int serverPort, int timeout)
+ throws IOException, UnknownHostException
+ {
+ InetAddress serverAddr = InetAddress.getByName(serverHost);
+ return this.createSocket(serverAddr, serverPort, timeout);
+ }
+
public Socket createSocket(String serverHost, int serverPort,
InetAddress clientAddr, int clientPort)
throws IOException, UnknownHostException
@@ -165,6 +182,24 @@
return socket;
}
+ public Socket createSocket(InetAddress serverAddr,
+ int serverPort, int timeout)
+ throws IOException
+ {
+ initSSLContext();
+ SSLSocketFactory factory = sslCtx.getSocketFactory();
+ SSLSocket socket = (SSLSocket)factory.createSocket();
+ socket.connect(new InetSocketAddress(serverAddr, serverPort), timeout);
+ String[] supportedProtocols = socket.getSupportedProtocols();
+ log.debug("Supported protocols: " + Arrays.asList(supportedProtocols));
+ String[] protocols = supportedProtocols; // {"SSLv3"};
+ socket.setEnabledProtocols(protocols);
+ socket.addHandshakeCompletedListener(this);
+ socket.setNeedClientAuth(needsClientAuth);
+ socket.setWantClientAuth(wantsClientAuth);
+ return socket;
+ }
+
public Socket createSocket(Socket s, String host,
int port, boolean autoClose)
throws IOException
More information about the jboss-cvs-commits
mailing list