>
> http://jakarta.apache.org/site/source.html
>
Here are the diffs for the build.properties and build-torque.xml. I
modified the ones that came with 3.0-b2, then diffed them against the
current ones in the cvs src/conf dir. So they may not be perfect.
- Stephen
CVSROOT: :pserver:[EMAIL PROTECTED]:/home/cvspublic (password authentication)
TCL is *not* available, shell is disabled
Saved settings for C:\cvs successfully...
cvs diff build.properties (in directory C:\cvs\jakarta-turbine-torque\src\conf\)
Index: build.properties
===================================================================
RCS file: /home/cvspublic/jakarta-turbine-torque/src/conf/build.properties,v
retrieving revision 1.14
diff -r1.14 build.properties
27c27
< project = bookstore
---
> torque.project = bookstore
48c48
< database = postgresql
---
> torque.database = mysql
70,73d69
< #
< # overloadKeySetters=false prevents overloading of the setter method for
< # primary/foreign keys. This is useful when working with broken
< # JavaBean implementations.
76c72
< targetPackage=org.apache.torque
---
> torque.target.java.package=org.apache.torque.om
84d79
< overloadKeySetters=true
97,103c92,97
< createDatabaseUrl = jdbc:postgresql://127.0.0.1:5432/template1
< buildDatabaseUrl = jdbc:postgresql://127.0.0.1:5432/bookstore
< databaseUrl = jdbc:postgresql://127.0.0.1:5432/bookstore
< databaseDriver = org.postgresql.Driver
< databaseUser = jvanzyl
< databasePassword =
< databaseHost = 127.0.0.1
---
> torque.database.createUrl = jdbc:mysql://127.0.0.1:3306/
> torque.database.url = jdbc:mysql://localhost:3306/gdss
> torque.database.driver = org.gjt.mm.mysql.Driver
> torque.database.user = user
> torque.database.password = password
> torque.database.host = 127.0.0.1
107c101
< sameJavaName=false
---
> torque.sameJavaName = false
110,111c104,105
< #
< # D O C U M E N T A T I O N S E T T I N G S
---
> #
> # O U T P U T D I R E C T O R Y
114,118d107
< # These settings will allow you to customize the way your schema
< # documentation is created.
< # Valid formats are: html, anakia (for use with jakarta-site2)
< # -------------------------------------------------------------------
< documentationFormat=html
120,122c109,110
< # -------------------------------------------------------------------
< # You should NOT have to edit anything below here.
< # -------------------------------------------------------------------
---
> torque.target.sql.dir = src/sql
> torque.target.java.dir = src/java
126c114
< # T E M P L A T E P A T H
---
> # S C H E M A D I R E C T O R Y
130c118
< templatePath = templates
---
> torque.src.dir = schema
133,134d120
< #
< # C O N T R O L T E M P L A T E S
135a122,127
> # D O C U M E N T A T I O N S E T T I N G S
> #
> # -------------------------------------------------------------------
> # These settings will allow you to customize the way your schema
> # documentation is created.
> # Valid formats are: html, anakia (for use with jakarta-site2)
138,144c130,134
< SQLControlTemplate = sql/base/Control.vm
< OMControlTemplate = om/Control.vm
< idTableControlTemplate = sql/id-table/Control.vm
< DataDTDControlTemplate = data/Control.vm
< DataDumpControlTemplate = data/dump/Control.vm
< DataSQLControlTemplate = sql/load/Control.vm
< DocControlTemplate = doc/Control.vm
---
> torque.documentationFormat = html
>
> # -------------------------------------------------------------------
> # You should NOT have to edit anything below here.
> # -------------------------------------------------------------------
148c138
< # O U T P U T D I R E C T O R Y
---
> # T E M P L A T E P A T H
152c142
< outputDirectory=src
---
> torque.template.path = ${torque.home}/templates
156c146
< # S C H E M A D I R E C T O R Y
---
> # C O N T R O L T E M P L A T E S
160c150,156
< schemaDirectory=schema
---
> torque.template.SQLControl = sql/base/Control.vm
> torque.template.OMControl = om/Control.vm
> torque.template.idTableControl = sql/id-table/Control.vm
> torque.template.DataDTDControl = data/Control.vm
> torque.template.DataDumpControl = data/dump/Control.vm
> torque.template.DataSQLControl = sql/load/Control.vm
> torque.template.DocControl = doc/Control.vm
*****CVS exited normally with code 1*****
cvs diff build-torque.xml (in directory C:\cvs\jakarta-turbine-torque\src\conf\)
Index: build-torque.xml
===================================================================
RCS file: /home/cvspublic/jakarta-turbine-torque/src/conf/build-torque.xml,v
retrieving revision 1.30
diff -r1.30 build-torque.xml
3,7c3,6
< <property name="torque.home" value="."/>
< <property name="build.properties" value="build.properties"/>
< <property file="${build.properties}"/>
< <property name="lib.dir" value="lib"/>
< <property name="idTableXMLFile" value=""/>
---
> <property name="build.properties" value="${torque.home}/build.properties"/>
> <property file="${torque.home}/build.properties"/>
> <property name="torque.lib.dir" value="${torque.home}/lib"/>
> <property name="torque.idTableXMLFile" value=""/>
11c10
< <fileset dir="${lib.dir}">
---
> <fileset dir="${torque.lib.dir}">
29,38c28,29
< <antcall target="project-sql"/>
< <antcall target="project-om"/>
< </target>
<
< <target
< name="main-classpath"
< description="==> generates sql + om classes">
<
< <antcall target="project-sql-classpath"/>
< <antcall target="project-om-classpath"/>
---
> <antcall target="sql"/>
> <antcall target="om"/>
48a40,48
> <target name="sql-check"
> description="==> checks whether the sql needs executed">
> <uptodate
> property="torque.sql.uptodate"
> targetfile="${torque.target.sql.dir}/report.${torque.project}.sql.generation">
> <srcfiles dir="${torque.src.dir}" includes="*-schema.xml"/>
> </uptodate>
> </target>
>
50,51c50,53
< name="project-sql"
< description="==> generates the SQL for your project">
---
> name="sql"
> description="==> generates the SQL for your project"
> depends="sql-check"
> unless="torque.sql.uptodate">
68,76c70,78
< controlTemplate="${SQLControlTemplate}"
< outputDirectory="${torque.home}/${outputDirectory}/sql"
< templatePath="${templatePath}"
< basePathToDbProps="sql/base/"
< sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
< outputFile="report.${project}.sql.generation"
< targetDatabase="${database}"
< idTableXMLFile="${idTableXMLFile}">
< <fileset dir="${torque.home}/${schemaDirectory}">
---
> controlTemplate="${torque..template.SQLControl}"
> outputDirectory="${torque.target.sql.dir}"
> templatePath="${torque.template.path}"
> basePathToDbProps="${torque.template.path}/sql/base/"
> sqldbmap="${torque.target.sql.dir}/sqldb.map"
> outputFile="report.${torque.project}.sql.generation"
> targetDatabase="${torque.database}"
> idTableXMLFile="${torque.idTableXMLFile}">
> <fileset dir="${torque.src.dir}">
85a88,96
> <target name="doc-check"
> description="==> checks whether the doc needs executed">
> <uptodate
> property="torque.doc.uptodate"
> targetfile="${torque.target.sql.dir}/report.${torque.project}.doc.generation">
> <srcfiles dir="${torque.src.dir}" includes="*-schema.xml"/>
> </uptodate>
> </target>
>
87,88c98,101
< name="project-doc"
< description="==> generates documentation for your datamodel">
---
> name="doc"
> description="==> generates documentation for your datamodel"
> depends="doc-check"
> unless="torque.doc.update">
105,111c118,126
< controlTemplate="${DocControlTemplate}"
< outputDirectory="${torque.home}/${outputDirectory}/doc"
< outputFormat="${documentationFormat}"
< templatePath="${templatePath}"
< sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
< outputFile="report.${project}.doc.generation">
< <fileset dir="${torque.home}/${schemaDirectory}">
---
> controlTemplate="${torque.template.SQLControl}"
> outputDirectory="${torque.target.sql.dir}"
> templatePath="${torque.template.path}"
> basePathToDbProps="${torque.template.path}/sql/base/"
> sqldbmap="${torque.target.sql.dir}/sqldb.map"
> outputFile="report.${torque.project}.doc.generation"
> targetDatabase="${torque.database}"
> idTableXMLFile="${torque.idTableXMLFile}">
> <fileset dir="${torque.src.dir}">
125,126c140,141
< name="project-create-db"
< unless="database.manual.creation"
---
> name="create-db"
> unless="torque.database.manual.creation"
137,139c152,154
< outputDirectory="${torque.home}/${outputDirectory}/sql"
< targetDatabase="${database}"
< templatePath="${templatePath}"
---
> outputDirectory="${torque.target.sql.dir}"
> targetDatabase="${torque.database}"
> templatePath="${torque.template.path}"
141c156
< <fileset dir="${torque.home}/${schemaDirectory}">
---
> <fileset dir="${torque.src.dir}">
151,155c166,170
< driver="${databaseDriver}"
< url="${createDatabaseUrl}"
< userid="${databaseUser}"
< password="${databasePassword}"
< src="${torque.home}/${outputDirectory}/sql/create-db.sql"
---
> driver="${torque.database.driver}"
> url="${torque.database.createUrl}"
> userid="${torque.database.user}"
> password="${torque.database.password}"
> src="${torque.target.sql.dir}/create-db.sql"
167c182
< name="project-insert-sql">
---
> name="insert-sql">
176,179c191,194
< driver="${databaseDriver}"
< url="${buildDatabaseUrl}"
< userid="${databaseUser}"
< password="${databasePassword}"
---
> driver="${torque.database.driver}"
> url="${torque.database.url}"
> userid="${torque.database.user}"
> password="${torque.database.password}"
182,183c197,198
< sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
< srcDir="${torque.home}/${outputDirectory}/sql">
---
> sqldbmap="${torque.target.sql.dir}/sqldb.map"
> srcDir="${torque.target.sql.dir}">
193c208
< name="project-jdbc"
---
> name="jdbc"
211,214c226,229
< dbUrl="${databaseUrl}"
< dbDriver="${databaseDriver}"
< dbUser="${databaseUser}"
< dbPassword="${databasePassword}"
---
> dbUrl="${torque.database.url}"
> dbDriver="${torque.database.driver}"
> dbUser="${torque.database.user}"
> dbPassword="${torque.database.password}"
217c232
< sameJavaName="${sameJavaName}"
---
> sameJavaName="${torque.sameJavaName}"
226c241
< name="project-datasql"
---
> name="datasql"
245,253c260,268
< controlTemplate="${DataSQLControlTemplate}"
< outputDirectory="${torque.home}/${outputDirectory}"
< templatePath="${templatePath}"
< 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"
---
> controlTemplate="${torque.template.DataSQLControl}"
> outputDirectory="${torque.target.sql.dir}"
> templatePath="${torque.template.path}"
> outputFile="${torque.project}-data.sql"
> xmlFile="${torque.src.dir}/${torque.project}-schema.xml"
> dataXmlFile="${torque.target.sql.dir}/${torque.project}-data.xml"
> dataDTD="${torque.target.sql.dir}/${torque.project}-data.dtd"
> targetDatabase="${torque.database}"
> sqldbmap="${torque.target.sql.dir}/sqldb.map"
278,280c293,295
< contextProperties="${templatePath}/sql/id-table/project.props"
< controlTemplate="${idTableControlTemplate}"
< templatePath="${templatePath}"
---
> contextProperties="${torque.template.path}/sql/id-table/project.props"
> controlTemplate="${torque.template.idTableControl}"
> templatePath="${torque.template.path}"
282,286c297,301
< 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}">
---
> sqldbmap="${torque.target.sql.dir}/sqldb.map"
> outputDirectory="${torque.target.sql.dir}"
> outputFile="${torque.database}-id-table-init.sql"
> targetDatabase="${torque.database}">
> <fileset dir="${torque.src.dir}">
298c313
< name="project-datadump"
---
> name="datadump"
317,325c332,340
< controlTemplate="${DataDumpControlTemplate}"
< outputDirectory="${torque.home}/${outputDirectory}"
< templatePath="${templatePath}"
< outputFile="report.${project}.datadump.generation"
< xmlFile="${torque.home}/${schemaDirectory}/${project}-schema.xml"
< databaseDriver="${databaseDriver}"
< databaseUrl="${databaseUrl}"
< databaseUser="${databaseUser}"
< databasePassword="${databasePassword}"
---
> controlTemplate="${torque.template.DataDumpControl}"
> outputDirectory="${torque.target.sql.dir}"
> templatePath="${torque.template.path}"
> outputFile="report.${torque.project}.datadump.generation"
> xmlFile="${torque.src.dir}/${torque.project}-schema.xml"
> torque.database.driver="${torque.database.driver}"
> databaseUrl="${torque.database.url}"
> torque.database.user="${torque.database.user}"
> torque.database.password="${torque.database.password}"
337c352
< name="project-datadtd"
---
> name="datadtd"
355,359c370,374
< controlTemplate="${DataDTDControlTemplate}"
< outputDirectory="${torque.home}/${outputDirectory}"
< templatePath="${templatePath}"
< outputFile="report.${project}.datadtd.generation"
< xmlFile="${torque.home}/${schemaDirectory}/${project}-schema.xml"
---
> controlTemplate="${torque.template.DataDTDControl}"
> outputDirectory="${torque.target.sql.dir}"
> templatePath="${torque.template.path}"
> outputFile="report.${torque.project}.datadtd.generation"
> xmlFile="${torque.target.sql.dir}/${torque.project}-schema.xml"
370,399c385,391
< <target
< name="project-om"
< 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"
< templatePath="${templatePath}"
< 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 name="om-check"
> description="==> checks whether the om needs executed">
> <uptodate
> property="torque.om.uptodate"
> targetfile="${torque.target.java.dir}/report.${torque.project}.om.generation">
> <srcfiles dir="${torque.src.dir}" includes="*-schema.xml"/>
> </uptodate>
402,554d393
< <!-- ================================================================ -->
< <!-- 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! -->
< <!-- ================================================================ -->
557,558c396,399
< name="project-om-classpath"
< description="==> generates the Peer-based object model for your project">
---
> name="om"
> description="==> generates the Peer-based object model for your project"
> depends="om-check"
> unless="torque.om.uptodate">
575,581c416,422
< controlTemplate="${OMControlTemplate}"
< outputDirectory="${torque.home}/${outputDirectory}/java"
< useClasspath="true"
< outputFile="report.${project}.om.generation"
< targetPackage="${targetPackage}.om"
< targetDatabase="${database}">
< <fileset dir="${torque.home}/${schemaDirectory}">
---
> controlTemplate="${torque.template.OMControl}"
> outputDirectory="${torque.target.java.dir}"
> templatePath="${torque.template.path}"
> outputFile="report.${torque.project}.om.generation"
> targetPackage="${torque.target.java.package}"
> targetDatabase="${torque.database}">
> <fileset dir="${torque.src.dir}">
588,736d428
< <!-- ================================================================ -->
< <!-- 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 -->
< <!-- =================================================================== -->
<
< <target
< name="compile"
< description="==> compiles the OM classes">
<
< <!--
< This should be moved to the top of the file, and
< the values should come from the build.properties file.
< -->
<
< <property name="src.dir" value="${outputDirectory}/java"/>
< <property name="build.dest" value="bin/classes"/>
< <property name="debug" value="on"/>
< <property name="deprecation" value="off"/>
< <property name="optimize" value="off"/>
<
< <mkdir dir="${build.dest}"/>
<
< <javac srcdir="${src.dir}"
< destdir="${build.dest}"
< debug="${debug}"
< deprecation="${deprecation}"
< optimize="${optimize}">
< <classpath refid="torque-classpath"/>
< </javac>
< </target>
<
748c440
< name="project-sql2xml"
---
> name="sql2xml"
758,759c450,451
< inputFile="schema/schema.sql"
< outputFile="schema/schema.xml"
---
> inputFile="${torque.target.sql.dir}/schema.sql"
> outputFile="${torque.target.sql.dir}/schema.xml"
763,784d454
< <!-- ================================================================== -->
< <!-- J A V A D O C -->
< <!-- ================================================================== -->
<
< <target
< name="javadocs"
< description="==> generates the API documentation">
<
< <mkdir dir="${torque.home}/${outputDirectory}/javadoc"/>
<
< <javadoc
< sourcepath="${torque.home}/${outputDirectory}"
< packagenames="${targetPackage}.*"
< destdir="${outputDirectory}/javadoc"
< author="true"
< private="true"
< version="true"
< use="true">
< <classpath refid="torque-classpath"/>
< </javadoc>
< </target>
<
792,822c462
< name="project-ojb-repository">
<
< <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"
< 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-repository>
< </target>
<
< <target
< name="project-ojb-repository-classpath">
---
> name="ojb-repository">
839,845c479,485
< 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}">
---
> targetPackage="${torque.target.java.package}"
> targetDatabase="${torque.database}"
> outputDirectory="${torque.target.java.dir}/ojb"
> templatePath="${torque.template.path}"
> sqldbmap="${torque.target.sql.dir}/sqldb.map"
> outputFile="report.${torque.project}.ojb.generation">
> <fileset dir="${torque.src.dir}">
852c492
< name="project-ojb-model">
---
> name="ojb-model">
869,875c509,515
< targetPackage="${targetPackage}.om"
< targetDatabase="${database}"
< outputDirectory="${torque.home}/${outputDirectory}/ojb"
< templatePath="${templatePath}"
< sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
< outputFile="report.${project}.ojb.generation">
< <fileset dir="${torque.home}/${schemaDirectory}">
---
> targetPackage="${torque.target.java.package}"
> targetDatabase="${torque.database}"
> outputDirectory="${torque.target.java.dir}/ojb"
> templatePath="${torque.template.path}"
> sqldbmap="${torque.target.sql.dir}/sqldb.map"
> outputFile="report.${torque.project}.ojb.generation">
> <fileset dir="${torque.src.dir}">
880a521,525
> <!-- =================================================================== -->
> <!-- =================================================================== -->
> <!-- C L E A N T A R G E T -->
> <!-- =================================================================== -->
> <!-- =================================================================== -->
882c527,528
< name="project-ojb-model-classpath">
---
> name="clean"
> description="==> removes all Torque-generated files">
884,908d529
< <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}">
< <include name="*-schema.xml"/>
< </fileset>
< </ojb-model>
*****CVS exited normally with code 1*****
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
