dain 2004/09/02 22:48:14
Modified: etc maven.xml version-info.ent
modules/assembly maven.xml project.xml
modules/assembly/src/plan default-database-plan.xml
j2ee-deployer-plan.xml j2ee-secure-plan.xml
j2ee-server-plan.xml
Log:
Changed build to generate properties for versions declared in the
version-info.ent file and then use velocity to preprocess deployment plans
This lets us centeralize the remaining version data
Revision Changes Path
1.33 +19 -3 incubator-geronimo/etc/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/etc/maven.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- maven.xml 2 Sep 2004 03:02:16 -0000 1.32
+++ maven.xml 3 Sep 2004 05:48:14 -0000 1.33
@@ -41,6 +41,21 @@
<!-- expanded correctly when in the global.properties file -->
<j:set var="maven.war.final.name"
value="${pom.artifactId}-${pom.currentVersion}.war"/>
+ <!-- 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 -->
@@ -64,8 +79,9 @@
<ant:echo>
H E L L O
---------
- Module Name: ${pom.name}
- Version: ${pom.currentVersion}
+ Module Name ${pom.name} [${pom.currentVersion}]
+ Geronimo: ${geronimo_version}
+ OpenEJB: ${openejb_version}
</ant:echo>
</goal>
1.5 +1 -0 incubator-geronimo/etc/version-info.ent
Index: version-info.ent
===================================================================
RCS file: /home/cvs/incubator-geronimo/etc/version-info.ent,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- version-info.ent 2 Sep 2004 05:27:05 -0000 1.4
+++ version-info.ent 3 Sep 2004 05:48:14 -0000 1.5
@@ -31,6 +31,7 @@
<!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">
1.26 +27 -9 incubator-geronimo/modules/assembly/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/assembly/maven.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- maven.xml 25 Aug 2004 11:17:59 -0000 1.25
+++ maven.xml 3 Sep 2004 05:48:14 -0000 1.26
@@ -22,6 +22,7 @@
xmlns:j="jelly:core"
xmlns:ant="jelly:ant"
xmlns:define="jelly:define"
+ xmlns:velocity="jelly:velocity"
xmlns:bootstrap="geronimo:bootstrap">
<!-- ================= -->
@@ -83,7 +84,7 @@
<!-- Create directory for XML schema documents -->
<ant:mkdir dir="${distDir}/schema"/>
<ant:copy todir="${distDir}/schema" flatten="true">
- <ant:fileset dir="${project.root}/specs/schema">
+ <ant:fileset dir="${project.root}/modules/j2ee-schema">
<ant:include name="src/j2ee_1_4schema/*.xsd"/>
<ant:include name="src/j2ee_1_3dtd/*.dtd"/>
</ant:fileset>
@@ -160,6 +161,23 @@
<fileset dir="${project.root}" includes="*.txt,STATUS"/>
</ant:copy>
+ <!-- Preprocess all plans using velocity -->
+ <ant:mkdir dir="${basedir}/target/plan"/>
+ <fileScanner var="plans">
+ <fileset dir="${basedir}/src/plan">
+ <include name="*-plan.xml"/>
+ </fileset>
+ </fileScanner>
+
+ <j:forEach var="plan" items="${plans.iterator()}">
+ <j:set var="planName" value="${plan.name}"/>
+ <echo>Preprocessing ${planName}</echo>
+ <velocity:merge
+ basedir="${basedir}/src/plan"
+ template="${planName}"
+ name="${basedir}/target/plan/${planName}"/>
+ </j:forEach>
+
<!-- bootstrap the deployer -->
<ant:echo>Bootstrapping service deployer</ant:echo>
<ant:mkdir dir="${distDir}/bin"/>
@@ -176,8 +194,8 @@
deployerJar="${distDir}/bin/deployer.jar"
storeDir="${distDir}/config-store"
repositoryDir="${distDir}/repository"
- deployerSystemPlan="${basedir}/src/plan/deployer-system-plan.xml"
- j2eeDeployerPlan="${basedir}/src/plan/j2ee-deployer-plan.xml"
+
deployerSystemPlan="${basedir}/target/plan/deployer-system-plan.xml"
+ j2eeDeployerPlan="${basedir}/target/plan/j2ee-deployer-plan.xml"
deployerClassPath="${deploy.classpath}"
deployerGBean="geronimo.deployment:role=Deployer,config=org/apache/geronimo/J2EEDeployer"
deploymentFactory="org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryImpl"
@@ -190,7 +208,7 @@
<ant:jvmarg value="-ea"/>
<ant:arg value="--install"/>
<ant:arg value="--plan"/>
- <ant:arg value="src/plan/system-plan.xml"/>
+ <ant:arg value="target/plan/system-plan.xml"/>
<ant:arg value="--outfile"/>
<ant:arg value="${distDir}/bin/server.jar"/>
<ant:arg value="--mainClass"/>
@@ -206,7 +224,7 @@
<ant:jvmarg value="-ea"/>
<ant:arg value="--install"/>
<ant:arg value="--plan"/>
- <ant:arg value="src/plan/j2ee-server-plan.xml"/>
+ <ant:arg value="target/plan/j2ee-server-plan.xml"/>
</ant:java>
<!-- building tranql connector default database configuration-->
@@ -215,7 +233,7 @@
<ant:jvmarg value="-ea"/>
<ant:arg value="--install"/>
<ant:arg value="--plan"/>
- <ant:arg value="src/plan/default-database-plan.xml"/>
+ <ant:arg value="target/plan/default-database-plan.xml"/>
<ant:arg value="--module"/>
<ant:arg
value="${maven.repo.local}/tranql/rars/tranql-connector-SNAPSHOT.rar"/>
</ant:java>
@@ -226,7 +244,7 @@
<ant:jvmarg value="-ea"/>
<ant:arg value="--install"/>
<ant:arg value="--plan"/>
- <ant:arg value="src/plan/j2ee-secure-plan.xml"/>
+ <ant:arg value="target/plan/j2ee-secure-plan.xml"/>
</ant:java>
@@ -283,7 +301,7 @@
password="manager"
home="${basedir}"
module="${maven.repo.local}/tranql/rars/tranql-connector-SNAPSHOT.rar"
- plan="src/plan/default-database-plan.xml"
+ plan="target/plan/default-database-plan.xml"
/>
<deploy:start
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
1.43 +13 -1 incubator-geronimo/modules/assembly/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/assembly/project.xml,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- project.xml 2 Sep 2004 18:32:25 -0000 1.42
+++ project.xml 3 Sep 2004 05:48:14 -0000 1.43
@@ -45,6 +45,18 @@
<!-- ============ -->
<dependencies>
+ <!-- Used for preprocessing our plans -->
+ <dependency>
+ <groupId>commons-jelly</groupId>
+ <artifactId>commons-jelly-tags-velocity</artifactId>
+ <version>&jelly-velocity-tags-version;</version>
+ </dependency>
+ <dependency>
+ <groupId> velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>&velocity-version;</version>
+ </dependency>
+
<!-- ========================================================== -->
<!-- We use the follow properties in this build: -->
<!-- lib: copy dependency into lib -->
1.5 +22 -10
incubator-geronimo/modules/assembly/src/plan/default-database-plan.xml
Index: default-database-plan.xml
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/assembly/src/plan/default-database-plan.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- default-database-plan.xml 2 Sep 2004 01:07:49 -0000 1.4
+++ default-database-plan.xml 3 Sep 2004 05:48:14 -0000 1.5
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright 2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- $Revision$ $Date$ -->
<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee";
version="1.5"
@@ -6,24 +24,18 @@
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_logging_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.28 +15 -20
incubator-geronimo/modules/assembly/src/plan/j2ee-deployer-plan.xml
Index: j2ee-deployer-plan.xml
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/assembly/src/plan/j2ee-deployer-plan.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- j2ee-deployer-plan.xml 2 Sep 2004 06:25:09 -0000 1.27
+++ j2ee-deployer-plan.xml 3 Sep 2004 05:48:14 -0000 1.28
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE configuration [
-<!ENTITY version "1.0-SNAPSHOT">
-]>
<!--
Copyright 2004 The Apache Software Foundation
@@ -19,10 +16,10 @@
limitations under the License.
-->
+<!-- $Revision$ $Date$ -->
<!--
Configuration for the Geronimo deployer
-
-->
<configuration
xmlns="http://geronimo.apache.org/xml/ns/deployment";
@@ -30,52 +27,50 @@
parentId="org/apache/geronimo/DeployerSystem"
>
-
- <!-- TODO Use parsed entities for version numbers -->
<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-&version;.jar</uri>
+ <uri>geronimo/jars/geronimo-connector-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-core-&version;.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-&version;.jar</uri>
+ <uri>geronimo/jars/geronimo-j2ee-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-security-&version;.jar</uri>
+ <uri>geronimo/jars/geronimo-security-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-jetty-&version;.jar</uri>
+ <uri>geronimo/jars/geronimo-jetty-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-naming-&version;.jar</uri>
+ <uri>geronimo/jars/geronimo-naming-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-timer-&version;.jar</uri>
+ <uri>geronimo/jars/geronimo-timer-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-transaction-&version;.jar</uri>
+ <uri>geronimo/jars/geronimo-transaction-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-j2ee-schema-&version;.jar</uri>
+ <uri>geronimo/jars/geronimo-j2ee-schema-${geronimo_version}.jar</uri>
</dependency>
<!-- seems to be required to load jetty deployer - but I think this
should not be here-->
<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.6 +2 -4
incubator-geronimo/modules/assembly/src/plan/j2ee-secure-plan.xml
Index: j2ee-secure-plan.xml
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/assembly/src/plan/j2ee-secure-plan.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- j2ee-secure-plan.xml 29 Jul 2004 03:03:00 -0000 1.5
+++ j2ee-secure-plan.xml 3 Sep 2004 05:48:14 -0000 1.6
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE configuration [
-<!ENTITY version "1.0-SNAPSHOT">
-]>
<!--
Copyright 2004 The Apache Software Foundation
@@ -19,6 +16,7 @@
limitations under the License.
-->
+<!-- $Revision$ $Date$ -->
<!--
Configuration for the main ring of a Geronimo server.
@@ -33,7 +31,7 @@
>
<dependency>
- <uri>geronimo/jars/geronimo-jetty-&version;.jar</uri>
+ <uri>geronimo/jars/geronimo-jetty-${geronimo_version}.jar</uri>
</dependency>
<!-- Security GBeans -->
1.45 +22 -24
incubator-geronimo/modules/assembly/src/plan/j2ee-server-plan.xml
Index: j2ee-server-plan.xml
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/assembly/src/plan/j2ee-server-plan.xml,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- j2ee-server-plan.xml 2 Sep 2004 06:25:09 -0000 1.44
+++ j2ee-server-plan.xml 3 Sep 2004 05:48:14 -0000 1.45
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE configuration [
-<!ENTITY version "1.0-SNAPSHOT">
-]>
<!--
Copyright 2004 The Apache Software Foundation
@@ -19,6 +16,7 @@
limitations under the License.
-->
+<!-- $Revision$ $Date$ -->
<!--
Configuration for the main ring of a Geronimo server.
@@ -33,73 +31,73 @@
>
<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-&version;.jar</uri>
+ <uri>geronimo/jars/geronimo-j2ee-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-core-&version;.jar</uri>
+ <uri>geronimo/jars/geronimo-core-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-connector-&version;.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-&version;.jar</uri>
+ <uri>geronimo/jars/geronimo-timer-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-transaction-&version;.jar</uri>
+ <uri>geronimo/jars/geronimo-transaction-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-naming-&version;.jar</uri>
+ <uri>geronimo/jars/geronimo-naming-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-security-&version;.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-${tranql_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-jetty-&version;.jar</uri>
+ <uri>geronimo/jars/geronimo-jetty-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-jmxremoting-&version;.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/jars/geronimo-j2ee-schema-&version;.jar</uri>
+ <uri>geronimo/jars/geronimo-j2ee-schema-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-deployment-&version;.jar</uri>
+ <uri>geronimo/jars/geronimo-deployment-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-common-&version;.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>
