jvanzyl 01/11/14 18:47:29
Modified: . build-test.xml build.xml default.properties
profile jvz.mysql.profile
src/conf build-torque.xml build.xml
src/sqltest type-test-schema.xml
Log:
- the runtime tests are now independent of the distribution
- added the start of an sql testbed for making sure the sql generated
for each supported database is correct. i will steal the testbed in
velocity that is uses to test generated output. so far i've found
problems with primary keys. these are not automated yet but the
base is there.
- all the test classes are now in the org.apache.torque.test package
- tried to get rid of most of the ${project} references but there
are still some in the standard build file. my changes got nuked
when we started the testbed. all the targets should use <filesets>
now and not individual files.
Revision Changes Path
1.17 +103 -21 jakarta-turbine-torque/build-test.xml
Index: build-test.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/build-test.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build-test.xml 2001/11/12 20:14:56 1.16
+++ build-test.xml 2001/11/15 02:47:28 1.17
@@ -20,12 +20,7 @@
<target
name="test"
- depends="filterTokens">
-
- <copy
- todir="${torque.distDir}/lib"
- file="${torque.testDatabaseJar}"
- />
+ depends="filterTokens,test-libs,test-templates">
<!-- Use the profile as the build.properties file
in the dist directory so that it is customizable
@@ -54,6 +49,12 @@
<fileset dir="${rttest.dir}"/>
</copy>
+ <copy
+ tofile="${build.test}/rttest/build-torque.xml"
+ file="${src.dir}/conf/build-torque.xml"
+ overwrite="yes"
+ />
+
<antcall target="test-pre-runtime"/>
<antcall target="test-runtime"/>
<antcall target="test-post-runtime"/>
@@ -118,8 +119,7 @@
<ant
dir="${torque.buildFileDir}"
antfile="${torque.buildFile}"
- target="project-sql"
- inheritAll="false">
+ target="project-sql">
</ant>
</target>
@@ -128,8 +128,7 @@
<ant
dir="${torque.buildFileDir}"
antfile="${torque.buildFile}"
- target="id-table-init-sql"
- inheritAll="false">
+ target="id-table-init-sql">
</ant>
</target>
@@ -138,8 +137,7 @@
<ant
dir="${torque.buildFileDir}"
antfile="${torque.buildFile}"
- target="project-create-db"
- inheritAll="false">
+ target="project-create-db">
</ant>
</target>
@@ -148,8 +146,7 @@
<ant
dir="${torque.buildFileDir}"
antfile="${torque.buildFile}"
- target="project-insert-sql"
- inheritAll="false">
+ target="project-insert-sql">
</ant>
</target>
@@ -158,8 +155,7 @@
<ant
dir="${torque.buildFileDir}"
antfile="${torque.buildFile}"
- target="project-om"
- inheritAll="false">
+ target="project-om">
</ant>
<!-- Compile the classes -->
@@ -172,6 +168,7 @@
</ant>
</target>
+ <!-- Still uses ${project} references. BAD!!! -->
<target
name="test-project-datadtd">
<ant
@@ -182,6 +179,7 @@
</ant>
</target>
+ <!-- Still uses ${project} references. BAD!!! -->
<target
name="test-project-datadump">
<ant
@@ -192,6 +190,7 @@
</ant>
</target>
+ <!-- Still uses ${project} references. BAD!!! -->
<target
name="test-project-datasql">
<ant
@@ -207,8 +206,7 @@
<ant
dir="${torque.buildFileDir}"
antfile="${torque.buildFile}"
- target="project-jdbc"
- inheritAll="false">
+ target="project-jdbc">
<property name="torque.home" value="${torque.distDir}"/>
</ant>
</target>
@@ -268,17 +266,101 @@
<!-- Copy test Torque.properties -->
<copy
- todir="bin/torque/torque"
+ todir="${build.test}/rttest"
file="src/rttest/Torque.properties"
filtering="yes"
/>
<java
- classname="org.apache.torque.TorqueRunner"
+ classname="org.apache.torque.test.TorqueRunner"
fork="true">
- <arg value="bin/torque/torque/Torque.properties"/>
+ <arg value="${build.test}/rttest/Torque.properties"/>
<classpath refid="classpath"/>
</java>
+ </target>
+
+ <target
+ name="test-libs">
+
+ <mkdir dir="${test.libDir}"/>
+
+ <copy file="${velocity.jar}" todir="${test.libDir}"/>
+ <copy file="${logkit.jar}" todir="${test.libDir}"/>
+ <copy file="${xerces.jar}" todir="${test.libDir}"/>
+ <copy file="${village.jar}" todir="${test.libDir}"/>
+ <copy file="${log4j.jar}" todir="${test.libDir}"/>
+ <copy file="${commons-collections.jar}" todir="${test.libDir}"/>
+ <copy file="${commons-util.jar}" todir="${test.libDir}"/>
+ <copy file="${jdbc.jar}" todir="${test.libDir}"/>
+ <copy file="${build.dir}/${torque.jar}" todir="${test.libDir}"/>
+ <copy file="${torque.testDatabaseJar}" todir="${test.libDir}"/>
+
+ </target>
+
+ <target
+ name="test-templates">
+
+ <copy todir="${test.templateDir}">
+ <fileset dir="${src.dir}/templates"/>
+ </copy>
+
+ </target>
+
+ <!-- ============================================================== -->
+ <!-- S Q L T E S T S -->
+ <!-- ============================================================== -->
+
+ <target
+ name="test-sql"
+ depends="test-libs,test-templates">
+
+ <filter token="DATABASE_DEFAULT" value="${torque.sqlTest.defaultDatabase}"/>
+ <filter token="DATABASE_URL" value="${torqe.sqlTest.databaseUrl}"/>
+ <filter token="DATABASE_USER" value="${databaseUser}"/>
+ <filter token="DATABASE_DRIVER" value="${databaseDriver}"/>
+ <filter token="DATABASE_PASSWORD" value="${databasePassword}"/>
+ <filter token="DATABASE_ID_METHOD" value="${torque.idMethod}"/>
+ <filter token="DATABASE_ADAPTER" value="${torque.databaseAdapter}"/>
+
+ <mkdir dir="${build.test}/sqltest"/>
+
+ <copy
+ tofile="${build.test}/sqltest/build.properties"
+ file="${torque.testProfile}"
+ overwrite="yes"
+ />
+
+ <copy
+ tofile="${build.test}/sqltest/build-torque.xml"
+ file="${src.dir}/conf/build-torque.xml"
+ overwrite="yes"
+ />
+
+ <copy
+ todir="${build.test}/sqltest/schema"
+ file="${src.dir}/sqltest/type-test-schema.xml"
+ filtering="yes"
+ overwrite="yes"
+ />
+
+ <ant
+ dir="${build.test}/sqltest"
+ antfile="${torque.buildFile}"
+ target="project-create-db">
+ </ant>
+
+ <ant
+ dir="${build.test}/sqltest"
+ antfile="${torque.buildFile}"
+ target="project-sql">
+ </ant>
+
+ <ant
+ dir="${build.test}/sqltest"
+ antfile="${torque.buildFile}"
+ target="project-insert-sql">
+ </ant>
+
</target>
</project>
1.27 +1 -1 jakarta-turbine-torque/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/build.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- build.xml 2001/11/08 13:01:06 1.26
+++ build.xml 2001/11/15 02:47:28 1.27
@@ -57,7 +57,7 @@
<target
name="test"
- depends="dist"
+ depends="jar"
description="==> runtime tests (set torque.testProfile in your
build.properties)">
<ant antfile="build-test.xml"/>
1.11 +5 -2 jakarta-turbine-torque/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/default.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- default.properties 2001/11/08 13:01:06 1.10
+++ default.properties 2001/11/15 02:47:28 1.11
@@ -11,20 +11,23 @@
version = 1.0
package = org.apache.${project}
final.name = ${project}-${version}
+torque.jar = ${final.name}.jar
build.dir = ./bin
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
rttest.dir = ${src.dir}/rttest
# -------------------------------------------------------------------
# Standard Torque build file references used
# for testing.
# -------------------------------------------------------------------
-torque.distDir = bin/torque/torque
-torque.destDir = bin/torque/torque/bin/classes
+torque.distDir = ${build.test}/rttest
+torque.destDir = ${torque.distDir}/bin/classes
torque.buildFileDir = ${torque.distDir}
torque.buildFile = build-torque.xml
torque.testSchema = src/rttest/bookstore-schema.xml
1.3 +7 -2 jakarta-turbine-torque/profile/jvz.mysql.profile
Index: jvz.mysql.profile
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/profile/jvz.mysql.profile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jvz.mysql.profile 2001/11/05 23:45:08 1.2
+++ jvz.mysql.profile 2001/11/15 02:47:29 1.3
@@ -6,6 +6,11 @@
torque.defaultDatabase = bookstore
torque.databaseAdapter = DBMM
+torque.sqlTest.defaultDatabase = sqltest
+torque.sqlTest.databaseUrl = jdbc:mysql://localhost:3306/sqltest
+
+lib.dir = ../lib
+
# -------------------------------------------------------------------
#
# T O R Q U E C O N F I G U R A T I O N F I L E
@@ -41,7 +46,7 @@
# addIntakeRetrievable=implement Intake's Retrievable interface
# -------------------------------------------------------------------
-targetPackage=org.apache.torque
+targetPackage=org.apache.torque.test
basePrefix=Base
addSaveMethod=true
addGetByNameMethod=true
@@ -81,7 +86,7 @@
#
# -------------------------------------------------------------------
-templatePath = templates
+templatePath = ../templates
# -------------------------------------------------------------------
#
1.9 +61 -68 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build-torque.xml 2001/11/07 19:12:41 1.8
+++ build-torque.xml 2001/11/15 02:47:29 1.9
@@ -1,28 +1,17 @@
<project name="Torque" default="main" basedir=".">
<property name="torque.home" value="."/>
-
- <!-- Override this property if you build a "lite" distribution. -->
+ <property name="build.properties" value="build.properties"/>
+ <property file="${build.properties}"/>
<property name="lib.dir" value="lib"/>
-
+
<!-- Build classpath -->
- <path id="classpath">
+ <path id="torque-classpath">
<fileset dir="${lib.dir}">
<include name="**/*.jar"/>
</fileset>
- <fileset dir="lib">
- <include name="**/torque*.jar"/>
- </fileset>
</path>
- <!--
- Load the build.properties file. All the targets use the
- information stored in the properties file.
- -->
-
- <property name="build.properties" value="build.properties"/>
- <property file="${build.properties}"/>
-
<!-- ================================================================ -->
<!-- M A I N T A R G E T -->
<!-- ================================================================ -->
@@ -70,7 +59,7 @@
<taskdef
name="torque-sql"
classname="org.apache.torque.task.TorqueSQLTask">
- <classpath refid="classpath"/>
+ <classpath refid="torque-classpath"/>
</taskdef>
<torque-sql
@@ -103,7 +92,7 @@
<taskdef
name="torque-create-db"
classname="org.apache.torque.task.TorqueCreateDatabase">
- <classpath refid="classpath"/>
+ <classpath refid="torque-classpath"/>
</taskdef>
<torque-create-db
@@ -129,7 +118,7 @@
src="${torque.home}/${outputDirectory}/sql/create-db.sql"
autocommit="true"
onerror="continue">
- <classpath refid="classpath"/>
+ <classpath refid="torque-classpath"/>
</sql>
</target>
@@ -144,7 +133,7 @@
<taskdef
name="torque-insert-sql"
classname="org.apache.torque.task.TorqueSQLExec">
- <classpath refid="classpath"/>
+ <classpath refid="torque-classpath"/>
</taskdef>
<torque-insert-sql
@@ -156,7 +145,7 @@
onerror="continue"
sqldbmap="${basedir}/${outputDirectory}/sql/sqldb.map"
srcDir="${basedir}/${outputDirectory}/sql">
- <classpath refid="classpath"/>
+ <classpath refid="torque-classpath"/>
</torque-insert-sql>
</target>
@@ -174,7 +163,7 @@
<taskdef
name="torque-jdbc"
classname="org.apache.torque.task.TorqueJDBCTransformTask">
- <classpath refid="classpath"/>
+ <classpath refid="torque-classpath"/>
</taskdef>
<torque-jdbc
@@ -207,7 +196,7 @@
<taskdef
name="torque-datasql"
classname="org.apache.torque.task.TorqueDataSQLTask">
- <classpath refid="classpath"/>
+ <classpath refid="torque-classpath"/>
</taskdef>
<torque-datasql
@@ -225,6 +214,42 @@
</target>
<!-- ================================================================ -->
+ <!-- G E N E R A T E I D B R O K E R I N I T S Q L -->
+ <!-- ================================================================ -->
+
+ <target
+ name="id-table-init-sql">
+
+ <echo message="+------------------------------------------+"/>
+ <echo message="| |"/>
+ <echo message="| Generating initialization SQL |"/>
+ <echo message="| for ID Broker system! |"/>
+ <echo message="| |"/>
+ <echo message="+------------------------------------------+"/>
+
+ <taskdef
+ name="torque-sql"
+ classname="org.apache.torque.task.TorqueSQLTask">
+ <classpath refid="torque-classpath"/>
+ </taskdef>
+
+ <torque-sql
+ contextProperties="${templatePath}/sql/id-table/project.props"
+ controlTemplate="${idTableControlTemplate}"
+ templatePath="${templatePath}"
+ database="default"
+ suffix="-idtable-init"
+ sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
+ outputDirectory="${torque.home}/${outputDirectory}/sql"
+ outputFile="${database}-id-table-init.sql"
+ targetDatabase="${database}">
+ <fileset dir="${torque.home}/${schemaDirectory}">
+ <include name="*-schema.xml"/>
+ </fileset>
+ </torque-sql>
+ </target>
+
+ <!-- ================================================================ -->
<!-- Dump data from database into xml file -->
<!-- ================================================================ -->
@@ -243,7 +268,7 @@
<taskdef
name="torque-datadump"
classname="org.apache.torque.task.TorqueDataDumpTask">
- <classpath refid="classpath"/>
+ <classpath refid="torque-classpath"/>
</taskdef>
<torque-datadump
@@ -282,7 +307,7 @@
<taskdef
name="torque-datadtd"
classname="org.apache.torque.task.TorqueDataDTDTask">
- <classpath refid="classpath"/>
+ <classpath refid="torque-classpath"/>
</taskdef>
<torque-datadtd
@@ -318,7 +343,7 @@
<taskdef
name="torque-om"
classname="org.apache.torque.task.TorqueObjectModelTask">
- <classpath refid="classpath"/>
+ <classpath refid="torque-classpath"/>
</taskdef>
<torque-om
@@ -328,8 +353,12 @@
templatePath="${templatePath}"
outputFile="report.${project}.om.generation"
targetPackage="${targetPackage}.om"
- xmlFile="${torque.home}/${schemaDirectory}/${project}-schema.xml"
- />
+ targetDatabase="${database}">
+ <fileset dir="${torque.home}/${schemaDirectory}">
+ <include name="*-schema.xml"/>
+ <exclude name="id-table-schema.xml"/>
+ </fileset>
+ </torque-om>
</target>
@@ -354,7 +383,7 @@
<taskdef
name="torque-sql"
classname="org.apache.torque.task.TorqueSQLTask">
- <classpath refid="classpath"/>
+ <classpath refid="torque-classpath"/>
</taskdef>
<torque-sql
@@ -370,42 +399,6 @@
</target>
<!-- ================================================================ -->
- <!-- G E N E R A T E I D B R O K E R I N I T S Q L -->
- <!-- ================================================================ -->
-
- <target
- name="id-table-init-sql">
-
- <echo message="+------------------------------------------+"/>
- <echo message="| |"/>
- <echo message="| Generating initialization SQL |"/>
- <echo message="| for ID Broker system! |"/>
- <echo message="| |"/>
- <echo message="+------------------------------------------+"/>
-
- <taskdef
- name="torque-sql"
- classname="org.apache.torque.task.TorqueSQLTask">
- <classpath refid="classpath"/>
- </taskdef>
-
- <torque-sql
- contextProperties="${templatePath}/sql/id-table/project.props"
- controlTemplate="${idTableControlTemplate}"
- templatePath="${templatePath}"
- database="default"
- suffix="-idtable-init"
- sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
- outputDirectory="${torque.home}/${outputDirectory}/sql"
- outputFile="${database}-id-table-init.sql"
- xmlFile="${torque.home}/${schemaDirectory}/${project}-schema.xml"
- targetDatabase="${database}"
- />
-
- </target>
-
-
- <!-- ================================================================ -->
<!-- G E N E R A T E P R O J E C T P E E R B A S E D O M -->
<!-- ================================================================ -->
<!-- Generate the Peer-based object model for your project. -->
@@ -425,7 +418,7 @@
<taskdef
name="torque-om"
classname="org.apache.torque.task.TorqueObjectModelTask">
- <classpath refid="classpath"/>
+ <classpath refid="torque-classpath"/>
</taskdef>
<torque-om
@@ -467,7 +460,7 @@
debug="${debug}"
deprecation="${deprecation}"
optimize="${optimize}">
- <classpath refid="classpath"/>
+ <classpath refid="torque-classpath"/>
</javac>
</target>
@@ -488,7 +481,7 @@
<taskdef
name="sql-xml"
classname="org.apache.torque.task.TorqueSQLTransformTask">
- <classpath refid="classpath"/>
+ <classpath refid="torque-classpath"/>
</taskdef>
<sql-xml
@@ -515,7 +508,7 @@
private="true"
version="true"
use="true">
- <classpath refid="classpath"/>
+ <classpath refid="torque-classpath"/>
</javadoc>
</target>
1.17 +31 -39 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.xml 2001/11/07 19:12:41 1.16
+++ build.xml 2001/11/15 02:47:29 1.17
@@ -1,29 +1,17 @@
-
<project name="Torque" default="main" basedir=".">
<property name="torque.home" value="."/>
-
- <!-- Override this property if you build a "lite" distribution. -->
+ <property name="build.properties" value="build.properties"/>
+ <property file="${build.properties}"/>
<property name="lib.dir" value="lib"/>
-
+
<!-- Build classpath -->
- <path id="classpath">
+ <path id="torque-classpath">
<fileset dir="${lib.dir}">
<include name="**/*.jar"/>
</fileset>
- <fileset dir="lib">
- <include name="**/torque*.jar"/>
- </fileset>
</path>
- <!--
- Load the build.properties file. All the targets use the
- information stored in the properties file.
- -->
-
- <property name="build.properties" value="build.properties"/>
- <property file="${build.properties}"/>
-
<!-- ================================================================ -->
<!-- M A I N T A R G E T -->
<!-- ================================================================ -->
@@ -71,7 +59,7 @@
<taskdef
name="torque-sql"
classname="org.apache.torque.task.TorqueSQLTask">
- <classpath refid="classpath"/>
+ <classpath refid="torque-classpath"/>
</taskdef>
<torque-sql
@@ -104,7 +92,7 @@
<taskdef
name="torque-create-db"
classname="org.apache.torque.task.TorqueCreateDatabase">
- <classpath refid="classpath"/>
+ <classpath refid="torque-classpath"/>
</taskdef>
<torque-create-db
@@ -130,7 +118,7 @@
src="${torque.home}/${outputDirectory}/sql/create-db.sql"
autocommit="true"
onerror="continue">
- <classpath refid="classpath"/>
+ <classpath refid="torque-classpath"/>
</sql>
</target>
@@ -145,7 +133,7 @@
<taskdef
name="torque-insert-sql"
classname="org.apache.torque.task.TorqueSQLExec">
- <classpath refid="classpath"/>
+ <classpath refid="torque-classpath"/>
</taskdef>
<torque-insert-sql
@@ -157,7 +145,7 @@
onerror="continue"
sqldbmap="${basedir}/${outputDirectory}/sql/sqldb.map"
srcDir="${basedir}/${outputDirectory}/sql">
- <classpath refid="classpath"/>
+ <classpath refid="torque-classpath"/>
</torque-insert-sql>
</target>
@@ -175,7 +163,7 @@
<taskdef
name="torque-jdbc"
classname="org.apache.torque.task.TorqueJDBCTransformTask">
- <classpath refid="classpath"/>
+ <classpath refid="torque-classpath"/>
</taskdef>
<torque-jdbc
@@ -208,7 +196,7 @@
<taskdef
name="torque-datasql"
classname="org.apache.torque.task.TorqueDataSQLTask">
- <classpath refid="classpath"/>
+ <classpath refid="torque-classpath"/>
</taskdef>
<torque-datasql
@@ -242,7 +230,7 @@
<taskdef
name="torque-sql"
classname="org.apache.torque.task.TorqueSQLTask">
- <classpath refid="classpath"/>
+ <classpath refid="torque-classpath"/>
</taskdef>
<torque-sql
@@ -254,10 +242,11 @@
sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
outputDirectory="${torque.home}/${outputDirectory}/sql"
outputFile="${database}-id-table-init.sql"
- xmlFile="${torque.home}/${schemaDirectory}/${project}-schema.xml"
- targetDatabase="${database}"
- />
-
+ targetDatabase="${database}">
+ <fileset dir="${torque.home}/${schemaDirectory}">
+ <include name="*-schema.xml"/>
+ </fileset>
+ </torque-sql>
</target>
<!-- ================================================================ -->
@@ -279,7 +268,7 @@
<taskdef
name="torque-datadump"
classname="org.apache.torque.task.TorqueDataDumpTask">
- <classpath refid="classpath"/>
+ <classpath refid="torque-classpath"/>
</taskdef>
<torque-datadump
@@ -318,7 +307,7 @@
<taskdef
name="torque-datadtd"
classname="org.apache.torque.task.TorqueDataDTDTask">
- <classpath refid="classpath"/>
+ <classpath refid="torque-classpath"/>
</taskdef>
<torque-datadtd
@@ -354,7 +343,7 @@
<taskdef
name="torque-om"
classname="org.apache.torque.task.TorqueObjectModelTask">
- <classpath refid="classpath"/>
+ <classpath refid="torque-classpath"/>
</taskdef>
<torque-om
@@ -364,9 +353,12 @@
templatePath="${templatePath}"
outputFile="report.${project}.om.generation"
targetPackage="${targetPackage}.om"
- xmlFile="${torque.home}/${schemaDirectory}/${project}-schema.xml"
- targetDatabase="${database}"
- />
+ targetDatabase="${database}">
+ <fileset dir="${torque.home}/${schemaDirectory}">
+ <include name="*-schema.xml"/>
+ <exclude name="id-table-schema.xml"/>
+ </fileset>
+ </torque-om>
</target>
@@ -391,7 +383,7 @@
<taskdef
name="torque-sql"
classname="org.apache.torque.task.TorqueSQLTask">
- <classpath refid="classpath"/>
+ <classpath refid="torque-classpath"/>
</taskdef>
<torque-sql
@@ -426,7 +418,7 @@
<taskdef
name="torque-om"
classname="org.apache.torque.task.TorqueObjectModelTask">
- <classpath refid="classpath"/>
+ <classpath refid="torque-classpath"/>
</taskdef>
<torque-om
@@ -468,7 +460,7 @@
debug="${debug}"
deprecation="${deprecation}"
optimize="${optimize}">
- <classpath refid="classpath"/>
+ <classpath refid="torque-classpath"/>
</javac>
</target>
@@ -489,7 +481,7 @@
<taskdef
name="sql-xml"
classname="org.apache.torque.task.TorqueSQLTransformTask">
- <classpath refid="classpath"/>
+ <classpath refid="torque-classpath"/>
</taskdef>
<sql-xml
@@ -516,7 +508,7 @@
private="true"
version="true"
use="true">
- <classpath refid="classpath"/>
+ <classpath refid="torque-classpath"/>
</javadoc>
</target>
1.3 +1 -1 jakarta-turbine-torque/src/sqltest/type-test-schema.xml
Index: type-test-schema.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/sqltest/type-test-schema.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- type-test-schema.xml 2001/11/15 00:21:08 1.2
+++ type-test-schema.xml 2001/11/15 02:47:29 1.3
@@ -13,7 +13,7 @@
<table name="TYPES">
<column name="CHAR_TYPE" type="CHAR"/>
- <column name="VARCHAR_TYPE" type="VARCHAR"/>
+ <column name="VARCHAR_TYPE" size="100" type="VARCHAR"/>
<column name="INTEGER_TYPE" type="INTEGER"/>
<column name="DATE_TYPE" type="DATE"/>
<column name="TIME_TYPE" type="TIME"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
