stephenh 2002/09/27 19:47:23
Modified: . build-test.xml default.properties
Log:
Part of the patch by Scott Eade <[EMAIL PROTECTED]> to get build-torque.xml
working again (requires maven.home to be set).
Revision Changes Path
1.36 +25 -13 jakarta-turbine-torque/build-test.xml
Index: build-test.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/build-test.xml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- build-test.xml 14 Sep 2002 22:35:06 -0000 1.35
+++ build-test.xml 28 Sep 2002 02:47:23 -0000 1.36
@@ -237,10 +237,10 @@
<target name="filterTokens">
<filter token="DATABASE_DEFAULT" value="${torque.defaultDatabase}"/>
- <filter token="DATABASE_URL" value="${databaseUrl}"/>
- <filter token="DATABASE_USER" value="${databaseUser}"/>
- <filter token="DATABASE_DRIVER" value="${databaseDriver}"/>
- <filter token="DATABASE_PASSWORD" value="${databasePassword}"/>
+ <filter token="DATABASE_URL" value="${torque.database.url}"/>
+ <filter token="DATABASE_USER" value="${torque.database.user}"/>
+ <filter token="DATABASE_DRIVER" value="${torque.database.driver}"/>
+ <filter token="DATABASE_PASSWORD" value="${torque.database.password}"/>
<filter token="DATABASE_ID_METHOD" value="${torque.idMethod}"/>
<filter token="DATABASE_ADAPTER" value="${torque.database}"/>
</target>
@@ -304,11 +304,23 @@
filtering="yes"
/>
- <java
- classname="org.apache.torque.test.TorqueRunner">
- <arg value="${build.test}/rttest/Torque.properties"/>
- <classpath refid="classpath"/>
- </java>
+ <!-- Runs the actual rttest tests -->
+ <junit printsummary="no" haltonfailure="yes">
+ <classpath>
+ <pathelement location="${torque.destDir}"/>
+ <path refid="classpath"/>
+ </classpath>
+
+ <formatter type="plain" usefile="false"/>
+
+ <batchtest>
+ <fileset dir="${torque.destDir}">
+ <include name="**/*Test*.class"/>
+ <exclude name="**/BaseTestCase.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+
</target>
<target
@@ -364,11 +376,11 @@
<filter token="DATABASE_DEFAULT" value="${torque.sqlTest.defaultDatabase}"/>
<filter token="DATABASE_URL" value="${torque.sqlTest.databaseUrl}"/>
- <filter token="DATABASE_USER" value="${databaseUser}"/>
- <filter token="DATABASE_DRIVER" value="${databaseDriver}"/>
- <filter token="DATABASE_PASSWORD" value="${databasePassword}"/>
+ <filter token="DATABASE_USER" value="${torque.database.user}"/>
+ <filter token="DATABASE_DRIVER" value="${torque.database.driver}"/>
+ <filter token="DATABASE_PASSWORD" value="${torque.database.password}"/>
<filter token="DATABASE_ID_METHOD" value="${torque.idMethod}"/>
- <filter token="DATABASE_ADAPTER" value="${torque.databaseAdapter}"/>
+ <filter token="DATABASE_ADAPTER" value="${torque.database.adapter}"/>
<mkdir dir="${build.test}/sqltest"/>
1.42 +4 -3 jakarta-turbine-torque/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/default.properties,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- default.properties 27 Sep 2002 16:13:38 -0000 1.41
+++ default.properties 28 Sep 2002 02:47:23 -0000 1.42
@@ -17,9 +17,9 @@
build.dest = ${build.dir}/classes
build.test = ${build.dir}/test
src.dir = ./src
-test.dir = ${src.dir}/test
-test.libDir = ${build.test}/lib
-test.templateDir = ${build.test}/templates
+test.dir = ${src.dir}/rttest
+test.libDir = ${build.test}/rttest/lib
+test.templateDir = ${build.test}/rttest/templates
rttest.dir = ${src.dir}/rttest
# -------------------------------------------------------------------
@@ -31,6 +31,7 @@
torque.buildFileDir = ${torque.distDir}
torque.buildFile = build-torque.xml
torque.testSchema = src/rttest/bookstore-schema.xml
+lib.repo = ${maven.home}/repository
docs.src = ./xdocs
docs.dest = ./docs
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
