mpoeschl 2003/07/21 01:21:56
Modified: . project.xml
Added: . maven.xml
Log:
switch to use maven (the old build system already used some old maven stuff and is
broken using a current maven version)
Revision Changes Path
1.12 +15 -0 jakarta-turbine-tdk/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/project.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- project.xml 21 Jul 2003 07:03:48 -0000 1.11
+++ project.xml 21 Jul 2003 08:21:56 -0000 1.12
@@ -129,9 +129,24 @@
<url>http://jakarta.apache.org/log4j/</url>
</dependency>
<dependency>
+ <id>mm-mysql</id>
+ <version>2.0.13-bin</version>
+ </dependency>
+ <dependency>
<id>stratum</id>
<version>1.0-b3</version>
<url>http://jakarta.apache.org/turbine/stratum/</url>
+ </dependency>
+ <dependency>
+ <id>torque</id>
+ <version>3.1-alpha2</version>
+ <url>http://db.apache.org/torque/</url>
+ </dependency>
+ <dependency>
+ <groupId>torque</groupId>
+ <artifactId>torque-gen</artifactId>
+ <version>3.1-alpha2</version>
+ <url>http://db.apache.org/torque/</url>
</dependency>
<dependency>
<id>velocity</id>
1.1 jakarta-turbine-tdk/maven.xml
Index: maven.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<project default="jar:jar"
xmlns:j="jelly:core"
xmlns:m="maven"
xmlns:ant="jelly:ant"
xmlns:deploy="deploy"
xmlns:u="jelly:util"
xmlns:maven="jelly:maven">
<property file="${user.home}/build.properties" />
<property file="build.properties" />
<property file="default.properties" />
<property file="${tdk.testProfile}"/>
<property file="src/database/${database}"/>
<!-- =================================================================== -->
<!-- T E S T D I S T R I B U T I O N -->
<!-- =================================================================== -->
<!-- This a fully functional TDK, but lacks all the documentation in -->
<!-- an attempt to keep the size down while testing. -->
<!-- =================================================================== -->
<goal name="test-dist"
description="--> generates the TDK without docs">
<delete dir="${tdk.target.dir}"/>
<mkdir dir="${tdk.root.dir}"/>
<copy todir="${tdk.share.dir}">
<fileset dir="${tdk.src}"/>
</copy>
<!-- We want to substitue the turbine version from the
specified profile. -->
<filter token="TURBINE_VERSION" value="${tdk.turbineVersion}"/>
<filter token="PROJECT" value="${tdk.project}"/>
<filter token="DATABASE" value="${database}"/>
<filter token="DATABASE_USER" value="${databaseUser}"/>
<filter token="DATABASE_PASSWORD" value="${databasePassword}"/>
<filter token="DATABASE_HOST" value="${databaseHost}"/>
<copy
todir="${tdk.share.dir}"
file="${tdk.src}/build.properties"
filtering="yes"
overwrite="yes"
/>
<!-- We need to move the build files up one directory -->
<move file="${tdk.share.dir}/build.properties" todir="${tdk.root.dir}"/>
<move file="${tdk.share.dir}/build.xml" todir="${tdk.root.dir}"/>
<move file="${tdk.share.dir}/GETTING_STARTED.txt" todir="${tdk.root.dir}"/>
<echo message="Servlet Container: ${tdk.servletContainer}"/>
<ant antfile="build-${tdk.servletContainer}.xml"/>
<deploy:copy-deps todir="${tdk.share.dir}/lib"/>
<ant antfile="build-turbine2.xml"/>
<!--
<ant antfile="build-turbine3.xml"/>
-->
<ant antfile="build-torque.xml"/>
</goal>
<!-- =================================================================== -->
<!-- P R O D U C T I O N D I S T R I B U T I O N -->
<!-- =================================================================== -->
<!-- This is a fully functional TDK distribution -->
<!-- =================================================================== -->
<goal name="production-dist"
prereqs="test-dist"
description="--> generates the full TDK distribution">
<attainGoal name="site:generate"/>
<ant antfile="build-${tdk.servletContainer}.xml" target="production-dist"/>
</goal>
<!-- =================================================================== -->
<!-- T E S T -->
<!-- =================================================================== -->
<!-- 1) Builds the TDK -->
<!-- 2) Generates the sample application -->
<!-- 3) Runs the "init" target in the sample app build.xml file -->
<!-- -->
<!-- Note: the ${build.properties} property is being set here because -->
<!-- Texen doesn't currently obey the ${basedir} property so running -->
<!-- the sample app "init" target from this directory without setting -->
<!-- ${build.properties} results in texen not processing the -->
<!-- contextProperties attribute correctly and the build will fail. -->
<!-- =================================================================== -->
<goal name="test" description="--> builds the tdk and sample app">
<echo>
database = ${database}
createDatabaseUrl = ${createDatabaseUrl}
buildDatabaseUrl = ${buildDatabaseUrl}
databaseUrl = ${databaseUrl}
</echo>
<attainGoal name="test-dist"/>
<ant:ant dir="${tdk.home}"/>
<ant:ant dir="${tdk.home}/webapps/${tdk.project}/WEB-INF/build" target="init">
<property name="build.properties"
value="${tdk.home}/webapps/${tdk.project}/WEB-INF/build/build.properties"/>
<property name="build.databaseUrl"
value="${test.databaseUrl}"/>
</ant:ant>
</goal>
<goal name="test-cvslayout">
<attainGoal name="test-dist"/>
<ant:ant dir="${tdk.home}" target="cvslayout"/>
<ant:ant dir="${tdk.home}/../${tdk.project}" target="init">
<property name="build.properties"
value="${tdk.home}/../${tdk.project}/build.properties"/>
<property name="build.databaseUrl"
value="${test.databaseUrl}"/>
</ant:ant>
</goal>
<goal name="test-deploy-container">
<attainGoal name="test-dist"/>
<ant:ant dir="${tdk.home}" target="cvslayout"/>
<ant:ant dir="${tdk.home}/../${tdk.project}" target="deploy-container">
<property name="build.properties"
value="${tdk.home}/../${tdk.project}/build.properties"/>
</ant:ant>
</goal>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
