mpoeschl    2002/06/26 00:23:11

  Modified:    src/conf build-torque.xml
  Log:
  splitted the project-sql task because Texen tries to load from the templatePath even 
if useClasspath = true
  the other tasks seem to work...
  
  Revision  Changes    Path
  1.35      +38 -0     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.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- build-torque.xml  24 Jun 2002 19:56:03 -0000      1.34
  +++ build-torque.xml  26 Jun 2002 07:23:11 -0000      1.35
  @@ -49,6 +49,17 @@
       <echo message="|                                          |"/>
       <echo message="+------------------------------------------+"/>
   
  +    <antcall target="project-sql-classpath"/>
  +    <antcall target="project-sql-template"/>
  +
  +  </target>
  +
  +  <target
  +    name="project-sql-classpath"
  +    if="useClasspath">
  +
  +    <echo message="using classpath"/>
  +
       <taskdef
         name="torque-sql"
         classname="org.apache.torque.task.TorqueSQLTask">
  @@ -60,6 +71,33 @@
         controlTemplate="${SQLControlTemplate}"
         outputDirectory="${torque.home}/${outputDirectory}/sql"
         useClasspath="${useClasspath}"
  +      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>
  +
  +  <target
  +    name="project-sql-template"
  +    unless="useClasspath">
  +
  +    <echo message="using template path ${templatePath}"/>
  +
  +    <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"
         templatePath="${templatePath}"
         basePathToDbProps="sql/base/"
         sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to