djencks 2005/07/30 04:08:05
Modified: modules/core/src/java/org/openejb/corba/sunorb Tag:
v2_0_G1M4 SunORBConfigAdapter.java
Added: modules/core/src/java/org/openejb/corba/sunorb Tag:
v2_0_G1M4 SunORBInitializerNoSSL.java
Log:
GERONIMO-831 annoying startup exception with no-ssl tssbean
Revision Changes Path
No revision
No revision
1.8.4.1 +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.8.4.1
diff -u -r1.8 -r1.8.4.1
--- SunORBConfigAdapter.java 26 Jun 2005 08:17:55 -0000 1.8
+++ SunORBConfigAdapter.java 30 Jul 2005 08:08:05 -0000 1.8.4.1
@@ -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()) {
No revision
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.8.4.1
diff -u -r1.8 -r1.8.4.1
--- SunORBConfigAdapter.java 26 Jun 2005 08:17:55 -0000 1.8
+++ SunORBConfigAdapter.java 30 Jul 2005 08:08:05 -0000 1.8.4.1
@@ -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()) {
No revision
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.8.4.1
diff -u -r1.8 -r1.8.4.1
--- SunORBConfigAdapter.java 26 Jun 2005 08:17:55 -0000 1.8
+++ SunORBConfigAdapter.java 30 Jul 2005 08:08:05 -0000 1.8.4.1
@@ -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.1.2.1 +113 -0
openejb/modules/core/src/java/org/openejb/corba/sunorb/Attic/SunORBInitializerNoSSL.java
