maguro 2004/11/05 18:41:42
Modified: modules/assembly/src/plan j2ee-deployer-plan.xml
j2ee-server-plan.xml
Log:
Intermediate CORBA checkin
Revision Changes Path
1.24 +20 -1 openejb/modules/assembly/src/plan/j2ee-deployer-plan.xml
Index: j2ee-deployer-plan.xml
===================================================================
RCS file: /scm/openejb/openejb/modules/assembly/src/plan/j2ee-deployer-plan.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- j2ee-deployer-plan.xml 5 Nov 2004 05:42:45 -0000 1.23
+++ j2ee-deployer-plan.xml 5 Nov 2004 23:41:42 -0000 1.24
@@ -75,6 +75,14 @@
<uri>tranql/jars/tranql-${tranql_version}.jar</uri>
</dependency>
+ <!-- OpenORB Skeleton generator -->
+ <dependency>
+ <uri>ant/jars/ant-${ant_version}.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>openorb/jars/openorb-tools-${openorb_version}.jar</uri>
+ </dependency>
+
<gbean
name="geronimo.deployment:role=Deployer,config=org/apache/geronimo/J2EEDeployer"
class="org.apache.geronimo.deployment.Deployer">
<reference
name="Builders">geronimo.deployer:role=Builder,config=org/apache/geronimo/J2EEDeployer,*</reference>
<reference
name="Store">geronimo.deployment:role=ConfigurationStore,type=Local</reference>
@@ -97,7 +105,9 @@
<reference
name="ResourceReferenceBuilder">geronimo.deployer:role=ModuleBuilder,type=Connector,config=org/apache/geronimo/J2EEDeployer</reference>
</gbean>
- <gbean
name="geronimo.deployer:role=ModuleBuilder,type=EJB,config=org/apache/geronimo/J2EEDeployer"
class="org.openejb.deployment.OpenEJBModuleBuilder"/>
+ <gbean
name="geronimo.deployer:role=ModuleBuilder,type=EJB,config=org/apache/geronimo/J2EEDeployer"
class="org.openejb.deployment.OpenEJBModuleBuilder">
+ <reference
name="SkeletonGenerator">openejb.CORBA:type=SkeletonGenerator,vendor=OpenORB</reference>
+ </gbean>
<gbean
name="geronimo.deployer:role=ModuleBuilder,type=Connector,config=org/apache/geronimo/J2EEDeployer"
class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
<attribute name="defaultMaxSize" type="int">10</attribute>
@@ -107,4 +117,13 @@
<attribute name="defaultXATransactionCaching"
type="boolean">true</attribute>
<attribute name="defaultXAThreadCaching" type="boolean">false</attribute>
</gbean>
+
+ <gbean name="openejb.CORBA:type=Compiler,vendor=Ant"
class="org.openejb.corba.compiler.AntCompiler"/>
+
+ <gbean name="openejb.CORBA:type=SkeletonGenerator,vendor=OpenORB"
class="org.openejb.corba.compiler.OpenORBSkeletonGenerator">
+ <attribute name="props" type="java.util.Properties">
+ </attribute>
+ <reference
name="Compiler">openejb.CORBA:type=Compiler,vendor=Ant</reference>
+ </gbean>
+
</configuration>
1.31 +44 -0 openejb/modules/assembly/src/plan/j2ee-server-plan.xml
Index: j2ee-server-plan.xml
===================================================================
RCS file: /scm/openejb/openejb/modules/assembly/src/plan/j2ee-server-plan.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- j2ee-server-plan.xml 2 Nov 2004 03:31:01 -0000 1.30
+++ j2ee-server-plan.xml 5 Nov 2004 23:41:42 -0000 1.31
@@ -99,6 +99,25 @@
<uri>xmlbeans/jars/xbean-apache-${xmlbeans_version}.jar</uri>
</dependency>
+ <!-- CORBA -->
+ <dependency>
+ <uri>openorb/jars/openorb-orb-${openorb_version}.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>openorb/jars/openorb-orb-omg-${openorb_version}.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>openorb/jars/openorb-orb-tools-${openorb_version}.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>openorb/jars/openorb-tools-${openorb_version}.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>avalon/jars/avalon-framework-${avalon_framework_version}.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>avalon/jars/avalon-logkit-${avalon_logkit_version}.jar</uri>
+ </dependency>
<!-- Default security realm using properties files -->
<gbean
name="geronimo.security:type=SecurityRealm,realm=geronimo-properties-realm"
class="org.apache.geronimo.security.realm.providers.PropertiesFileSecurityRealm">
@@ -245,5 +264,30 @@
<attribute name="defaultXAThreadCaching" type="boolean">false</attribute>
</gbean>
<!-- end deployment block -->
+
+ <gbean name="openejb.CORBA:type=Server" class="org.openejb.corba.CORBABean">
+ <attribute name="Args" type="java.util.ArrayList">-ORBPort, 2001</attribute>
+ <attribute name="Props" type="java.util.Properties">
+
+ org.omg.CORBA.ORBClass=org.openorb.orb.core.ORB
+ org.omg.CORBA.ORBSingletonClass=org.openorb.orb.core.ORBSingleton
+
+ Zorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB
+ Zorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton
+
+
org.omg.PortableInterceptor.ORBInitializerClass.org.openejb.corba.transaction.TransactionInitializer
+
org.omg.PortableInterceptor.ORBInitializerClass.org.openejb.corba.security.SecurityInitializer
+
+ openorb.home=resource:org/openorb/
+
+ </attribute>
+
+ </gbean>
+
+ <gbean name="openejb.CORBA:type=POA,domain=org/openejb/Itests"
class="org.openejb.corba.POABean">
+ <attribute name="POAName"
type="java.lang.String">org/openejb/POA</attribute>
+ <reference name="Server">openejb.CORBA:type=Server</reference>
+ <reference
name="Containers">geronimo.server:EJBModule=org/openejb/scenario001,*</reference>
+ </gbean>
</configuration>
