You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by mp...@apache.org on 2002/02/16 17:59:54 UTC

cvs commit: jakarta-turbine-torque/src/conf build-torque.xml

mpoeschl    02/02/16 08:59:54

  Modified:    src/conf build-torque.xml
  Log:
  - add project-datasql-classpath task
  - use torque.home in insert-sql task
  
  Revision  Changes    Path
  1.18      +44 -6     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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- build-torque.xml	13 Jan 2002 15:14:53 -0000	1.17
  +++ build-torque.xml	16 Feb 2002 16:59:54 -0000	1.18
  @@ -121,7 +121,7 @@
     <target
       name="project-create-db"
       unless="database.manual.creation"
  -    description="--> generates the target database">
  +    description="==> generates the target database">
   
       <taskdef
         name="torque-create-db"
  @@ -176,8 +176,8 @@
         password="${databasePassword}"
         autocommit="true"
         onerror="continue"
  -      sqldbmap="${basedir}/${outputDirectory}/sql/sqldb.map"
  -      srcDir="${basedir}/${outputDirectory}/sql">
  +      sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
  +      srcDir="${torque.home}/${outputDirectory}/sql">
         <classpath refid="torque-classpath"/>
       </torque-insert-sql>
     </target>
  @@ -405,7 +405,8 @@
     <!-- ================================================================ -->
   
     <target
  -    name="project-sql-classpath">
  +    name="project-sql-classpath"
  +    description="==> generates the SQL for your project">
   
       <echo message="+------------------------------------------+"/>
       <echo message="|                                          |"/>
  @@ -436,6 +437,42 @@
     </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  P E E R  B A S E D  O M          -->
     <!-- ================================================================ -->
     <!-- Generate the Peer-based object model for your project.           -->
  @@ -443,7 +480,8 @@
     <!-- ================================================================ -->
   
     <target
  -    name="project-om-classpath">
  +    name="project-om-classpath"
  +    description="==> generates the Peer-based object model for your project">
   
       <echo message="+------------------------------------------+"/>
       <echo message="|                                          |"/>
  @@ -483,7 +521,7 @@
     <target
       name="project-create-db-classpath"
       unless="database.manual.creation"
  -    description="--> generates the target database">
  +    description="==> generates the target database">
   
       <taskdef
         name="torque-create-db"
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>