You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by mp...@apache.org on 2001/12/06 23:48:05 UTC
cvs commit: jakarta-turbine-torque build-test.xml
mpoeschl 01/12/06 14:48:05
Modified: src/conf build-torque.xml build.xml
. build-test.xml
Log:
fix settings for TorqueDataSqlTask and add it to the testbed
thanks to Dan.Everton@Australia.Boeing.com
Revision Changes Path
1.13 +2 -1 jakarta-turbine-torque/src/conf/build-torque.xml
Index: build-torque.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/conf/build-torque.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build-torque.xml 2001/11/26 18:59:18 1.12
+++ build-torque.xml 2001/12/06 22:48:04 1.13
@@ -211,11 +211,12 @@
controlTemplate="${DataSQLControlTemplate}"
outputDirectory="${torque.home}/${outputDirectory}"
templatePath="${templatePath}"
- outputFile="report.${project}.datasql.generation"
+ outputFile="${project}-data.sql"
xmlFile="${torque.home}/${schemaDirectory}/${project}-schema.xml"
dataXmlFile="${torque.home}/${schemaDirectory}/${project}-data.xml"
dataDTD="${torque.home}/${schemaDirectory}/${project}-data.dtd"
targetDatabase="${database}"
+ sqldbmap="${basedir}/${outputDirectory}/sql/sqldb.map"
/>
</target>
1.20 +2 -1 jakarta-turbine-torque/src/conf/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/conf/build.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- build.xml 2001/11/26 18:59:18 1.19
+++ build.xml 2001/12/06 22:48:04 1.20
@@ -204,11 +204,12 @@
controlTemplate="${DataSQLControlTemplate}"
outputDirectory="${torque.home}/${outputDirectory}"
templatePath="${templatePath}"
- outputFile="report.${project}.datasql.generation"
+ outputFile="${project}-data.sql"
xmlFile="${torque.home}/${schemaDirectory}/${project}-schema.xml"
dataXmlFile="${torque.home}/${schemaDirectory}/${project}-data.xml"
dataDTD="${torque.home}/${schemaDirectory}/${project}-data.dtd"
targetDatabase="${database}"
+ sqldbmap="${basedir}/${outputDirectory}/sql/sqldb.map"
/>
</target>
1.20 +6 -2 jakarta-turbine-torque/build-test.xml
Index: build-test.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/build-test.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- build-test.xml 2001/11/23 14:57:51 1.19
+++ build-test.xml 2001/12/06 22:48:04 1.20
@@ -101,9 +101,7 @@
<antcall target="test-project-datadtd"/>
<antcall target="test-project-datadump"/>
- <!--
<antcall target="test-project-datasql"/>
- -->
<antcall target="test-project-jdbc"/>
<!--
@@ -193,6 +191,12 @@
<!-- Still uses ${project} references. BAD!!! -->
<target
name="test-project-datasql">
+ <copy
+ todir="${torque.distDir}/schema/"
+ file="${torque.distDir}/src/bookstore-data.dtd"/>
+ <copy
+ tofile="${torque.distDir}/schema/bookstore-data.xml"
+ file="${torque.distDir}/src/bookstore-bookstore-all-data.xml"/>
<ant
dir="${torque.buildFileDir}"
antfile="${torque.buildFile}"
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>