maguro 2005/03/26 21:04:39
Modified: modules/assembly/src/plan j2ee-server-plan.xml
Log:
Updated to use the default Sun ORB.
Revision Changes Path
1.75 +15 -41 openejb/modules/assembly/src/plan/j2ee-server-plan.xml
Index: j2ee-server-plan.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/assembly/src/plan/j2ee-server-plan.xml,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- j2ee-server-plan.xml 25 Mar 2005 11:23:36 -0000 1.74
+++ j2ee-server-plan.xml 27 Mar 2005 02:04:39 -0000 1.75
@@ -94,6 +94,9 @@
<uri>openejb/jars/openejb-core-${openejb_version}.jar</uri>
</dependency>
<dependency>
+ <uri>geronimo/jars/geronimo-interop-${geronimo_version}.jar</uri>
+ </dependency>
+ <dependency>
<uri>geronimo/jars/geronimo-jmxremoting-${geronimo_version}.jar</uri>
</dependency>
<dependency>
@@ -444,31 +447,17 @@
<reference name="ThreadPool">
<name>DefaultThreadPool</name>
</reference>
- <reference name="NamingService">
- <name>NameServer</name>
- </reference>
<reference name="SecurityService">
<name>SecurityService</name>
</reference>
+ <reference name="NameService">
+ <name>NameServer</name>
+ </reference>
<attribute name="args">-ORBPort, 683, -ORBInitRef,
NameService=corbaloc::localhost:2809/NameService</attribute>
- <attribute
name="configAdapter">org.openejb.corba.openorb.OpenORBConfigAdapter</attribute>
+ <attribute
name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
<attribute name="props">
- org.omg.CORBA.ORBClass=org.openorb.orb.core.ORB
- org.omg.CORBA.ORBSingletonClass=org.openorb.orb.core.ORBSingleton
-
-
org.omg.PortableInterceptor.ORBInitializerClass.org.openejb.corba.util.UtilInitializer
-
org.omg.PortableInterceptor.ORBInitializerClass.org.openejb.corba.transaction.TransactionInitializer
-
org.omg.PortableInterceptor.ORBInitializerClass.org.openejb.corba.security.SecurityInitializer
-
org.omg.PortableInterceptor.ORBInitializerClass.org.openejb.corba.openorb.OpenORBInitializer
-
Xjava.net.debug=all
- Xopenorb.debug.level=HIGH
- Xopenorb.debug.trace=DEBUG
-
-
iiop.TransportServerInitializerClass=org.openorb.orb.ssl.SSLTransportServerInitializer
-
- secure.server.allowUnsecure=false
</attribute>
<xml-attribute name="tssConfig">
@@ -492,15 +481,13 @@
</xml-attribute>
</gbean>
- <gbean name="NameServer" class="org.openejb.corba.OpenORBNameBean">
- <reference name="ThreadPool">
- <name>DefaultThreadPool</name>
+ <gbean name="NameServer" class="org.openejb.corba.SunNameService">
+ <reference name="ServerInfo">
+ <module>org/apache/geronimo/System</module>
+ <name>ServerInfo</name>
</reference>
- <attribute name="args">-ORBPort, 2809</attribute>
- <attribute name="props">
- openorb.home=resource:org/openorb/
- </attribute>
-
+ <attribute name="dbDir">var/cosnaming.db</attribute>
+ <attribute name="port">2809</attribute>
</gbean>
<gbean name="org/openejb/Itests" class="org.openejb.corba.TSSBean">
@@ -526,24 +513,11 @@
<reference name="TransactionContextManager">
<name>TransactionContextManager</name>
</reference>
- <attribute
name="configAdapter">org.openejb.corba.openorb.OpenORBConfigAdapter</attribute>
+ <attribute
name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
<attribute name="description">IOR7</attribute>
<attribute name="cssArgs"></attribute>
<attribute name="cssProps">
- org.omg.CORBA.ORBClass=org.openorb.orb.core.ORB
- org.omg.CORBA.ORBSingletonClass=org.openorb.orb.core.ORBSingleton
-
-
org.omg.PortableInterceptor.ORBInitializerClass.org.openejb.corba.transaction.TransactionInitializer
-
org.omg.PortableInterceptor.ORBInitializerClass.org.openejb.corba.security.SecurityInitializer
-
org.omg.PortableInterceptor.ORBInitializerClass.org.openejb.corba.openorb.OpenORBInitializer
-
- Xopenorb.debug.level=HIGH
- Xopenorb.debug.trace=DEBUG
-
-
iiop.TransportClientInitializerClass=org.openorb.orb.ssl.SSLTransportClientInitializer
-
- secure.server.allowUnsecure=false
</attribute>
<xml-attribute name="cssConfig">
@@ -552,7 +526,7 @@
<css:compoundSecMech>
<css:SSL>
<css:supports>Integrity Confidentiality
EstablishTrustInTarget EstablishTrustInClient</css:supports>
- <css:requires>Integrity Confidentiality
EstablishTrustInClient</css:requires>
+ <css:requires>Integrity Confidentiality
EstablishTrustInTarget</css:requires>
</css:SSL>
</css:compoundSecMech>
</css:compoundSecMechTypeList>
