stephenh 2002/10/01 09:29:35
Modified: . build-test.xml maven.xml
Log:
Added the token APPLICATION_ROOT since the Torque.properties is now being generated
straight from Torque.master.
Revision Changes Path
1.38 +2 -0 jakarta-turbine-torque/build-test.xml
Index: build-test.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/build-test.xml,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- build-test.xml 29 Sep 2002 03:25:25 -0000 1.37
+++ build-test.xml 1 Oct 2002 16:29:34 -0000 1.38
@@ -236,6 +236,7 @@
</target>
<target name="filterTokens">
+ <filter token="APPLICATION_ROOT" value="."/>
<filter token="DATABASE_DEFAULT" value="${torque.defaultDatabase}"/>
<filter token="DATABASE_URL" value="${torque.database.url}"/>
<filter token="DATABASE_USER" value="${torque.database.user}"/>
@@ -302,6 +303,7 @@
tofile="${build.test}/rttest/Torque.properties"
file="src/conf/master/Torque.master"
filtering="yes"
+ overwrite="yes"
/>
<!-- Runs the actual rttest tests -->
1.13 +2 -0 jakarta-turbine-torque/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/maven.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- maven.xml 29 Sep 2002 03:25:25 -0000 1.12
+++ maven.xml 1 Oct 2002 16:29:35 -0000 1.13
@@ -148,6 +148,7 @@
by each tester. -->
<echo message="Copying profile into distribution directory:
${torque.testProfile}"/>
+ <filter token="APPLICATION_ROOT" value="."/>
<filter token="DATABASE_DEFAULT" value="${torque.defaultDatabase}"/>
<filter token="DATABASE_URL" value="${torque.database.url}"/>
<filter token="DATABASE_USER" value="${torque.database.user}"/>
@@ -205,6 +206,7 @@
tofile="${build.test}/rttest/Torque.properties"
file="src/conf/master/Torque.master"
filtering="yes"
+ overwrite="yes"
/>
</goal>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
