maguro 2004/11/09 23:38:31
Modified: modules/assembly/src/plan j2ee-deployer-plan.xml
j2ee-server-plan.xml
Log:
Next step in CORBA skeleton generation.
Revision Changes Path
1.28 +2 -2 openejb/modules/assembly/src/plan/j2ee-deployer-plan.xml
Index: j2ee-deployer-plan.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/assembly/src/plan/j2ee-deployer-plan.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- j2ee-deployer-plan.xml 10 Nov 2004 01:34:59 -0000 1.27
+++ j2ee-deployer-plan.xml 10 Nov 2004 04:38:31 -0000 1.28
@@ -141,12 +141,12 @@
<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=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>
+ </gbean -->
</configuration>
1.35 +12 -9 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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- j2ee-server-plan.xml 10 Nov 2004 01:34:59 -0000 1.34
+++ j2ee-server-plan.xml 10 Nov 2004 04:38:31 -0000 1.35
@@ -134,6 +134,9 @@
<dependency>
<uri>avalon/jars/avalon-logkit-${avalon_logkit_version}.jar</uri>
</dependency>
+ <dependency>
+ <uri>ant/jars/ant-${ant_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">
@@ -273,7 +276,7 @@
<gbean
name="geronimo.deployer:role=ModuleBuilder,type=EJB,config=org/apache/geronimo/Server"
class="org.openejb.deployment.OpenEJBModuleBuilder">
<attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
- <!-- <reference
name="SkeletonGenerator">openejb.CORBA:type=SkeletonGenerator,vendor=OpenORB</reference>-->
+ <reference
name="SkeletonGenerator">openejb.CORBA:type=SkeletonGenerator,vendor=OpenORB</reference>>
</gbean>
<gbean
name="geronimo.deployer:role=ModuleBuilder,type=Connector,config=org/apache/geronimo/Server"
class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
@@ -287,13 +290,13 @@
</gbean>
<!-- these need names that include the parent id so they don't conflict
with the deployer namens-->
- <!-- <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>-->
+ <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>
<!-- end deployment block -->
@@ -310,7 +313,7 @@
org.omg.PortableInterceptor.ORBInitializerClass.org.openejb.corba.transaction.TransactionInitializer
org.omg.PortableInterceptor.ORBInitializerClass.org.openejb.corba.security.SecurityInitializer
- openorb.home=resource:org/openorb/
+ Zopenorb.home=resource:org/openorb/
</attribute>
