dain 2004/12/11 23:03:30
Modified: modules/assembly project.xml
Removed: modules/assembly locator.ent
Log:
Replaced xml parsed entities for dependency version numbers with
project.properties
Revision Changes Path
1.32 +60 -66 openejb/modules/assembly/project.xml
Index: project.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/assembly/project.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- project.xml 10 Dec 2004 00:40:31 -0000 1.31
+++ project.xml 12 Dec 2004 04:03:30 -0000 1.32
@@ -1,16 +1,10 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!ENTITY % locator SYSTEM "file:locator.ent">
-%locator;
-%versions;
- ]>
-
<!-- $Revision$ $Date$ -->
<project>
<pomVersion>3</pomVersion>
- <extend>${basedir}/../../etc/project.xml</extend>
+ <extend>../../etc/project.xml</extend>
<!-- ===================== -->
<!-- Module Identification -->
@@ -30,12 +24,12 @@
<dependency>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-velocity</artifactId>
- <version>&jelly-velocity-tags-version;</version>
+ <version>${jelly_velocity_tags_version}</version>
</dependency>
<dependency>
<groupId> velocity</groupId>
<artifactId>velocity</artifactId>
- <version>&velocity-version;</version>
+ <version>${velocity_version}</version>
</dependency>
<!-- ========================================================== -->
@@ -67,7 +61,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-common</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
<properties>
<lib>true</lib>
<deploy>true</deploy>
@@ -78,7 +72,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-connector</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
<properties>
<repository>true</repository>
</properties>
@@ -87,7 +81,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-connector-builder</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
<properties>
<repository>true</repository>
</properties>
@@ -96,7 +90,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-core</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
<properties>
<lib>true</lib>
<server>true</server>
@@ -108,7 +102,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-deployment</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
<properties>
<lib>true</lib>
<deploy>true</deploy>
@@ -119,7 +113,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-deploy-tool</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
<properties>
<lib>true</lib>
<deploy>true</deploy>
@@ -130,7 +124,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-derby</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
<properties>
<repository>true</repository>
</properties>
@@ -139,7 +133,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-derby-connector</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
<type>rar</type>
<properties>
<repository>true</repository>
@@ -149,7 +143,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-j2ee</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
<properties>
<repository>true</repository>
</properties>
@@ -158,7 +152,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-j2ee-builder</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
<properties>
<repository>true</repository>
</properties>
@@ -167,7 +161,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-jmxremoting</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
<properties>
<repository>true</repository>
</properties>
@@ -176,7 +170,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-kernel</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
<properties>
<lib>true</lib>
<server>true</server>
@@ -188,7 +182,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-naming</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
<properties>
<repository>true</repository>
</properties>
@@ -197,7 +191,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-naming-builder</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
<properties>
<repository>true</repository>
</properties>
@@ -206,7 +200,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-remoting</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
<properties>
<lib>true</lib>
<server>true</server>
@@ -218,7 +212,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-security</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
<properties>
<repository>true</repository>
</properties>
@@ -227,7 +221,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-security-builder</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
<properties>
<repository>true</repository>
</properties>
@@ -236,7 +230,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-service-builder</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
<properties>
<repository>true</repository>
</properties>
@@ -245,7 +239,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-system</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
<properties>
<lib>true</lib>
<server>true</server>
@@ -257,7 +251,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-timer</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
<properties>
<repository>true</repository>
</properties>
@@ -266,7 +260,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-transaction</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
<properties>
<repository>true</repository>
</properties>
@@ -275,7 +269,7 @@
<dependency>
<groupId>howl</groupId>
<artifactId>howl-logger</artifactId>
- <version>&howl-version;</version>
+ <version>${howl_version}</version>
<url>http://forge.objectweb.org/projects/howl</url>
<properties>
<repository>true</repository>
@@ -285,7 +279,7 @@
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee</artifactId>
- <version>&geronimo-spec-j2ee-version;</version>
+ <version>${geronimo_spec_j2ee_version}</version>
<properties>
<repository>true</repository>
</properties>
@@ -294,7 +288,7 @@
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee-deployment</artifactId>
- <version>&geronimo-spec-j2ee-deployment-version;</version>
+ <version>${geronimo_spec_j2ee_deployment_version}</version>
<properties>
<lib>true</lib>
<deploy>true</deploy>
@@ -305,7 +299,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-j2ee-schema</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
<properties>
<repository>true</repository>
</properties>
@@ -314,14 +308,14 @@
<dependency>
<groupId>tranql</groupId>
<artifactId>tranql-connector</artifactId>
- <version>&tranql-connector-version;</version>
+ <version>${tranql_connector_version}</version>
<type>rar</type>
</dependency>
<dependency>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
- <version>&antlr-version;</version>
+ <version>${antlr_version}</version>
<properties>
<repository>true</repository>
</properties>
@@ -330,7 +324,7 @@
<dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
- <version>&ant-version;</version>
+ <version>${ant_version}</version>
<properties>
<!-- lib>true</lib>
<deploy>true</deploy -->
@@ -342,7 +336,7 @@
<dependency>
<groupId>xstream</groupId>
<artifactId>xstream</artifactId>
- <version>&xstream-version;</version>
+ <version>${xstream_version}</version>
<properties>
<repository>true</repository>
</properties>
@@ -355,7 +349,7 @@
<artifactId>xpp3</artifactId>
<url>http://www.extreme.indiana.edu/xgws/xsoap/xpp</url>
<!-- can we get by with 1.1.3.3_min?-->
- <version>&xpp3-version;</version>
+ <version>${xpp3_version}</version>
<properties>
<repository>true</repository>
</properties>
@@ -365,7 +359,7 @@
<dependency>
<groupId>axion</groupId>
<artifactId>axion</artifactId>
- <version>&axion-version;</version>
+ <version>${axion_version}</version>
<properties>
<repository>true</repository>
</properties>
@@ -374,7 +368,7 @@
<dependency>
<groupId>castor</groupId>
<artifactId>castor</artifactId>
- <version>&castor-version;</version>
+ <version>${castor_version}</version>
<properties>
<repository>true</repository>
</properties>
@@ -383,7 +377,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-full</artifactId>
- <version>&cglib-version;</version>
+ <version>${cglib_version}</version>
<url>http://cglib.sf.net/</url>
<properties>
<lib>true</lib>
@@ -395,7 +389,7 @@
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>&commons-cli-version;</version>
+ <version>${commons_cli_version}</version>
<url>http://jakarta.apache.org/commons/cli/</url>
<properties>
<lib>true</lib>
@@ -408,7 +402,7 @@
<!--axion only-->
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>&commons-collections-version;</version>
+ <version>${commons_collections_version}</version>
<properties>
<repository>true</repository>
</properties>
@@ -417,7 +411,7 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>&commons-fileupload-version;</version>
+ <version>${commons_fileupload_version}</version>
<properties>
<repository>true</repository>
</properties>
@@ -427,7 +421,7 @@
<!--axion-->
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>&commons-logging-version;</version>
+ <version>${commons_logging_version}</version>
<url>http://jakarta.apache.org/commons/logging/</url>
<properties>
<lib>true</lib>
@@ -440,7 +434,7 @@
<!--axion-->
<groupId>commons-primitives</groupId>
<artifactId>commons-primitives</artifactId>
- <version>&commons-primitives-version;</version>
+ <version>${commons_primitives_version}</version>
<properties>
<repository>true</repository>
</properties>
@@ -449,7 +443,7 @@
<dependency>
<groupId>concurrent</groupId>
<artifactId>concurrent</artifactId>
- <version>&concurrent-version;</version>
+ <version>${concurrent_version}</version>
<properties>
<lib>true</lib>
<server>true</server>
@@ -461,7 +455,7 @@
<dependency>
<groupId>derby</groupId>
<artifactId>derby</artifactId>
- <version>&derby-version;</version>
+ <version>${derby_version}</version>
<properties>
<repository>true</repository>
</properties>
@@ -470,7 +464,7 @@
<dependency>
<groupId>derby</groupId>
<artifactId>derbynet</artifactId>
- <version>&derby-version;</version>
+ <version>${derby_version}</version>
<properties>
<repository>true</repository>
</properties>
@@ -479,7 +473,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>&junit-version;</version>
+ <version>${junit_version}</version>
<properties>
<repository>true</repository>
</properties>
@@ -488,7 +482,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>&log4j-version;</version>
+ <version>${log4j_version}</version>
<url>http://jakarta.apache.org/log4j</url>
<properties>
<lib>true</lib>
@@ -500,7 +494,7 @@
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
- <version>&mx4j-version;</version>
+ <version>${mx4j_version}</version>
<properties>
<lib>true</lib>
<server>true</server>
@@ -511,7 +505,7 @@
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-remote</artifactId>
- <version>&mx4j-version;</version>
+ <version>${mx4j_version}</version>
<properties>
<lib>true</lib>
<server>true</server>
@@ -524,7 +518,7 @@
<!--axion-->
<groupId>regexp</groupId>
<artifactId>regexp</artifactId>
- <version>®exp-version;</version>
+ <version>${regexp_version}</version>
<properties>
<repository>true</repository>
</properties>
@@ -534,7 +528,7 @@
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>&xerces-version;</version>
+ <version>${xerces_version}</version>
<properties>
<lib>true</lib>
<server>true</server>
@@ -544,7 +538,7 @@
<dependency>
<groupId>xmlbeans</groupId>
<artifactId>xbean-apache</artifactId>
- <version>&xmlbeans-version;</version>
+ <version>${xmlbeans_version}</version>
<properties>
<lib>true</lib>
<deploy>true</deploy>
@@ -555,7 +549,7 @@
<dependency>
<groupId>tranql</groupId>
<artifactId>tranql</artifactId>
- <version>&tranql-version;</version>
+ <version>${tranql_version}</version>
<properties>
<repository>true</repository>
</properties>
@@ -564,7 +558,7 @@
<dependency>
<groupId>openorb</groupId>
<artifactId>openorb-orb</artifactId>
- <version>&openorb-version;</version>
+ <version>${openorb_version}</version>
<properties>
<repository>true</repository>
</properties>
@@ -573,7 +567,7 @@
<dependency>
<groupId>openorb</groupId>
<artifactId>openorb-orb-omg</artifactId>
- <version>&openorb-version;</version>
+ <version>${openorb_version}</version>
<properties>
<repository>true</repository>
</properties>
@@ -582,7 +576,7 @@
<dependency>
<groupId>openorb</groupId>
<artifactId>openorb-orb-tools</artifactId>
- <version>&openorb-version;</version>
+ <version>${openorb_version}</version>
<properties>
<lib>true</lib>
<deploy>true</deploy>
@@ -593,7 +587,7 @@
<dependency>
<groupId>openorb</groupId>
<artifactId>openorb-tools</artifactId>
- <version>&openorb-version;</version>
+ <version>${openorb_version}</version>
<properties>
<repository>true</repository>
</properties>
@@ -602,7 +596,7 @@
<dependency>
<groupId>avalon</groupId>
<artifactId>avalon-framework</artifactId>
- <version>&avalon-framework-version;</version>
+ <version>${avalon_framework_version}</version>
<properties>
<repository>true</repository>
</properties>
@@ -611,7 +605,7 @@
<dependency>
<groupId>avalon</groupId>
<artifactId>avalon-logkit</artifactId>
- <version>&avalon-logkit-version;</version>
+ <version>${avalon_logkit_version}</version>
<properties>
<repository>true</repository>
</properties>
@@ -620,7 +614,7 @@
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
- <version>&xml-apis-version;</version>
+ <version>${xml_apis_version}</version>
<properties>
<lib>true</lib>
<server>true</server>
