mpoeschl 2002/06/07 11:35:39
Modified: . build-test.xml build.xml
src/conf build-torque.xml build.properties
xdocs index.xml
Log:
patch by Stephen Haberman <[EMAIL PROTECTED]>
A summary of the changes I made:
build-test.xml - removed all references to -classpath targets and
instead when test-classpath is called, initially set the
useClasspath=true, then execute test as normal.
src/conf/build.torque.xml - removed all the -classpath targets and added
useClasspath="${useClasspath}" to each of the corresponding
non-classpath targets.
src/conf/build.properties - added the useClasspath property, defaulted
to false, along with a description of what it does.
build.xml - small change in the description of the test-classpath
target.
xdocs/index.xml - removed the wording about the -classpath targets on
the home page.
Revision Changes Path
1.30 +12 -122 jakarta-turbine-torque/build-test.xml
Index: build-test.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/build-test.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- build-test.xml 21 May 2002 19:51:44 -0000 1.29
+++ build-test.xml 7 Jun 2002 18:35:39 -0000 1.30
@@ -58,8 +58,8 @@
<target
name="test"
- depends="test-prepare"
description="run the testbed">
+ <antcall target="test-prepare"/>
<antcall target="test-pre-runtime"/>
<antcall target="test-runtime"/>
<antcall target="test-post-runtime"/>
@@ -67,11 +67,9 @@
<target
name="test-classpath"
- depends="test-prepare"
- description="run the testbed using the -classpath tasks">
- <antcall target="test-pre-runtime-classpath"/>
- <antcall target="test-runtime"/>
- <antcall target="test-post-runtime-classpath"/>
+ description="run the testbed using the useClasspath property">
+ <property name="useClasspath" value="true"/>
+ <antcall target="test"/>
</target>
<!-- ============================================================== -->
@@ -106,17 +104,6 @@
<antcall target="test-project-om"/>
</target>
- <target
- name="test-pre-runtime-classpath">
-
- <antcall target="test-project-doc-classpath"/>
- <antcall target="test-create-db-classpath"/>
- <antcall target="test-project-sql-classpath"/>
- <antcall target="test-id-table-init-sql-classpath"/>
- <antcall target="test-project-insert-sql"/>
- <antcall target="test-project-om-classpath"/>
- </target>
-
<!-- ============================================================== -->
<!-- P O S T R U N T I M E T E S T S -->
<!-- ============================================================== -->
@@ -138,22 +125,6 @@
</target>
<target
- name="test-post-runtime-classpath">
-
- <antcall target="test-project-datadtd-classpath"/>
- <antcall target="test-project-datadump-classpath"/>
- <antcall target="test-project-datasql-classpath"/>
- <antcall target="test-project-jdbc"/>
-
- <!--
- <antcall target="test-project-sql-classpath"/>
- <antcall target="test-project-om-classpath"/>
- <antcall target="test-project-sql2xml"/>
- -->
-
- </target>
-
- <target
name="test-project-sql">
<ant
dir="${torque.buildFileDir}"
@@ -163,15 +134,6 @@
</target>
<target
- name="test-project-sql-classpath">
- <ant
- dir="${torque.buildFileDir}"
- antfile="${torque.buildFile}"
- target="project-sql-classpath">
- </ant>
- </target>
-
- <target
name="test-id-table-init-sql">
<ant
dir="${torque.buildFileDir}"
@@ -181,15 +143,6 @@
</target>
<target
- name="test-id-table-init-sql-classpath">
- <ant
- dir="${torque.buildFileDir}"
- antfile="${torque.buildFile}"
- target="id-table-init-sql-classpath">
- </ant>
- </target>
-
- <target
name="test-project-doc">
<ant
dir="${torque.buildFileDir}"
@@ -199,15 +152,6 @@
</target>
<target
- name="test-project-doc-classpath">
- <ant
- dir="${torque.buildFileDir}"
- antfile="${torque.buildFile}"
- target="project-doc-classpath">
- </ant>
- </target>
-
- <target
name="test-create-db">
<ant
dir="${torque.buildFileDir}"
@@ -217,15 +161,6 @@
</target>
<target
- name="test-create-db-classpath">
- <ant
- dir="${torque.buildFileDir}"
- antfile="${torque.buildFile}"
- target="project-create-db-classpath">
- </ant>
- </target>
-
- <target
name="test-project-insert-sql">
<ant
dir="${torque.buildFileDir}"
@@ -250,22 +185,6 @@
</ant>
</target>
- <target
- name="test-project-om-classpath">
- <ant
- dir="${torque.buildFileDir}"
- antfile="${torque.buildFile}"
- target="project-om-classpath">
- </ant>
- <!-- Compile the classes -->
- <ant
- dir="${torque.buildFileDir}"
- antfile="${torque.buildFile}"
- target="compile"
- inheritAll="false">
- </ant>
- </target>
-
<!-- Still uses ${project} references. BAD!!! -->
<target
name="test-project-datadtd">
@@ -277,16 +196,6 @@
</ant>
</target>
- <target
- name="test-project-datadtd-classpath">
- <ant
- dir="${torque.buildFileDir}"
- antfile="${torque.buildFile}"
- target="project-datadtd-classpath"
- inheritAll="false">
- </ant>
- </target>
-
<!-- Still uses ${project} references. BAD!!! -->
<target
name="test-project-datadump">
@@ -298,16 +207,6 @@
</ant>
</target>
- <target
- name="test-project-datadump-classpath">
- <ant
- dir="${torque.buildFileDir}"
- antfile="${torque.buildFile}"
- target="project-datadump-classpath"
- inheritAll="false">
- </ant>
- </target>
-
<!-- Still uses ${project} references. BAD!!! -->
<target
name="test-project-datasql">
@@ -326,22 +225,6 @@
</target>
<target
- name="test-project-datasql-classpath">
- <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}"
- target="project-datasql-classpath"
- inheritAll="false">
- </ant>
- </target>
-
- <target
name="test-project-jdbc">
<ant
dir="${torque.buildFileDir}"
@@ -398,7 +281,7 @@
${commons-collections.jar}
${commons-configuration.jar}
${commons-jdbc2pool.jar}
- ${commons-lang.jar}
+ ${commons-lang.jar}
${commons-logging.jar}
${commons-pool.jar}
${jcs.jar}
@@ -454,9 +337,16 @@
<copy file="${xmlParserAPIs.jar}" todir="${test.libDir}"/>
</target>
+ <!-- copy templates if they are not loaded from the classpath -->
<target
name="test-templates">
+<!--
+ FIXME!!
+ the id-table-init-sql loads ${templatePath}/sql/id-table/project.props
+ so the templates must be copied for now
+ unless="useClasspath">
+-->
<copy todir="${test.templateDir}">
<fileset dir="${src.dir}/templates"/>
</copy>
1.51 +1 -1 jakarta-turbine-torque/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/build.xml,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- build.xml 2 Jun 2002 15:17:34 -0000 1.50
+++ build.xml 7 Jun 2002 18:35:39 -0000 1.51
@@ -27,7 +27,7 @@
<target
name="test-classpath"
depends="maven:jar"
- description="==> runtime tests using the -classpath tasks (set
torque.testProfile in your build.properties)">
+ description="==> runtime tests using useClasspath property (set
torque.testProfile in your build.properties)">
<ant antfile="build-test.xml"
target="test-classpath"/>
1.31 +11 -374 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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- build-torque.xml 10 May 2002 12:12:31 -0000 1.30
+++ build-torque.xml 7 Jun 2002 18:35:39 -0000 1.31
@@ -30,14 +30,6 @@
<antcall target="project-om"/>
</target>
- <target
- name="main-classpath"
- description="==> generates sql + om classes">
-
- <antcall target="project-sql-classpath"/>
- <antcall target="project-om-classpath"/>
- </target>
-
<!-- ================================================================ -->
<!-- G E N E R A T E P R O J E C T S Q L -->
<!-- ================================================================ -->
@@ -67,6 +59,7 @@
contextProperties="${build.properties}"
controlTemplate="${SQLControlTemplate}"
outputDirectory="${torque.home}/${outputDirectory}/sql"
+ useClasspath="${useClasspath}"
templatePath="${templatePath}"
basePathToDbProps="sql/base/"
sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
@@ -104,6 +97,7 @@
contextProperties="${build.properties}"
controlTemplate="${DocControlTemplate}"
outputDirectory="${torque.home}/${outputDirectory}/doc"
+ useClasspath="${useClasspath}"
outputFormat="${documentationFormat}"
templatePath="${templatePath}"
sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
@@ -135,6 +129,7 @@
<torque-create-db
controlTemplate="sql/db-init/Control.vm"
outputDirectory="${torque.home}/${outputDirectory}/sql"
+ useClasspath="${useClasspath}"
targetDatabase="${database}"
templatePath="${templatePath}"
outputFile="create-db.sql">
@@ -244,6 +239,7 @@
contextProperties="${build.properties}"
controlTemplate="${DataSQLControlTemplate}"
outputDirectory="${torque.home}/${outputDirectory}"
+ useClasspath="${useClasspath}"
templatePath="${templatePath}"
outputFile="${project}-data.sql"
xmlFile="${torque.home}/${schemaDirectory}/${project}-schema.xml"
@@ -277,10 +273,11 @@
<torque-sql
contextProperties="${templatePath}/sql/id-table/project.props"
controlTemplate="${idTableControlTemplate}"
- templatePath="${templatePath}"
suffix="-idtable-init"
sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
outputDirectory="${torque.home}/${outputDirectory}/sql"
+ useClasspath="${useClasspath}"
+ templatePath="${templatePath}"
outputFile="${database}-id-table-init.sql"
targetDatabase="${database}">
<fileset dir="${torque.home}/${schemaDirectory}">
@@ -316,6 +313,7 @@
contextProperties="${build.properties}"
controlTemplate="${DataDumpControlTemplate}"
outputDirectory="${torque.home}/${outputDirectory}"
+ useClasspath="${useClasspath}"
templatePath="${templatePath}"
outputFile="report.${project}.datadump.generation"
xmlFile="${torque.home}/${schemaDirectory}/${project}-schema.xml"
@@ -354,6 +352,7 @@
contextProperties="${build.properties}"
controlTemplate="${DataDTDControlTemplate}"
outputDirectory="${torque.home}/${outputDirectory}"
+ useClasspath="${useClasspath}"
templatePath="${templatePath}"
outputFile="report.${project}.datadtd.generation"
xmlFile="${torque.home}/${schemaDirectory}/${project}-schema.xml"
@@ -388,6 +387,7 @@
contextProperties="${build.properties}"
controlTemplate="${OMControlTemplate}"
outputDirectory="${torque.home}/${outputDirectory}/java"
+ useClasspath="${useClasspath}"
templatePath="${templatePath}"
outputFile="report.${project}.om.generation"
targetPackage="${targetPackage}.om"
@@ -399,311 +399,6 @@
</torque-om>
</target>
- <!-- ================================================================ -->
- <!-- G E N E R A T E P R O J E C T S Q L -->
- <!-- ================================================================ -->
- <!-- Generate the SQL for your project, these are in addition -->
- <!-- to the base Turbine tables! The tables you require for your -->
- <!-- project should be specified in project-schema.xml. -->
- <!-- ================================================================ -->
-
- <target
- name="project-sql-classpath"
- description="==> generates the SQL for your project">
-
- <echo message="+------------------------------------------+"/>
- <echo message="| |"/>
- <echo message="| Generating SQL for YOUR Turbine project! |"/>
- <echo message="| Woo hoo! |"/>
- <echo message="| |"/>
- <echo message="+------------------------------------------+"/>
-
- <taskdef
- name="torque-sql"
- classname="org.apache.torque.task.TorqueSQLTask">
- <classpath refid="torque-classpath"/>
- </taskdef>
-
- <torque-sql
- contextProperties="${build.properties}"
- controlTemplate="${SQLControlTemplate}"
- outputDirectory="${torque.home}/${outputDirectory}/sql"
- useClasspath="true"
- basePathToDbProps="sql/base/"
- sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
- outputFile="report.${project}.sql.generation"
- targetDatabase="${database}"
- idTableXMLFile="${idTableXMLFile}">
- <fileset dir="${torque.home}/${schemaDirectory}">
- <include name="*-schema.xml"/>
- </fileset>
- </torque-sql>
- </target>
-
- <!-- ================================================================ -->
- <!-- Generate SQL from XML data file -->
- <!-- ================================================================ -->
-
- <target
- name="project-datasql-classpath"
- description="==> generates sql from data xml">
-
- <echo message="+-----------------------------------------------+"/>
- <echo message="| |"/>
- <echo message="| Generating SQL from data XML ! |"/>
- <echo message="| Woo hoo! |"/>
- <echo message="| |"/>
- <echo message="+-----------------------------------------------+"/>
- <echo message=" taking build.properties from: ${build.properties}"/>
-
- <taskdef
- name="torque-datasql"
- classname="org.apache.torque.task.TorqueDataSQLTask">
- <classpath refid="torque-classpath"/>
- </taskdef>
-
- <torque-datasql
- contextProperties="${build.properties}"
- controlTemplate="${DataSQLControlTemplate}"
- outputDirectory="${torque.home}/${outputDirectory}"
- useClasspath="true"
- 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>
-
- <!-- ================================================================ -->
- <!-- G E N E R A T E P R O J E C T D A T A D T D -->
- <!-- ================================================================ -->
- <!-- Generate the DATA DTD for your project -->
- <!-- ================================================================ -->
-
- <target
- name="project-datadtd-classpath"
- description="==> generates the DATA DTD for your project">
-
- <echo message="+-----------------------------------------------+"/>
- <echo message="| |"/>
- <echo message="| Generating Data DTD for YOUR Turbine project! |"/>
- <echo message="| Woo hoo! |"/>
- <echo message="| |"/>
- <echo message="+-----------------------------------------------+"/>
-
- <taskdef
- name="torque-datadtd"
- classname="org.apache.torque.task.TorqueDataModelTask">
- <classpath refid="torque-classpath"/>
- </taskdef>
-
- <torque-datadtd
- contextProperties="${build.properties}"
- controlTemplate="${DataDTDControlTemplate}"
- outputDirectory="${torque.home}/${outputDirectory}"
- useClasspath="true"
- outputFile="report.${project}.datadtd.generation"
- xmlFile="${torque.home}/${schemaDirectory}/${project}-schema.xml"
- />
- </target>
-
- <!-- ================================================================ -->
- <!-- Dump data from database into xml file -->
- <!-- ================================================================ -->
-
- <target
- name="project-datadump-classpath"
- description="==> dump data from database into xml file">
-
- <echo message="+-----------------------------------------------+"/>
- <echo message="| |"/>
- <echo message="| Dumping the data from database into XML |"/>
- <echo message="| Woo hoo! |"/>
- <echo message="| |"/>
- <echo message="+-----------------------------------------------+"/>
- <echo message=" taking build.properties from: ${build.properties}"/>
-
- <taskdef
- name="torque-datadump"
- classname="org.apache.torque.task.TorqueDataDumpTask">
- <classpath refid="torque-classpath"/>
- </taskdef>
-
- <torque-datadump
- contextProperties="${build.properties}"
- controlTemplate="${DataDumpControlTemplate}"
- outputDirectory="${torque.home}/${outputDirectory}"
- useClasspath="true"
- outputFile="report.${project}.datadump.generation"
- xmlFile="${torque.home}/${schemaDirectory}/${project}-schema.xml"
- databaseDriver="${databaseDriver}"
- databaseUrl="${databaseUrl}"
- databaseUser="${databaseUser}"
- databasePassword="${databasePassword}"
- databaseName="${databaseName}"
- />
- </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. -->
- <!-- These are in addition to the base Turbine OM! -->
- <!-- ================================================================ -->
-
- <target
- name="project-om-classpath"
- description="==> generates the Peer-based object model for your project">
-
- <echo message="+------------------------------------------+"/>
- <echo message="| |"/>
- <echo message="| Generating Peer-based Object Model for |"/>
- <echo message="| YOUR Turbine project! Woo hoo! |"/>
- <echo message="| |"/>
- <echo message="+------------------------------------------+"/>
-
- <taskdef
- name="torque-om"
- classname="org.apache.torque.task.TorqueDataModelTask">
- <classpath refid="torque-classpath"/>
- </taskdef>
-
- <torque-om
- contextProperties="${build.properties}"
- controlTemplate="${OMControlTemplate}"
- outputDirectory="${torque.home}/${outputDirectory}/java"
- useClasspath="true"
- outputFile="report.${project}.om.generation"
- targetPackage="${targetPackage}.om"
- targetDatabase="${database}">
- <fileset dir="${torque.home}/${schemaDirectory}">
- <include name="*-schema.xml"/>
- <exclude name="id-table-schema.xml"/>
- </fileset>
- </torque-om>
- </target>
-
- <!-- ================================================================ -->
- <!-- C R E A T E T A R G E T D A T A B A S E -->
- <!-- ================================================================ -->
- <!-- Create the target database by executing a generated script -->
- <!-- that is capable of performing the task. -->
- <!-- ================================================================ -->
-
- <target
- name="project-create-db-classpath"
- unless="database.manual.creation"
- description="==> generates the target database">
-
- <taskdef
- name="torque-create-db"
- classname="org.apache.torque.task.TorqueDataModelTask">
- <classpath refid="torque-classpath"/>
- </taskdef>
-
- <echo>
- driver="${databaseDriver}"
- url="${createDatabaseUrl}"
- userid="${databaseUser}"
- password="${databasePassword}"
- </echo>
-
- <torque-create-db
- controlTemplate="sql/db-init/Control.vm"
- outputDirectory="${torque.home}/${outputDirectory}/sql"
- targetDatabase="${database}"
- useClasspath="true"
- outputFile="create-db.sql">
- <fileset dir="${torque.home}/${schemaDirectory}">
- <include name="*-schema.xml"/>
- </fileset>
- </torque-create-db>
-
- <sql
- driver="${databaseDriver}"
- url="${createDatabaseUrl}"
- userid="${databaseUser}"
- password="${databasePassword}"
- src="${torque.home}/${outputDirectory}/sql/create-db.sql"
- autocommit="true"
- onerror="continue">
- <classpath refid="torque-classpath"/>
- </sql>
- </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-classpath">
-
- <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="sql/id-table/project.props"
- controlTemplate="${idTableControlTemplate}"
- useClasspath="true"
- 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"/>
- <exclude name="id-table-schema.xml"/>
- </fileset>
- </torque-sql>
- </target>
-
- <!-- ================================================================ -->
- <!-- G E N E R A T E D O C S -->
- <!-- ================================================================ -->
-
- <target
- name="project-doc-classpath"
- description="==> generates documentation for your datamodel">
-
- <echo message="+------------------------------------------+"/>
- <echo message="| |"/>
- <echo message="| Generating docs for YOUR datamodel! |"/>
- <echo message="| Woo hoo! |"/>
- <echo message="| |"/>
- <echo message="+------------------------------------------+"/>
-
- <taskdef
- name="torque-doc"
- classname="org.apache.torque.task.TorqueDocumentationTask">
- <classpath refid="torque-classpath"/>
- </taskdef>
-
- <torque-doc
- contextProperties="${build.properties}"
- controlTemplate="${DocControlTemplate}"
- outputDirectory="${torque.home}/${outputDirectory}/doc"
- outputFormat="${documentationFormat}"
- useClasspath="true"
- sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
- outputFile="report.${project}.doc.generation">
- <fileset dir="${torque.home}/${schemaDirectory}">
- <include name="*-schema.xml"/>
- </fileset>
- </torque-doc>
- </target>
-
<!-- =================================================================== -->
<!-- C O M P I L E O M -->
<!-- =================================================================== -->
@@ -809,6 +504,7 @@
targetPackage="${targetPackage}.om"
targetDatabase="${database}"
outputDirectory="${torque.home}/${outputDirectory}/ojb"
+ useClasspath="${useClasspath}"
templatePath="${templatePath}"
sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
outputFile="report.${project}.ojb.generation">
@@ -819,36 +515,6 @@
</target>
<target
- name="project-ojb-repository-classpath">
-
- <echo message="+------------------------------------------+"/>
- <echo message="| |"/>
- <echo message="| Generating OJB repository |"/>
- <echo message="| |"/>
- <echo message="+------------------------------------------+"/>
-
- <taskdef
- name="ojb-repository"
- classname="org.apache.torque.task.TorqueDataModelTask">
- <classpath refid="torque-classpath"/>
- </taskdef>
-
- <ojb-repository
- contextProperties="${build.properties}"
- controlTemplate="ojb/repository/Control.vm"
- targetPackage="${targetPackage}.om"
- targetDatabase="${database}"
- outputDirectory="${torque.home}/${outputDirectory}/ojb"
- useClasspath="true"
- sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
- outputFile="report.${project}.ojb.generation">
- <fileset dir="${torque.home}/${schemaDirectory}">
- <include name="*-schema.xml"/>
- </fileset>
- </ojb-repository>
- </target>
-
- <target
name="project-ojb-model">
<echo message="+------------------------------------------+"/>
@@ -869,37 +535,8 @@
targetPackage="${targetPackage}.om"
targetDatabase="${database}"
outputDirectory="${torque.home}/${outputDirectory}/ojb"
+ useClasspath="${useClasspath}"
templatePath="${templatePath}"
- sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
- outputFile="report.${project}.ojb.generation">
- <fileset dir="${torque.home}/${schemaDirectory}">
- <include name="*-schema.xml"/>
- </fileset>
- </ojb-model>
- </target>
-
- <target
- name="project-ojb-model-classpath">
-
- <echo message="+------------------------------------------+"/>
- <echo message="| |"/>
- <echo message="| Generating OJB model |"/>
- <echo message="| |"/>
- <echo message="+------------------------------------------+"/>
-
- <taskdef
- name="ojb-model"
- classname="org.apache.torque.task.TorqueDataModelTask">
- <classpath refid="torque-classpath"/>
- </taskdef>
-
- <ojb-model
- contextProperties="${build.properties}"
- controlTemplate="ojb/model/Control.vm"
- targetPackage="${targetPackage}.om"
- targetDatabase="${database}"
- outputDirectory="${torque.home}/${outputDirectory}/ojb"
- useClasspath="true"
sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
outputFile="report.${project}.ojb.generation">
<fileset dir="${torque.home}/${schemaDirectory}">
1.15 +12 -8 jakarta-turbine-torque/src/conf/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/conf/build.properties,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build.properties 10 May 2002 00:42:52 -0000 1.14
+++ build.properties 7 Jun 2002 18:35:39 -0000 1.15
@@ -1,11 +1,11 @@
# -------------------------------------------------------------------
-#
+#
# T O R Q U E C O N F I G U R A T I O N F I L E
-#
+#
# -------------------------------------------------------------------
# -------------------------------------------------------------------
-#
+#
# T U R B I N E P R O J E C T
#
# -------------------------------------------------------------------
@@ -27,7 +27,7 @@
project = bookstore
# -------------------------------------------------------------------
-#
+#
# T A R G E T D A T A B A S E
#
# -------------------------------------------------------------------
@@ -68,6 +68,9 @@
# useManagers=Generate Manager classes that use JCS for caching. Still
# considered experimental.
#
+# useClasspath=true uses Velocity's classpath loader to retrieve the templates
+# from the classpath instead of off the hard drive.
+#
# overloadKeySetters=false prevents overloading of the setter method for
# primary/foreign keys. This is useful when working with broken
# JavaBean implementations.
@@ -82,6 +85,7 @@
addIntakeRetrievable=false
useManagers=false
overloadKeySetters=true
+useClasspath=false
# -------------------------------------------------------------------
#
@@ -122,7 +126,7 @@
# -------------------------------------------------------------------
# -------------------------------------------------------------------
-#
+#
# T E M P L A T E P A T H
#
# -------------------------------------------------------------------
@@ -130,7 +134,7 @@
templatePath = templates
# -------------------------------------------------------------------
-#
+#
# C O N T R O L T E M P L A T E S
#
# -------------------------------------------------------------------
@@ -144,7 +148,7 @@
DocControlTemplate = doc/Control.vm
# -------------------------------------------------------------------
-#
+#
# O U T P U T D I R E C T O R Y
#
# -------------------------------------------------------------------
@@ -152,7 +156,7 @@
outputDirectory=src
# -------------------------------------------------------------------
-#
+#
# S C H E M A D I R E C T O R Y
#
# -------------------------------------------------------------------
1.15 +9 -10 jakarta-turbine-torque/xdocs/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/xdocs/index.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- index.xml 10 May 2002 12:13:33 -0000 1.14
+++ index.xml 7 Jun 2002 18:35:39 -0000 1.15
@@ -34,39 +34,38 @@
<p>
Torque offers an <a href="http://jakarta.apache.org/ant";>Ant</a> build
file (<code>build-torque.xml</code>) which could be added to your
- project . It defines the following targets (-classpath targets load
- the templates from the torque.jar file):
+ project . It defines the following targets:
<ul>
<li>
- <strong>project-sql(-classpath)</strong><br/>
+ <strong>project-sql</strong><br/>
generates SQL source from an XML schema describing a database
structure
</li>
<p/>
<li>
- <strong>project-doc(-classpath)</strong><br/>
+ <strong>project-doc</strong><br/>
generates html or xml documentation for xml schemas
</li>
<p/>
<li>
- <strong>project-create-db(-classpath)</strong><br/>
+ <strong>project-create-db</strong><br/>
generates simple scripts for creating databases on various
platforms.
</li>
<p/>
<li>
- <strong>project-datadtd(-classpath)</strong><br/>
+ <strong>project-datadtd</strong><br/>
generates data DTD from an XML schema describing a database
structure
</li>
<p/>
<li>
- <strong>project-datadump(-classpath)</strong><br/>
+ <strong>project-datadump</strong><br/>
dumping data from db into XML
</li>
<p/>
<li>
- <strong>project-datasql(-classpath)</strong><br/>
+ <strong>project-datasql</strong><br/>
generates SQL source from an XML data file
</li>
<p/>
@@ -76,7 +75,7 @@
</li>
<p/>
<li>
- <strong>project-om(-classpath)</strong><br/>
+ <strong>project-om</strong><br/>
generates output by using Velocity
</li>
<p/>
@@ -92,7 +91,7 @@
</li>
<p/>
<li>
- <strong>id-table-init-sql(-classpath)</strong><br/>
+ <strong>id-table-init-sql</strong><br/>
generates the initialization sql for the id table
</li>
</ul>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
