djencks 2004/11/09 20:34:59
Modified: modules/assembly/src/plan j2ee-deployer-plan.xml
j2ee-server-plan.xml
Log:
GERONIMO-402, 464. Split openejb and security deployment code into separate
modules
Revision Changes Path
1.27 +6 -0 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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- j2ee-deployer-plan.xml 7 Nov 2004 17:30:55 -0000 1.26
+++ j2ee-deployer-plan.xml 10 Nov 2004 01:34:59 -0000 1.27
@@ -43,6 +43,12 @@
<uri>geronimo/jars/geronimo-naming-builder-${geronimo_version}.jar</uri>
</dependency>
<dependency>
+
<uri>geronimo/jars/geronimo-security-builder-${geronimo_version}.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>openejb/jars/openejb-builder-${openejb_version}.jar</uri>
+ </dependency>
+ <dependency>
<uri>xmlbeans/jars/xbean-apache-${xmlbeans_version}.jar</uri>
</dependency>
1.34 +33 -27 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.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- j2ee-server-plan.xml 7 Nov 2004 17:30:55 -0000 1.33
+++ j2ee-server-plan.xml 10 Nov 2004 01:34:59 -0000 1.34
@@ -30,25 +30,31 @@
>
<!-- needed for online deployment -->
- <!-- should be removed once openejb gets a separate builder module-->
- <dependency>
-
<uri>geronimo/jars/geronimo-j2ee-schema-${geronimo_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>geronimo/jars/geronimo-deployment-${geronimo_version}.jar</uri>
- </dependency>
- <dependency>
-
<uri>geronimo/jars/geronimo-connector-builder-${geronimo_version}.jar</uri>
- </dependency>
- <dependency>
-
<uri>geronimo/jars/geronimo-j2ee-builder-${geronimo_version}.jar</uri>
- </dependency>
- <dependency>
-
<uri>geronimo/jars/geronimo-naming-builder-${geronimo_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>xmlbeans/jars/xbean-apache-${xmlbeans_version}.jar</uri>
- </dependency>
+ <!-- should be removed once openejb gets a separate builder module-->
+ <dependency>
+ <uri>geronimo/jars/geronimo-j2ee-schema-${geronimo_version}.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>geronimo/jars/geronimo-deployment-${geronimo_version}.jar</uri>
+ </dependency>
+ <dependency>
+
<uri>geronimo/jars/geronimo-connector-builder-${geronimo_version}.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>openejb/jars/openejb-builder-${openejb_version}.jar</uri>
+ </dependency>
+ <dependency>
+
<uri>geronimo/jars/geronimo-j2ee-builder-${geronimo_version}.jar</uri>
+ </dependency>
+ <dependency>
+
<uri>geronimo/jars/geronimo-naming-builder-${geronimo_version}.jar</uri>
+ </dependency>
+ <dependency>
+
<uri>geronimo/jars/geronimo-security-builder-${geronimo_version}.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>xmlbeans/jars/xbean-apache-${xmlbeans_version}.jar</uri>
+ </dependency>
<!--runtime dependencies-->
<dependency>
@@ -267,7 +273,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">
@@ -281,13 +287,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 -->
