[openejb-scm] openejb/modules/core/src/java/org/openejb/corba/sunorb OpenEJBSocketFactory.java SSLCipherSuiteDatabase.java SunORBConfigAdapter.java

[maguro]

maguro      2005/03/28 16:00:20

  Modified:    modules/core/src/java/org/openejb/corba/sunorb
                        OpenEJBSocketFactory.java
                        SSLCipherSuiteDatabase.java
                        SunORBConfigAdapter.java
  Log:

  Change dependency to geronimo-spec-corba.
  
  Revision  Changes    Path
  1.2       +10 -14    
openejb/modules/core/src/java/org/openejb/corba/sunorb/OpenEJBSocketFactory.java
  
  Index: OpenEJBSocketFactory.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/sunorb/OpenEJBSocketFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- OpenEJBSocketFactory.java 27 Mar 2005 02:04:42 -0000      1.1
  +++ OpenEJBSocketFactory.java 28 Mar 2005 21:00:20 -0000      1.2
  @@ -49,7 +49,6 @@
   import java.net.Socket;
   import java.security.AccessController;
   import java.security.PrivilegedAction;
  -import java.util.Properties;
   import javax.net.ssl.SSLServerSocket;
   import javax.net.ssl.SSLServerSocketFactory;
   import javax.net.ssl.SSLSocket;
  @@ -67,13 +66,12 @@
   import org.omg.CORBA.COMM_FAILURE;
   import org.omg.CORBA.CompletionStatus;
   import org.omg.CORBA.ORB;
  +import org.omg.CSIIOP.Confidentiality;
  +import org.omg.CSIIOP.EstablishTrustInTarget;
  +import org.omg.CSIIOP.NoProtection;
  +import org.omg.CSIIOP.TAG_CSI_SEC_MECH_LIST;
   import org.omg.IOP.TaggedComponent;
   
  -import org.apache.geronimo.interop.CSIIOP.Confidentiality;
  -import org.apache.geronimo.interop.CSIIOP.EstablishTrustInTarget;
  -import org.apache.geronimo.interop.CSIIOP.NoProtection;
  -import org.apache.geronimo.interop.CSIIOP.TAG_CSI_SEC_MECH_LIST;
  -
   import org.openejb.corba.MinorCodes;
   import org.openejb.corba.security.config.tss.TSSCompoundSecMechListConfig;
   import org.openejb.corba.security.config.tss.TSSSSLTransportConfig;
  @@ -97,11 +95,6 @@
       private final String[] cipherSuites;
       private final boolean clientAuthSupported;
       private final boolean clientAuthRequired;
  -    private final static ThreadLocal properties = new ThreadLocal() {
  -        protected Object initialValue() {
  -            return new Properties();
  -        }
  -    };
   
       public OpenEJBSocketFactory() {
   
  @@ -125,6 +118,8 @@
               } else if ("Integrity".equals(props[i])) {
               } else if ("NoProtection".equals(props[i])) {
                   supports |= NoProtection.value;
  +            } else if (props[i].trim().length() == 0) {
  +                supports |= NoProtection.value;
               } else {
                   log.error("Unsupported socket property: " + props[i]);
               }
  @@ -145,6 +140,8 @@
               } else if ("Integrity".equals(props[i])) {
               } else if ("NoProtection".equals(props[i])) {
                   requires |= NoProtection.value;
  +            } else if (props[i].trim().length() == 0) {
  +                requires |= NoProtection.value;
               } else {
                   log.error("Unsupported socket property: " + props[i]);
               }
  @@ -201,7 +198,6 @@
               socket.setWantClientAuth(clientAuthSupported);
               socket.setNeedClientAuth(clientAuthRequired);
               socket.setSoTimeout(10 * 1000);
  -//            socket.setSoLinger(true, 10*1000);
   
               if (log.isDebugEnabled()) {
                   log.debug("Created SSL socket to " + endPointInfo.getHost() 
+ ":" + endPointInfo.getPort());
  
  
  
  1.2       +5 -5      
openejb/modules/core/src/java/org/openejb/corba/sunorb/SSLCipherSuiteDatabase.java
  
  Index: SSLCipherSuiteDatabase.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/sunorb/SSLCipherSuiteDatabase.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SSLCipherSuiteDatabase.java       27 Mar 2005 02:04:42 -0000      1.1
  +++ SSLCipherSuiteDatabase.java       28 Mar 2005 21:00:20 -0000      1.2
  @@ -55,9 +55,9 @@
   import java.util.HashMap;
   import java.util.Map;
   
  -import org.apache.geronimo.interop.CSIIOP.Confidentiality;
  -import org.apache.geronimo.interop.CSIIOP.EstablishTrustInTarget;
  -import org.apache.geronimo.interop.CSIIOP.NoProtection;
  +import org.omg.CSIIOP.Confidentiality;
  +import org.omg.CSIIOP.EstablishTrustInTarget;
  +import org.omg.CSIIOP.NoProtection;
   
   
   /**
  
  
  
  1.2       +3 -3      
openejb/modules/core/src/java/org/openejb/corba/sunorb/SunORBConfigAdapter.java
  
  Index: SunORBConfigAdapter.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/sunorb/SunORBConfigAdapter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SunORBConfigAdapter.java  27 Mar 2005 02:04:42 -0000      1.1
  +++ SunORBConfigAdapter.java  28 Mar 2005 21:00:20 -0000      1.2
  @@ -48,12 +48,12 @@
   import java.util.List;
   import java.util.Properties;
   
  +import org.omg.CSIIOP.EstablishTrustInClient;
   import org.omg.Security.Confidentiality;
   import org.omg.Security.EstablishTrustInTarget;
   import org.omg.Security.NoProtection;
   
   import org.apache.geronimo.security.deploy.DefaultPrincipal;
  -import org.apache.geronimo.interop.CSIIOP.EstablishTrustInClient;
   
   import org.openejb.corba.security.config.ConfigAdapter;
   import org.openejb.corba.security.config.ConfigException;