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

[djencks]

djencks     2005/07/30 04:10:59

  Modified:    modules/core/src/java/org/openejb/corba/sunorb
                        SunORBConfigAdapter.java
  Added:       modules/core/src/java/org/openejb/corba/sunorb
                        SunORBInitializerNoSSL.java
  Log:

  GERONIMO-831 annoying startup exception with no-ssl tssbean
  
  Revision  Changes    Path
  1.9       +11 -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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- SunORBConfigAdapter.java  26 Jun 2005 08:17:55 -0000      1.8
  +++ SunORBConfigAdapter.java  30 Jul 2005 08:10:59 -0000      1.9
  @@ -137,6 +137,10 @@
                           }
                       }
   
  +                } else {
  +                    //no protection
  +                    supProp = "NoProtection";
  +                    reqProp = "NoProtection";
                   }
               }
           }
  @@ -147,7 +151,11 @@
           result.put("com.sun.CORBA.connection.ORBSocketFactoryClass", 
"org.openejb.corba.sunorb.OpenEJBSocketFactory");
           
result.put("org.omg.PortableInterceptor.ORBInitializerClass.org.openejb.corba.transaction.TransactionInitializer",
 "");
           
result.put("org.omg.PortableInterceptor.ORBInitializerClass.org.openejb.corba.security.SecurityInitializer",
 "");
  -        
result.put("org.omg.PortableInterceptor.ORBInitializerClass.org.openejb.corba.sunorb.SunORBInitializer",
 "");
  +        if ("NoProtection".equals(reqProp)) {
  +            
result.put("org.omg.PortableInterceptor.ORBInitializerClass.org.openejb.corba.sunorb.SunORBInitializerNoSSL",
 "");
  +        } else {
  +            
result.put("org.omg.PortableInterceptor.ORBInitializerClass.org.openejb.corba.sunorb.SunORBInitializer",
 "");
  +        }
           result.put("com.sun.CORBA.ORBAllowLocalOptimization", "");
   
           if (log.isDebugEnabled()) {
  
  
  
  1.2       +113 -0    
openejb/modules/core/src/java/org/openejb/corba/sunorb/SunORBInitializerNoSSL.java