Okay, for some stupid reason I assumed that the last standalone patch I
posted would work because it worked for my maven project. I ran into
some misc. problems today and in the process realized the patch probably
never worked for either non-classpath or non-maven project.
I've now tested it with/without maven and with/without the -classpath
targets. I'm humbly resubmitting it to the list if anyone like to try it
again (or for the first time).
If I'm not approaching it the right way, am missing something, or should
just stop trying altogether, let me know.
(Btw, rather than having targets for both classpath and non-classpath
tasks, wouldn't it be a heck of a lot easier to just have it be a
property in the build.properties and get rid of all the duplicate
targets?)
Thanks,
Stephen
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
2a3,15
> <property file="${user.home}/build.properties"/>
> <property name="torque.build.properties" value="build.properties"/>
> <property file="${torque.build.properties}"/>
>
> <!--
> The torque.home property can be over-ridden to point to a single
> Torque installation. Drop this build-torque.xml into each project's
> src tree, but then set torque.home = c:\\Java\\Apache\\torque-3.0-b2.
>
> Perhaps if torque.home="." we can detect whether to use classpath
> based on if a certain file is around (e.g. templates/om/Control.vm)
> and set a property instead of having separate targets.
> -->
4,6c17,29
< <property name="build.properties" value="build.properties"/>
< <property file="${build.properties}"/>
< <property name="lib.dir" value="lib"/>
---
> <property name="torque.project" value="${project}"/>
> <property name="torque.database" value="${database}"/>
> <property name="torque.outputDirectory" value="${torque.home}/${outputDirectory}"/>
> <property name="torque.schemaDirectory" value="${torque.home}/${schemaDirectory}"/>
> <property name="torque.target.java.dir" value="${torque.outputDirectory}/java"/>
> <property name="torque.target.sql.dir" value="${torque.outputDirectory}/sql"/>
> <property name="torque.target.doc.dir" value="${torque.outputDirectory}/doc"/>
> <property name="torque.target.javadoc.dir"
>value="${torque.outputDirectory}/javadoc"/>
> <property name="torque.target.ojb.dir" value="${torque.outputDirectory}/ojb"/>
> <property name="torque.target.build.dir" value="${torque.home}/bin/classes"/>
> <property name="torque.templatePath" value="${torque.home}/templates"/>
> <property name="torque.documentationFormat" value="${documentationFormat}"/>
> <property name="torque.lib.dir" value="lib"/>
11,13c34,46
< <fileset dir="${lib.dir}">
< <include name="**/*.jar"/>
< </fileset>
---
> <pathelement location="${torque.lib.dir}/commons-collections.jar"/>
> <pathelement location="${torque.lib.dir}/commons-configuration-1.0-dev.jar"/>
> <pathelement location="${torque.lib.dir}/commons-lang-0.1-dev.jar"/>
> <pathelement location="${torque.lib.dir}/commons-pool.jar"/>
> <pathelement location="${torque.lib.dir}/jcs-1.0-dev.jar"/>
> <pathelement location="${torque.lib.dir}/jdbc2_0-stdext.jar"/>
> <pathelement location="${torque.lib.dir}/log4j-1.1.3.jar"/>
> <pathelement location="${torque.lib.dir}/stratum-1.0-b2-dev.jar"/>
> <pathelement location="${torque.lib.dir}/torque-3.0-b2.jar"/>
> <pathelement location="${torque.lib.dir}/velocity-1.3-rc1.jar"/>
> <pathelement location="${torque.lib.dir}/village-1.5.3.jar"/>
> <pathelement location="${torque.lib.dir}/xercesImpl-2.0.0.jar"/>
> <pathelement location="${torque.lib.dir}/xmlParserAPIs-2.0.0.jar"/>
67c100
< contextProperties="${build.properties}"
---
> contextProperties="${torque.build.properties}"
69,70c102,103
< outputDirectory="${torque.home}/${outputDirectory}/sql"
< templatePath="${templatePath}"
---
> outputDirectory="${torque.target.sql.dir}"
> templatePath="${torque.templatePath}"
72,74c105,107
< sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
< outputFile="report.${project}.sql.generation"
< targetDatabase="${database}"
---
> sqldbmap="${torque.target.sql.dir}/sqldb.map"
> outputFile="report.${torque.project}.sql.generation"
> targetDatabase="${torque.database}"
76c109
< <fileset dir="${torque.home}/${schemaDirectory}">
---
> <fileset dir="${torque.schemaDirectory}">
104c137
< contextProperties="${build.properties}"
---
> contextProperties="${torque.build.properties}"
106,111c139,144
< 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}">
---
> outputDirectory="${torque.target.doc.dir}"
> outputFormat="${torque.documentationFormat}"
> templatePath="${torque.templatePath}"
> sqldbmap="${torque.target.sql.dir}/sqldb.map"
> outputFile="report.${torque.project}.doc.generation">
> <fileset dir="${torque.schemaDirectory}">
137,139c170,172
< outputDirectory="${torque.home}/${outputDirectory}/sql"
< targetDatabase="${database}"
< templatePath="${templatePath}"
---
> outputDirectory="${torque.target.sql.dir}"
> targetDatabase="${torque.database}"
> templatePath="${torque.templatePath}"
141c174
< <fileset dir="${torque.home}/${schemaDirectory}">
---
> <fileset dir="${torque.schemaDirectory}">
155c188
< src="${torque.home}/${outputDirectory}/sql/create-db.sql"
---
> src="${torque.target.sql.dir}/create-db.sql"
182,183c215,216
< sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
< srcDir="${torque.home}/${outputDirectory}/sql">
---
> sqldbmap="${torque.target.sql.dir}/sqldb.map"
> srcDir="${torque.target.sql.dir}">
202c235
< <echo message=" taking build.properties from: ${build.properties}"/>
---
> <echo message=" taking build.properties from: ${torque.build.properties}"/>
216c249
< outputFile="${torque.home}/${outputDirectory}/schema.xml"
---
> outputFile="${torque.outputDirectory}/schema.xml"
235c268
< <echo message=" taking build.properties from: ${build.properties}"/>
---
> <echo message=" taking build.properties from: ${torque.build.properties}"/>
244c277
< contextProperties="${build.properties}"
---
> contextProperties="${torque.build.properties}"
246,253c279,286
< 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"
---
> outputDirectory="${torque.outputDirectory}"
> templatePath="${torque.templatePath}"
> outputFile="${torque.project}-data.sql"
> xmlFile="${torque.schemaDirectory}/${torque.project}-schema.xml"
> dataXmlFile="${torque.schemaDirectory}/${torque.project}-data.xml"
> dataDTD="${torque.schemaDirectory}/${torque.project}-data.dtd"
> targetDatabase="${torque.database}"
> sqldbmap="${torque.target.sql.dir}/sqldb.map"
278c311
< contextProperties="${templatePath}/sql/id-table/project.props"
---
> contextProperties="${torque.templatePath}/sql/id-table/project.props"
280c313
< templatePath="${templatePath}"
---
> templatePath="${torque.templatePath}"
282,286c315,319
< 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.schemaDirectory}">
307c340
< <echo message=" taking build.properties from: ${build.properties}"/>
---
> <echo message=" taking build.properties from: ${torque.build.properties}"/>
316c349
< contextProperties="${build.properties}"
---
> contextProperties="${torque.build.properties}"
318,321c351,354
< outputDirectory="${torque.home}/${outputDirectory}"
< templatePath="${templatePath}"
< outputFile="report.${project}.datadump.generation"
< xmlFile="${torque.home}/${schemaDirectory}/${project}-schema.xml"
---
> outputDirectory="${torque.outputDirectory}"
> templatePath="${torque.templatePath}"
> outputFile="report.${torque.project}.datadump.generation"
> xmlFile="${torque.schemaDirectory}/${torque.project}-schema.xml"
354c387
< contextProperties="${build.properties}"
---
> contextProperties="${torque.build.properties}"
356,359c389,392
< outputDirectory="${torque.home}/${outputDirectory}"
< templatePath="${templatePath}"
< outputFile="report.${project}.datadtd.generation"
< xmlFile="${torque.home}/${schemaDirectory}/${project}-schema.xml"
---
> outputDirectory="${torque.outputDirectory}"
> templatePath="${torque.templatePath}"
> outputFile="report.${torque.project}.datadtd.generation"
> xmlFile="${torque.schemaDirectory}/${torque.project}-schema.xml"
388c421
< contextProperties="${build.properties}"
---
> contextProperties="${torque.build.properties}"
390,392c423,425
< outputDirectory="${torque.home}/${outputDirectory}/java"
< templatePath="${templatePath}"
< outputFile="report.${project}.om.generation"
---
> outputDirectory="${torque.target.java.dir}"
> templatePath="${torque.templatePath}"
> outputFile="report.${torque.project}.om.generation"
394,395c427,428
< targetDatabase="${database}">
< <fileset dir="${torque.home}/${schemaDirectory}">
---
> targetDatabase="${torque.database}">
> <fileset dir="${torque.schemaDirectory}">
428c461
< contextProperties="${build.properties}"
---
> contextProperties="${torque.build.properties}"
430c463
< outputDirectory="${torque.home}/${outputDirectory}/sql"
---
> outputDirectory="${torque.target.sql.dir}"
433,435c466,468
< sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
< outputFile="report.${project}.sql.generation"
< targetDatabase="${database}"
---
> sqldbmap="${torque.target.sql.dir}/sqldb.map"
> outputFile="report.${torque.project}.sql.generation"
> targetDatabase="${torque.database}"
437c470
< <fileset dir="${torque.home}/${schemaDirectory}">
---
> <fileset dir="${torque.schemaDirectory}">
457c490
< <echo message=" taking build.properties from: ${build.properties}"/>
---
> <echo message=" taking build.properties from: ${torque.build.properties}"/>
466c499
< contextProperties="${build.properties}"
---
> contextProperties="${torque.build.properties}"
468c501
< outputDirectory="${torque.home}/${outputDirectory}"
---
> outputDirectory="${torque.outputDirectory}"
470,475c503,508
< 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"
---
> outputFile="${torque.project}-data.sql"
> xmlFile="${torque.schemaDirectory}/${torque.project}-schema.xml"
> dataXmlFile="${torque.schemaDirectory}/${torque.project}-data.xml"
> dataDTD="${torque.schemaDirectory}/${torque.project}-data.dtd"
> targetDatabase="${torque.database}"
> sqldbmap="${torque.target.sql.dir}/sqldb.map"
503c536
< contextProperties="${build.properties}"
---
> contextProperties="${torque.build.properties}"
505c538
< outputDirectory="${torque.home}/${outputDirectory}"
---
> outputDirectory="${torque.outputDirectory}"
507,508c540,541
< outputFile="report.${project}.datadtd.generation"
< xmlFile="${torque.home}/${schemaDirectory}/${project}-schema.xml"
---
> outputFile="report.${torque.project}.datadtd.generation"
> xmlFile="${torque.schemaDirectory}/${torque.project}-schema.xml"
526c559
< <echo message=" taking build.properties from: ${build.properties}"/>
---
> <echo message=" taking build.properties from: ${torque.build.properties}"/>
535c568
< contextProperties="${build.properties}"
---
> contextProperties="${torque.build.properties}"
537c570
< outputDirectory="${torque.home}/${outputDirectory}"
---
> outputDirectory="${torque.outputDirectory}"
539,540c572,573
< outputFile="report.${project}.datadump.generation"
< xmlFile="${torque.home}/${schemaDirectory}/${project}-schema.xml"
---
> outputFile="report.${torque.project}.datadump.generation"
> xmlFile="${torque.schemaDirectory}/${torque.project}-schema.xml"
574c607
< contextProperties="${build.properties}"
---
> contextProperties="${torque.build.properties}"
576c609
< outputDirectory="${torque.home}/${outputDirectory}/java"
---
> outputDirectory="${torque.target.java.dir}"
578c611
< outputFile="report.${project}.om.generation"
---
> outputFile="report.${torque.project}.om.generation"
580,581c613,614
< targetDatabase="${database}">
< <fileset dir="${torque.home}/${schemaDirectory}">
---
> targetDatabase="${torque.database}">
> <fileset dir="${torque.schemaDirectory}">
615,616c648,649
< outputDirectory="${torque.home}/${outputDirectory}/sql"
< targetDatabase="${database}"
---
> outputDirectory="${torque.target.sql.dir}"
> targetDatabase="${torque.database}"
619c652
< <fileset dir="${torque.home}/${schemaDirectory}">
---
> <fileset dir="${torque.schemaDirectory}">
629c662
< src="${torque.home}/${outputDirectory}/sql/create-db.sql"
---
> src="${torque.target.sql.dir}/create-db.sql"
661,665c694,698
< 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.schemaDirectory}">
694c727
< contextProperties="${build.properties}"
---
> contextProperties="${torque.build.properties}"
696,697c729,730
< outputDirectory="${torque.home}/${outputDirectory}/doc"
< outputFormat="${documentationFormat}"
---
> outputDirectory="${torque.target.doc.dir}"
> outputFormat="${torque.documentationFormat}"
699,701c732,734
< sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
< outputFile="report.${project}.doc.generation">
< <fileset dir="${torque.home}/${schemaDirectory}">
---
> sqldbmap="${torque.target.sql.dir}/sqldb.map"
> outputFile="report.${torque.project}.doc.generation">
> <fileset dir="${torque.schemaDirectory}">
720,721c753,754
< <property name="src.dir" value="${outputDirectory}/java"/>
< <property name="build.dest" value="bin/classes"/>
---
> <property name="src.dir" value="${torque.target.java.dir}"/>
> <property name="build.dest" value="${torque.target.build.dir}"/>
771c804
< <mkdir dir="${torque.home}/${outputDirectory}/javadoc"/>
---
> <mkdir dir="${torque.target.javadoc.dir}"/>
774c807
< sourcepath="${torque.home}/${outputDirectory}"
---
> sourcepath="${torque.target.java.dir}"
776c809
< destdir="${outputDirectory}/javadoc"
---
> destdir="${torque.target.javadoc.dir}"
807c840
< contextProperties="${build.properties}"
---
> contextProperties="${torque.build.properties}"
810,815c843,848
< 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}">
---
> targetDatabase="${torque.database}"
> outputDirectory="${torque.target.ojb.dir}"
> templatePath="${torque.templatePath}"
> sqldbmap="${torque.target.sql.dir}/sqldb.map"
> outputFile="report.${torque.project}.ojb.generation">
> <fileset dir="${torque.schemaDirectory}">
837c870
< contextProperties="${build.properties}"
---
> contextProperties="${torque.build.properties}"
840c873
< targetDatabase="${database}"
---
> targetDatabase="${torque.database}"
843,845c876,878
< sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
< outputFile="report.${project}.ojb.generation">
< <fileset dir="${torque.home}/${schemaDirectory}">
---
> sqldbmap="${torque.target.sql.dir}/sqldb.map"
> outputFile="report.${torque.project}.ojb.generation">
> <fileset dir="${torque.schemaDirectory}">
867c900
< contextProperties="${build.properties}"
---
> contextProperties="${torque.build.properties}"
870c903
< targetDatabase="${database}"
---
> targetDatabase="${torque.database}"
872,875c905,908
< templatePath="${templatePath}"
< sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
< outputFile="report.${project}.ojb.generation">
< <fileset dir="${torque.home}/${schemaDirectory}">
---
> templatePath="${torque.templatePath}"
> sqldbmap="${torque.target.sql.dir}/sqldb.map"
> outputFile="report.${torque.project}.ojb.generation">
> <fileset dir="${torque.schemaDirectory}">
897c930
< contextProperties="${build.properties}"
---
> contextProperties="${torque.build.properties}"
900c933
< targetDatabase="${database}"
---
> targetDatabase="${torque.database}"
903,905c936,938
< sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
< outputFile="report.${project}.ojb.generation">
< <fileset dir="${torque.home}/${schemaDirectory}">
---
> sqldbmap="${torque.target.sql.dir}/sqldb.map"
> outputFile="report.${torque.project}.ojb.generation">
> <fileset dir="${torque.schemaDirectory}">
*****CVS exited normally with code 1*****
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
