dain 2004/09/04 17:00:36
Modified: modules/assembly maven.xml project.xml
Added: modules/assembly locator.ent
Log:
Consolidated all version numbers into etc/version-info.ent
Revision Changes Path
1.9 +25 -7 openejb/modules/assembly/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/assembly/maven.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- maven.xml 19 Aug 2004 00:27:47 -0000 1.8
+++ maven.xml 4 Sep 2004 21:00:36 -0000 1.9
@@ -6,6 +6,7 @@
xmlns:j="jelly:core"
xmlns:ant="jelly:ant"
xmlns:define="jelly:define"
+ xmlns:velocity="jelly:velocity"
xmlns:bootstrap="geronimo:bootstrap">
<!-- ================= -->
@@ -109,6 +110,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"/>
@@ -125,8 +143,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"
@@ -139,7 +157,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"/>
@@ -155,7 +173,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-->
@@ -164,9 +182,9 @@
<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:arg
value="${maven.repo.local}/tranql/rars/tranql-connector-${tranql_connector_version}.rar"/>
</ant:java>
</goal>
1.20 +58 -50 openejb/modules/assembly/project.xml
Index: project.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/assembly/project.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- project.xml 4 Sep 2004 20:48:02 -0000 1.19
+++ project.xml 4 Sep 2004 21:00:36 -0000 1.20
@@ -1,5 +1,11 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+<!ENTITY % locator SYSTEM "file:locator.ent">
+%locator;
+%versions;
+ ]>
+
<!-- $Revision$ $Date$ -->
<project>
@@ -20,6 +26,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 -->
@@ -40,7 +58,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-common</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>&geronimo-version;</version>
<properties>
<lib>true</lib>
<deploy>true</deploy>
@@ -51,7 +69,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-connector</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>&geronimo-version;</version>
<properties>
<repository>true</repository>
</properties>
@@ -60,7 +78,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-core</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>&geronimo-version;</version>
<properties>
<lib>true</lib>
<server>true</server>
@@ -71,7 +89,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-deployment</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>&geronimo-version;</version>
<properties>
<lib>true</lib>
<deploy>true</deploy>
@@ -82,7 +100,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-j2ee</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>&geronimo-version;</version>
<properties>
<repository>true</repository>
</properties>
@@ -91,7 +109,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-jmxremoting</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>&geronimo-version;</version>
<properties>
<repository>true</repository>
</properties>
@@ -100,7 +118,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-kernel</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>&geronimo-version;</version>
<properties>
<lib>true</lib>
<server>true</server>
@@ -112,7 +130,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-naming</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>&geronimo-version;</version>
<properties>
<repository>true</repository>
</properties>
@@ -121,7 +139,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-remoting</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>&geronimo-version;</version>
<properties>
<repository>true</repository>
</properties>
@@ -130,7 +148,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-security</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>&geronimo-version;</version>
<properties>
<repository>true</repository>
</properties>
@@ -139,7 +157,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-system</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>&geronimo-version;</version>
<properties>
<lib>true</lib>
<server>true</server>
@@ -151,7 +169,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-timer</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>&geronimo-version;</version>
<properties>
<repository>true</repository>
</properties>
@@ -160,7 +178,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-transaction</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>&geronimo-version;</version>
<properties>
<repository>true</repository>
</properties>
@@ -169,7 +187,7 @@
<dependency>
<groupId>howl</groupId>
<artifactId>howl-logger</artifactId>
- <version>0.1.4</version>
+ <version>&howl-version;</version>
<url>http://forge.objectweb.org/projects/howl</url>
<properties>
<repository>true</repository>
@@ -179,7 +197,7 @@
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee</artifactId>
- <version>1.4-rc2</version>
+ <version>&geronimo-spec-j2ee-version;</version>
<properties>
<repository>true</repository>
</properties>
@@ -188,16 +206,16 @@
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee-deployment</artifactId>
- <version>1.1-rc2</version>
+ <version>&geronimo-spec-j2ee-deployment-version;</version>
<properties>
<clideployer>true</clideployer>
</properties>
</dependency>
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2eeschema</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-j2ee-schema</artifactId>
+ <version>&geronimo-version;</version>
<properties>
<repository>true</repository>
</properties>
@@ -206,14 +224,14 @@
<dependency>
<groupId>tranql</groupId>
<artifactId>tranql-connector</artifactId>
- <version>SNAPSHOT</version>
+ <version>&tranql-connector-version;</version>
<type>rar</type>
</dependency>
<dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
- <version>1.5</version>
+ <version>&ant-version;</version>
<properties>
<repository>true</repository>
</properties>
@@ -223,7 +241,7 @@
<dependency>
<groupId>xstream</groupId>
<artifactId>xstream</artifactId>
- <version>1.0.1</version>
+ <version>&xstream-version;</version>
<properties>
<repository>true</repository>
</properties>
@@ -236,7 +254,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>1.1.3.3</version>
+ <version>&xpp3-version;</version>
<properties>
<repository>true</repository>
</properties>
@@ -246,7 +264,7 @@
<dependency>
<groupId>axion</groupId>
<artifactId>axion</artifactId>
- <version>1.0-M3-dev</version>
+ <version>&axion-version;</version>
<properties>
<repository>true</repository>
</properties>
@@ -255,7 +273,7 @@
<dependency>
<groupId>castor</groupId>
<artifactId>castor</artifactId>
- <version>0.9.3.9</version>
+ <version>&castor-version;</version>
<properties>
<repository>true</repository>
</properties>
@@ -264,7 +282,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-full</artifactId>
- <version>2.0</version>
+ <version>&cglib-version;</version>
<url>http://cglib.sf.net/</url>
<properties>
<lib>true</lib>
@@ -276,7 +294,7 @@
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.0</version>
+ <version>&commons-cli-version;</version>
<url>http://jakarta.apache.org/commons/cli/</url>
<properties>
<lib>true</lib>
@@ -289,7 +307,7 @@
<!--axion only-->
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>2.1</version>
+ <version>&commons-collections-version;</version>
<properties>
<repository>true</repository>
</properties>
@@ -298,7 +316,7 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.0</version>
+ <version>&commons-fileupload-version;</version>
<properties>
<repository>true</repository>
</properties>
@@ -308,7 +326,7 @@
<!--axion-->
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.3</version>
+ <version>&commons-logging-version;</version>
<url>http://jakarta.apache.org/commons/logging/</url>
<properties>
<lib>true</lib>
@@ -321,7 +339,7 @@
<!--axion-->
<groupId>commons-primitives</groupId>
<artifactId>commons-primitives</artifactId>
- <version>1.0</version>
+ <version>&commons-primitives-version;</version>
<properties>
<repository>true</repository>
</properties>
@@ -330,7 +348,7 @@
<dependency>
<groupId>concurrent</groupId>
<artifactId>concurrent</artifactId>
- <version>1.3.4</version>
+ <version>&concurrent-version;</version>
<properties>
<lib>true</lib>
<server>true</server>
@@ -341,7 +359,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8</version>
+ <version>&junit-version;</version>
<properties>
<repository>true</repository>
</properties>
@@ -350,7 +368,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.8</version>
+ <version>&log4j-version;</version>
<url>http://jakarta.apache.org/log4j</url>
<properties>
<lib>true</lib>
@@ -362,7 +380,7 @@
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
- <version>2.0.1</version>
+ <version>&mx4j-version;</version>
<properties>
<lib>true</lib>
<server>true</server>
@@ -373,7 +391,7 @@
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-remote</artifactId>
- <version>2.0.1</version>
+ <version>&mx4j-version;</version>
<properties>
<lib>true</lib>
<server>true</server>
@@ -386,7 +404,7 @@
<!--axion-->
<groupId>regexp</groupId>
<artifactId>regexp</artifactId>
- <version>1.3</version>
+ <version>®exp-version;</version>
<properties>
<repository>true</repository>
</properties>
@@ -396,17 +414,7 @@
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.6.0</version>
- <properties>
- <lib>true</lib>
- <server>true</server>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- <version>2.2.1</version>
+ <version>&xerces-version;</version>
<properties>
<lib>true</lib>
<server>true</server>
@@ -416,7 +424,7 @@
<dependency>
<groupId>xmlbeans</groupId>
<artifactId>xbean-apache</artifactId>
- <version>1.0-DEV</version>
+ <version>&xmlbeans-version;</version>
<properties>
<lib>true</lib>
<deploy>true</deploy>
@@ -427,7 +435,7 @@
<dependency>
<groupId>tranql</groupId>
<artifactId>tranql</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>&tranql-version;</version>
<properties>
<repository>true</repository>
</properties>
1.1 openejb/modules/assembly/locator.ent
Index: locator.ent
===================================================================
<!ENTITY % versions SYSTEM "file:../../etc/version-info.ent">
