dain 2004/12/11 23:03:31
Modified: modules/core project.xml
Removed: modules/core locator.ent
Log:
Replaced xml parsed entities for dependency version numbers with
project.properties
Revision Changes Path
1.34 +47 -53 openejb/modules/core/project.xml
Index: project.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/core/project.xml,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- project.xml 10 Nov 2004 01:34:59 -0000 1.33
+++ project.xml 12 Dec 2004 04:03:31 -0000 1.34
@@ -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 -->
@@ -33,7 +27,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-connector</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
<properties>
<runtime>true</runtime>
</properties>
@@ -42,7 +36,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-core</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
<properties>
<runtime>true</runtime>
</properties>
@@ -51,7 +45,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-client</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
<properties>
<runtime>true</runtime>
</properties>
@@ -59,7 +53,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-common</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
<properties>
<runtime>true</runtime>
</properties>
@@ -68,7 +62,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-deployment</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
<properties>
<runtime>true</runtime>
</properties>
@@ -77,7 +71,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-j2ee</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
<properties>
<runtime>true</runtime>
</properties>
@@ -86,7 +80,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-j2ee-builder</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
<properties>
<runtime>true</runtime>
</properties>
@@ -95,7 +89,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-kernel</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
<properties>
<runtime>true</runtime>
</properties>
@@ -104,7 +98,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-remoting</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
<properties>
<runtime>true</runtime>
</properties>
@@ -113,7 +107,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-security</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
<properties>
<runtime>true</runtime>
</properties>
@@ -122,7 +116,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-timer</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
<properties>
<runtime>true</runtime>
</properties>
@@ -131,7 +125,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-transaction</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
<properties>
<runtime>true</runtime>
</properties>
@@ -140,7 +134,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-naming</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
<properties>
<runtime>true</runtime>
</properties>
@@ -149,7 +143,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-naming-builder</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
<properties>
<runtime>true</runtime>
<xmlbeans>true</xmlbeans>
@@ -159,13 +153,13 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-system</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
</dependency>
<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>
<runtime>true</runtime>
</properties>
@@ -174,7 +168,7 @@
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-jta</artifactId>
- <version>&geronimo-spec-jta-version;</version>
+ <version>${geronimo_spec_jta_version}</version>
<properties>
<runtime>true</runtime>
</properties>
@@ -183,7 +177,7 @@
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-ejb</artifactId>
- <version>&geronimo-spec-ejb-version;</version>
+ <version>${geronimo_spec_ejb_version}</version>
<properties>
<runtime>true</runtime>
</properties>
@@ -192,7 +186,7 @@
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-servlet</artifactId>
- <version>&geronimo-spec-servlet-version;</version>
+ <version>${geronimo_spec_servlet_version}</version>
<properties>
<runtime>true</runtime>
</properties>
@@ -201,7 +195,7 @@
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee-connector</artifactId>
- <version>&geronimo-spec-j2ee-connector-version;</version>
+ <version>${geronimo_spec_j2ee_connector_version}</version>
<properties>
<runtime>true</runtime>
</properties>
@@ -210,7 +204,7 @@
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee-jacc</artifactId>
- <version>&geronimo-spec-j2ee-jacc-version;</version>
+ <version>${geronimo_spec_j2ee_jacc_version}</version>
<properties>
<runtime>true</runtime>
</properties>
@@ -219,7 +213,7 @@
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-jms</artifactId>
- <version>&geronimo-spec-jms-version;</version>
+ <version>${geronimo_spec_jms_version}</version>
<properties>
<runtime>true</runtime>
</properties>
@@ -228,7 +222,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-j2ee-schema</artifactId>
- <version>&geronimo-version;</version>
+ <version>${geronimo_version}</version>
<properties>
<xmlbeans>true</xmlbeans>
</properties>
@@ -237,7 +231,7 @@
<dependency>
<groupId>tranql</groupId>
<artifactId>tranql</artifactId>
- <version>&tranql-version;</version>
+ <version>${tranql_version}</version>
<properties>
<runtime>true</runtime>
</properties>
@@ -246,7 +240,7 @@
<dependency>
<groupId>axion</groupId>
<artifactId>axion</artifactId>
- <version>&axion-version;</version>
+ <version>${axion_version}</version>
<properties>
<runtime>true</runtime>
</properties>
@@ -255,7 +249,7 @@
<dependency>
<groupId>castor</groupId>
<artifactId>castor</artifactId>
- <version>&castor-version;</version>
+ <version>${castor_version}</version>
<url>http://www.castor.org</url>
<properties>
<runtime>true</runtime>
@@ -265,7 +259,7 @@
<dependency>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
- <version>&oro-version;</version>
+ <version>${oro_version}</version>
<properties>
<runtime>true</runtime>
</properties>
@@ -274,7 +268,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-full</artifactId>
- <version>&cglib-version;</version>
+ <version>${cglib_version}</version>
<url>http://cglib.sf.net</url>
<properties>
<runtime>true</runtime>
@@ -284,7 +278,7 @@
<dependency>
<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>
<runtime>true</runtime>
@@ -294,7 +288,7 @@
<dependency>
<groupId>commons-primitives</groupId>
<artifactId>commons-primitives</artifactId>
- <version>&commons-primitives-version;</version>
+ <version>${commons_primitives_version}</version>
<properties>
<runtime>true</runtime>
</properties>
@@ -303,7 +297,7 @@
<dependency>
<groupId>concurrent</groupId>
<artifactId>concurrent</artifactId>
- <version>&concurrent-version;</version>
+ <version>${concurrent_version}</version>
<properties>
<runtime>true</runtime>
</properties>
@@ -312,7 +306,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>&log4j-version;</version>
+ <version>${log4j_version}</version>
<url>http://jakarta.apache.org/log4j</url>
<properties>
<runtime>true</runtime>
@@ -322,7 +316,7 @@
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
- <version>&mx4j-version;</version>
+ <version>${mx4j_version}</version>
<properties>
<runtime>false</runtime>
</properties>
@@ -331,7 +325,7 @@
<dependency>
<groupId>regexp</groupId>
<artifactId>regexp</artifactId>
- <version>®exp-version;</version>
+ <version>${regexp_version}</version>
<properties>
<runtime>true</runtime>
</properties>
@@ -340,7 +334,7 @@
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>&xerces-version;</version>
+ <version>${xerces_version}</version>
<url>http://xml.apache.org</url>
<properties>
<runtime>true</runtime>
@@ -350,7 +344,7 @@
<dependency>
<groupId>xerces</groupId>
<artifactId>xmlParserAPIs</artifactId>
- <version>&xml-parser-apis-version;</version>
+ <version>${xml_parser_apis_version}</version>
<properties>
<lib>true</lib>
<server>true</server>
@@ -361,7 +355,7 @@
<dependency>
<groupId>openorb</groupId>
<artifactId>openorb-orb</artifactId>
- <version>&openorb-version;</version>
+ <version>${openorb_version}</version>
<properties>
<runtime>true</runtime>
</properties>
@@ -370,7 +364,7 @@
<dependency>
<groupId>openorb</groupId>
<artifactId>openorb-ins</artifactId>
- <version>&openorb-version;</version>
+ <version>${openorb_version}</version>
<properties>
<runtime>true</runtime>
</properties>
@@ -379,7 +373,7 @@
<dependency>
<groupId>openorb</groupId>
<artifactId>openorb-pss</artifactId>
- <version>&openorb-version;</version>
+ <version>${openorb_version}</version>
<properties>
<runtime>true</runtime>
</properties>
@@ -388,7 +382,7 @@
<dependency>
<groupId>openorb</groupId>
<artifactId>openorb-orb-tools</artifactId>
- <version>&openorb-version;</version>
+ <version>${openorb_version}</version>
<properties>
<runtime>true</runtime>
</properties>
@@ -397,7 +391,7 @@
<dependency>
<groupId>openorb</groupId>
<artifactId>openorb-orb-omg</artifactId>
- <version>&openorb-version;</version>
+ <version>${openorb_version}</version>
<properties>
<runtime>true</runtime>
</properties>
@@ -406,7 +400,7 @@
<dependency>
<groupId>openorb</groupId>
<artifactId>openorb-tools</artifactId>
- <version>&openorb-version;</version>
+ <version>${openorb_version}</version>
<properties>
<runtime>true</runtime>
</properties>
@@ -415,7 +409,7 @@
<dependency>
<groupId>avalon</groupId>
<artifactId>avalon-framework</artifactId>
- <version>&avalon-framework-version;</version>
+ <version>${avalon_framework_version}</version>
<properties>
<repository>true</repository>
</properties>
@@ -424,7 +418,7 @@
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>&commons-cli-version;</version>
+ <version>${commons_cli_version}</version>
<properties>
<runtime>true</runtime>
</properties>
@@ -442,7 +436,7 @@
<dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
- <version>&ant-version;</version>
+ <version>${ant_version}</version>
<properties>
<runtime>true</runtime>
</properties>
