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 2001/07/15 16:39:23 UTC

cvs commit: jakarta-turbine/build build-turbine-om.xml build-turbine-sql.xml build.properties

mpoeschl    01/07/15 07:39:23

  Modified:    build    build-turbine-om.xml build-turbine-sql.xml
                        build.properties
  Log:
  update build system to include generation of the scheduler files
  
  Revision  Changes    Path
  1.6       +23 -1     jakarta-turbine/build/build-turbine-om.xml
  
  Index: build-turbine-om.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/build/build-turbine-om.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build-turbine-om.xml	2001/07/13 18:32:23	1.5
  +++ build-turbine-om.xml	2001/07/15 14:39:22	1.6
  @@ -32,15 +32,37 @@
     <!-- ================================================================ -->
   
     <target name="main" depends="init">
  +    <antcall target="security-om"/>
  +    <antcall target="scheduler-om"/>
  +  </target>
   
  +
  +  <target name="security-om" depends="init">
  +
       <torque-om
         contextProperties="build.properties"
         controlTemplate="${OMControlTemplate}"
         outputDirectory="${build.src}"
         templatePath="${templatePath}"
         outputFile="report.turbine.om.generation"
  -      targetPackage="${targetPackage}"
  +      targetPackage="${securityPackage}"
         xmlFile="${schemaDirectory}/turbine-schema.xml"
  +      targetDatabase="${database}"
  +    />
  +
  +  </target>
  +
  +
  +  <target name="scheduler-om" depends="init">
  +
  +    <torque-om
  +      contextProperties="build.properties"
  +      controlTemplate="${OMControlTemplate}"
  +      outputDirectory="${build.src}"
  +      templatePath="${templatePath}"
  +      outputFile="report.turbine.scheduler.generation"
  +      targetPackage="${schedulerPackage}"
  +      xmlFile="${schemaDirectory}/scheduler-schema.xml"
         targetDatabase="${database}"
       />
   
  
  
  
  1.12      +89 -1     jakarta-turbine/build/build-turbine-sql.xml
  
  Index: build-turbine-sql.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/build/build-turbine-sql.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- build-turbine-sql.xml	2001/07/02 23:30:24	1.11
  +++ build-turbine-sql.xml	2001/07/15 14:39:22	1.12
  @@ -59,6 +59,12 @@
       <antcall target="turbine-security-sql">
         <param name="database" value="db2"/>
       </antcall>
  +    <antcall target="scheduler-sql">
  +      <param name="database" value="db2"/>
  +    </antcall>
  +    <antcall target="scheduler-id-table-init-sql">
  +      <param name="database" value="db2"/>
  +    </antcall>
     </target>
   
     <target name="hypersonic">
  @@ -75,6 +81,12 @@
       <antcall target="turbine-security-sql">
         <param name="database" value="hypersonic"/>
       </antcall>
  +    <antcall target="scheduler-sql">
  +      <param name="database" value="hypersonic"/>
  +    </antcall>
  +    <antcall target="scheduler-id-table-init-sql">
  +      <param name="database" value="hypersonic"/>
  +    </antcall>
     </target>
   
     <target name="interbase">
  @@ -91,6 +103,12 @@
       <antcall target="turbine-security-sql">
         <param name="database" value="interbase"/>
       </antcall>
  +    <antcall target="scheduler-sql">
  +      <param name="database" value="interbase"/>
  +    </antcall>
  +    <antcall target="scheduler-id-table-init-sql">
  +      <param name="database" value="interbase"/>
  +    </antcall>
     </target>
   
     <target name="oracle">
  @@ -107,6 +125,12 @@
       <antcall target="turbine-security-sql">
         <param name="database" value="oracle"/>
       </antcall>
  +    <antcall target="scheduler-sql">
  +      <param name="database" value="oracle"/>
  +    </antcall>
  +    <antcall target="scheduler-id-table-init-sql">
  +      <param name="database" value="oracle"/>
  +    </antcall>
     </target>
   
     <target name="mysql">
  @@ -123,6 +147,12 @@
       <antcall target="turbine-security-sql">
         <param name="database" value="mysql"/>
       </antcall>
  +    <antcall target="scheduler-sql">
  +      <param name="database" value="mysql"/>
  +    </antcall>
  +    <antcall target="scheduler-id-table-init-sql">
  +      <param name="database" value="mysql"/>
  +    </antcall>
     </target>
   
     <target name="postgresql">
  @@ -139,6 +169,12 @@
       <antcall target="turbine-security-sql">
         <param name="database" value="postgresql"/>
       </antcall>
  +    <antcall target="scheduler-sql">
  +      <param name="database" value="postgresql"/>
  +    </antcall>
  +    <antcall target="scheduler-id-table-init-sql">
  +      <param name="database" value="postgresql"/>
  +    </antcall>
     </target>
   
     <target name="sybase">
  @@ -155,11 +191,17 @@
       <antcall target="turbine-security-sql">
         <param name="database" value="sybase"/>
       </antcall>
  +    <antcall target="scheduler-sql">
  +      <param name="database" value="sybase"/>
  +    </antcall>
  +    <antcall target="scheduler-id-table-init-sql">
  +      <param name="database" value="sybase"/>
  +    </antcall>
     </target>
   
   
     <!-- ================================================================ -->
  -  <!-- G E N E R A T E  P R O J E C T  S Q L                            -->
  +  <!-- G E N E R A T E   T U R B I N E   S Q L                          -->
     <!-- ================================================================ -->
     <!-- Generate the SQL for your project, these are in addition         -->
     <!-- to the base Turbine tables! The tables you require for your      -->
  @@ -184,6 +226,27 @@
     </target>
   
     <!-- ================================================================ -->
  +  <!-- G E N E R A T E   S C H E D U L E R   S Q L                      -->
  +  <!-- ================================================================ -->
  +
  +  <target name="scheduler-sql">
  +
  +    <echo message="+------------------------------------------------+"/>
  +    <echo message="| Generating Scheduler SQL schema for ${database} "/>
  +    <echo message="+------------------------------------------------+"/>
  +
  +    <torque-sql
  +      controlTemplate="${SQLControlTemplate}"
  +      outputDirectory="${outputDirectory}"
  +      templatePath="${templatePath}"
  +      outputFile="${database}-scheduler.sql"
  +      xmlFile="${schemaDirectory}/scheduler-schema.xml"
  +      targetDatabase="${database}"
  +    />
  +
  +  </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         -->
  @@ -231,6 +294,31 @@
         templatePath="${templatePath}"
         outputFile="${database}-turbine-id-table-init.sql"
         xmlFile="${schemaDirectory}/turbine-schema.xml"
  +      targetDatabase="${database}"
  +    />
  +
  +  </target>
  +
  +  <!-- ================================================================ -->
  +  <!-- GENERATE SCHEDULER ID BROKER INIT SQL                            -->
  +  <!-- ================================================================ -->
  +
  +  <target name="scheduler-id-table-init-sql">
  +
  +    <echo message="+--------------------------------------------+"/>
  +    <echo message="|                                            |"/>
  +    <echo message="| Generating scheduler initialization SQL    |"/>
  +    <echo message="| for ID Broker system!                      |"/>
  +    <echo message="|                                            |"/>
  +    <echo message="+--------------------------------------------+"/>
  +
  +    <torque-sql
  +      contextProperties="${basedir}/../conf/torque/templates/sql/id-table/scheduler.props"
  +      controlTemplate="${idTableControlTemplate}"
  +      outputDirectory="${outputDirectory}"
  +      templatePath="${templatePath}"
  +      outputFile="${database}-scheduler-id-table-init.sql"
  +      xmlFile="${schemaDirectory}/scheduler-schema.xml"
         targetDatabase="${database}"
       />
   
  
  
  
  1.11      +3 -1      jakarta-turbine/build/build.properties
  
  Index: build.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/build/build.properties,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- build.properties	2001/07/13 02:19:19	1.10
  +++ build.properties	2001/07/15 14:39:22	1.11
  @@ -33,7 +33,6 @@
   # system
   # -------------------------------------------------------------------
   
  -targetPackage=org.apache.turbine.om.security
   addSaveMethod=true
   addGetByNameMethod=true
   complexObjectModel=true
  @@ -51,3 +50,6 @@
   DataDumpControlTemplate = data/dump/Control.vm
   DataSQLControlTemplate = sql/load/Control.vm
   securityControlTemplate = sql/security/Control.vm
  +
  +securityPackage=org.apache.turbine.om.security
  +schedulerPackage=org.apache.turbine.services.schedule
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org