djencks 2004/11/06 15:03:37
Modified: modules/assembly/src/plan j2ee-deployer-plan.xml
j2ee-server-plan.xml
Log:
GERONIMO-403/405/418 Split builders out of j2ee, naming, and jetty
Revision Changes Path
1.25 +19 -6 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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- j2ee-deployer-plan.xml 5 Nov 2004 23:41:42 -0000 1.24
+++ j2ee-deployer-plan.xml 6 Nov 2004 20:03:37 -0000 1.25
@@ -27,6 +27,25 @@
parentId="org/apache/geronimo/DeployerSystem"
>
+ <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>
+
<dependency>
<uri>openejb/jars/openejb-core-${openejb_version}.jar</uri>
</dependency>
@@ -34,9 +53,6 @@
<uri>geronimo/jars/geronimo-connector-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-connector-builder-${geronimo_version}.jar</uri>
- </dependency>
- <dependency>
<uri>geronimo/jars/geronimo-core-${geronimo_version}.jar</uri>
</dependency>
<!-- needed to load some connector and core classes-->
@@ -57,9 +73,6 @@
</dependency>
<dependency>
<uri>geronimo/jars/geronimo-transaction-${geronimo_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>geronimo/jars/geronimo-j2ee-schema-${geronimo_version}.jar</uri>
</dependency>
<dependency>
<uri>geronimo-spec/jars/geronimo-spec-j2ee-${geronimo_spec_j2ee_version}.jar</uri>
1.32 +22 -12 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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- j2ee-server-plan.xml 5 Nov 2004 23:41:42 -0000 1.31
+++ j2ee-server-plan.xml 6 Nov 2004 20:03:37 -0000 1.32
@@ -29,6 +29,28 @@
parentId="org/apache/geronimo/System"
>
+ <!-- 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>
+
+ <!--runtime dependencies-->
<dependency>
<uri>geronimo-spec/jars/geronimo-spec-j2ee-${geronimo_spec_j2ee_version}.jar</uri>
</dependency>
@@ -42,9 +64,6 @@
<uri>geronimo/jars/geronimo-connector-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-connector-builder-${geronimo_version}.jar</uri>
- </dependency>
- <dependency>
<uri>concurrent/jars/concurrent-${concurrent_version}.jar</uri>
</dependency>
<dependency>
@@ -87,16 +106,7 @@
<!-- needed for online deployment -->
<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-common-${geronimo_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>xmlbeans/jars/xbean-apache-${xmlbeans_version}.jar</uri>
</dependency>
<!-- CORBA -->
