dain 2004/09/04 17:00:36
Modified: etc maven.xml project.xml
Added: etc locator.ent version-info.ent
Log:
Consolidated all version numbers into etc/version-info.ent
Revision Changes Path
1.3 +18 -1 openejb/etc/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/etc/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 3 Apr 2004 22:20:10 -0000 1.2
+++ maven.xml 4 Sep 2004 21:00:36 -0000 1.3
@@ -20,6 +20,21 @@
<!-- Load the global properties -->
<ant:property file="${project.root}/etc/global.properties"/>
+ <!-- convert the version-info.ent into a properties file and load that file -->
+ <copy file="${project.root}/etc/version-info.ent"
tofile="${project.root}/etc/version-info.properties" overwrite="true"/>
+ <replaceregexp file="${project.root}/etc/version-info.properties"
+ match='<!ENTITY *(.*)-version *"(.*)">'
+ replace="\1_version=\2"
+ byline="true"/>
+ <replaceregexp file="${project.root}/etc/version-info.properties"
+ match="(..*)-(..*)-(..*).version=(.*)"
+ replace="\1_\2_\3_version=\4"
+ byline="true"/>
+ <replaceregexp file="${project.root}/etc/version-info.properties"
+ match="(..*)-(..*).version=(.*)"
+ replace="\1_\2_version=\3"
+ byline="true"/>
+ <ant:property file="${project.root}/etc/version-info.properties"/>
<!-- ==================== -->
<!-- Default Global Goals -->
@@ -44,6 +59,8 @@
H E L L O
---------
Module Name: ${pom.name}
+ OpenEJB: ${openejb_version}
+ Geronimo: ${geronimo_version}
</ant:echo>
</goal>
1.6 +8 -2 openejb/etc/project.xml
Index: project.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/etc/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 1 May 2004 06:40:42 -0000 1.5
+++ project.xml 4 Sep 2004 21:00:36 -0000 1.6
@@ -1,5 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project [
+<!ENTITY % locator SYSTEM "file:locator.ent">
+%locator;
+%versions;
+ ]>
+
<!-- $Revision$ $Date$ -->
<project>
@@ -61,7 +67,7 @@
<!-- Versions -->
<!-- ======== -->
- <currentVersion>2.0-SNAPSHOT</currentVersion>
+ <currentVersion>&openejb-version;</currentVersion>
<versions>
<version>
1.1 openejb/etc/locator.ent
Index: locator.ent
===================================================================
<!ENTITY % versions SYSTEM "file:version-info.ent">
1.1 openejb/etc/version-info.ent
Index: version-info.ent
===================================================================
<!ENTITY geronimo-version "1.0-SNAPSHOT">
<!ENTITY openejb-version "2.0-SNAPSHOT">
<!ENTITY tranql-version "1.0-SNAPSHOT">
<!ENTITY tranql-connector-version "SNAPSHOT">
<!ENTITY geronimo-spec-ejb-version "2.1-rc2">
<!ENTITY geronimo-spec-j2ee-version "1.4-rc2">
<!ENTITY geronimo-spec-j2ee-connector-version "1.5-rc2">
<!ENTITY geronimo-spec-j2ee-deployment-version "1.1-rc2">
<!ENTITY geronimo-spec-j2ee-jacc-version "1.0-rc2">
<!ENTITY geronimo-spec-j2ee-management-version "1.0-rc2">
<!ENTITY geronimo-spec-jms-version "1.1-rc2">
<!ENTITY geronimo-spec-jsp-version "2.0-rc2">
<!ENTITY geronimo-spec-jta-version "1.0.1B-rc2">
<!ENTITY geronimo-spec-servlet-version "2.4-rc2">
<!ENTITY ant-version "1.5">
<!ENTITY axion-version "1.0-M3-dev">
<!ENTITY axis-version "SNAPSHOT">
<!ENTITY cglib-version "2.0">
<!ENTITY castor-version "0.9.3.9">
<!ENTITY commons-cli-version "1.0">
<!ENTITY commons-collections-version "2.1">
<!ENTITY commons-el-version "1.0">
<!ENTITY commons-fileupload-version "1.0">
<!ENTITY commons-jxpath-version "1.1">
<!ENTITY commons-logging-version "1.0.3">
<!ENTITY commons-primitives-version "1.0">
<!ENTITY concurrent-version "1.3.4">
<!ENTITY dom4j-version "1.4">
<!ENTITY ews-version "SNAPSHOT">
<!ENTITY howl-version "0.1.4">
<!ENTITY hsqldb-version "1.7.1">
<!ENTITY jelly-velocity-tags-version "SNAPSHOT">
<!ENTITY jetty-version "5.0.RC0">
<!ENTITY jaxb-ri-version "SNAPSHOT">
<!ENTITY junit-version "3.8">
<!ENTITY log4j-version "1.2.8">
<!ENTITY mockobjects-version "0.09">
<!ENTITY mx4j-version "2.0.1">
<!ENTITY regexp-version "1.3">
<!ENTITY spring-version "1.0.1">
<!ENTITY tomcat-version "5.0.16">
<!ENTITY velocity-version "dep-1.4-rc1">
<!ENTITY xerces-version "2.6.0">
<!ENTITY xml-apis-version "1.0.b2">
<!ENTITY xml-resolver-version "1.1">
<!ENTITY xml-parser-apis-version "2.2.1">
<!ENTITY xmlbeans-version "1.0-DEV">
<!ENTITY xstream-version "1.0.1">
<!ENTITY xpp3-version "1.1.3.3">
