dain 2004/09/04 17:00:36
Modified: modules/assembly/src/plan default-database-plan.xml
j2ee-deployer-plan.xml j2ee-server-plan.xml
Log:
Consolidated all version numbers into etc/version-info.ent
Revision Changes Path
1.4 +4 -9 openejb/modules/assembly/src/plan/default-database-plan.xml
Index: default-database-plan.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/assembly/src/plan/default-database-plan.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- default-database-plan.xml 2 Sep 2004 01:46:00 -0000 1.3
+++ default-database-plan.xml 4 Sep 2004 21:00:36 -0000 1.4
@@ -6,24 +6,19 @@
parentId="org/apache/geronimo/Server">
<dependency>
- <uri>axion/jars/axion-1.0-M3-dev.jar</uri>
+ <uri>axion/jars/axion-${axion_version}.jar</uri>
</dependency>
- <!--used by geronimo directly
<dependency>
- <uri>commons-logging/jars/commons-logging-1.0.3.jar</uri>
- </dependency>-->
-
- <dependency>
- <uri>commons-collections/jars/commons-collections-2.1.jar</uri>
+
<uri>commons-collections/jars/commons-collections-${commons_collections_version}.jar</uri>
</dependency>
<dependency>
- <uri>commons-primitives/jars/commons-primitives-1.0.jar</uri>
+
<uri>commons-primitives/jars/commons-primitives-${commons_primitives_version}.jar</uri>
</dependency>
<dependency>
- <uri>regexp/jars/regexp-1.3.jar</uri>
+ <uri>regexp/jars/regexp-${regexp_version}.jar</uri>
</dependency>
<resourceadapter>
1.18 +13 -13 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- j2ee-deployer-plan.xml 6 Aug 2004 22:48:55 -0000 1.17
+++ j2ee-deployer-plan.xml 4 Sep 2004 21:00:36 -0000 1.18
@@ -28,45 +28,45 @@
>
<dependency>
- <uri>openejb/jars/openejb-core-2.0-SNAPSHOT.jar</uri>
+ <uri>openejb/jars/openejb-core-${openejb_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-connector-1.0-SNAPSHOT.jar</uri>
+ <uri>geronimo/jars/geronimo-connector-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-core-1.0-SNAPSHOT.jar</uri>
+ <uri>geronimo/jars/geronimo-core-${geronimo_version}.jar</uri>
</dependency>
<!-- needed to load some connector and core classes-->
<dependency>
- <uri>concurrent/jars/concurrent-1.3.4.jar</uri>
+ <uri>concurrent/jars/concurrent-${concurrent_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-j2ee-1.0-SNAPSHOT.jar</uri>
+ <uri>geronimo/jars/geronimo-j2ee-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-security-1.0-SNAPSHOT.jar</uri>
+ <uri>geronimo/jars/geronimo-security-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-naming-1.0-SNAPSHOT.jar</uri>
+ <uri>geronimo/jars/geronimo-naming-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-timer-1.0-SNAPSHOT.jar</uri>
+ <uri>geronimo/jars/geronimo-timer-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-transaction-1.0-SNAPSHOT.jar</uri>
+ <uri>geronimo/jars/geronimo-transaction-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo-spec/jars/geronimo-spec-j2eeschema-1.0-SNAPSHOT.jar</uri>
+ <uri>geronimo/jars/geronimo-j2ee-schema-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo-spec/jars/geronimo-spec-j2ee-1.4-rc2.jar</uri>
+
<uri>geronimo-spec/jars/geronimo-spec-j2ee-${geronimo_spec_j2ee_version}.jar</uri>
</dependency>
<!-- required for rar 1.5 to load realms -->
<dependency>
- <uri>regexp/jars/regexp-1.3.jar</uri>
+ <uri>regexp/jars/regexp-${regexp_version}.jar</uri>
</dependency>
<dependency>
- <uri>tranql/jars/tranql-1.0-SNAPSHOT.jar</uri>
+ <uri>tranql/jars/tranql-${tranql_version}.jar</uri>
</dependency>
<gbean
name="geronimo.deployment:role=Deployer,config=org/apache/geronimo/J2EEDeployer"
class="org.apache.geronimo.deployment.Deployer">
1.23 +20 -20 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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- j2ee-server-plan.xml 6 Aug 2004 22:48:55 -0000 1.22
+++ j2ee-server-plan.xml 4 Sep 2004 21:00:36 -0000 1.23
@@ -30,70 +30,70 @@
>
<dependency>
- <uri>geronimo-spec/jars/geronimo-spec-j2ee-1.4-rc2.jar</uri>
+
<uri>geronimo-spec/jars/geronimo-spec-j2ee-${geronimo_spec_j2ee_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-j2ee-1.0-SNAPSHOT.jar</uri>
+ <uri>geronimo/jars/geronimo-j2ee-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-core-1.0-SNAPSHOT.jar</uri>
+ <uri>geronimo/jars/geronimo-core-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-connector-1.0-SNAPSHOT.jar</uri>
+ <uri>geronimo/jars/geronimo-connector-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>concurrent/jars/concurrent-1.3.4.jar</uri>
+ <uri>concurrent/jars/concurrent-${concurrent_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-timer-1.0-SNAPSHOT.jar</uri>
+ <uri>geronimo/jars/geronimo-timer-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-transaction-1.0-SNAPSHOT.jar</uri>
+ <uri>geronimo/jars/geronimo-transaction-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-naming-1.0-SNAPSHOT.jar</uri>
+ <uri>geronimo/jars/geronimo-naming-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-security-1.0-SNAPSHOT.jar</uri>
+ <uri>geronimo/jars/geronimo-security-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>tranql/jars/tranql-1.0-SNAPSHOT.jar</uri>
+ <uri>tranql/jars/tranql-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>openejb/jars/openejb-core-2.0-SNAPSHOT.jar</uri>
+ <uri>openejb/jars/openejb-core-${openejb_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-jmxremoting-1.0-SNAPSHOT.jar</uri>
+ <uri>geronimo/jars/geronimo-jmxremoting-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>howl/jars/howl-logger-0.1.4.jar</uri>
+ <uri>howl/jars/howl-logger-${howl_version}.jar</uri>
</dependency>
<!-- required for rar 1.5 to load realms -->
<dependency>
- <uri>regexp/jars/regexp-1.3.jar</uri>
+ <uri>regexp/jars/regexp-${regexp_version}.jar</uri>
</dependency>
<!-- for timer serialization implementation -->
<dependency>
- <uri>xstream/jars/xstream-1.0.1.jar</uri>
+ <uri>xstream/jars/xstream-${xstream_version}.jar</uri>
</dependency>
<dependency>
- <uri>xpp3/jars/xpp3-1.1.3.3.jar</uri>
+ <uri>xpp3/jars/xpp3-${xpp3_version}.jar</uri>
</dependency>
<!-- needed for online deployment -->
<dependency>
- <uri>geronimo-spec/jars/geronimo-spec-j2eeschema-1.0-SNAPSHOT.jar</uri>
+ <uri>geronimo/jars/geronimo-j2ee-schema-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-deployment-1.0-SNAPSHOT.jar</uri>
+ <uri>geronimo/jars/geronimo-deployment-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-common-1.0-SNAPSHOT.jar</uri>
+ <uri>geronimo/jars/geronimo-common-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>xmlbeans/jars/xbean-apache-1.0-DEV.jar</uri>
+ <uri>xmlbeans/jars/xbean-apache-${xmlbeans_version}.jar</uri>
</dependency>
