forgot to mention in the cvs commit message, but i changed the name of
columns that were using some possibly reserved words in the scheduler
schema.
john mcnally
[EMAIL PROTECTED] wrote:
>
> jmcnally 01/11/12 21:35:44
>
> Modified: . build-om.xml build-turbine-sql.xml
> default.properties scheduler-schema.xml
> turbine-schema.xml
> Log:
> added tokens to the xml schemas to allow an app building fulcrum to specify the
> database and any extra user columns.
> added filtering to the build.xml to populate the tokens
> added default values to default.properties
>
> Revision Changes Path
> 1.9 +20 -3 jakarta-turbine-fulcrum/build-om.xml
>
> Index: build-om.xml
> ===================================================================
> RCS file: /home/cvs/jakarta-turbine-fulcrum/build-om.xml,v
> retrieving revision 1.8
> retrieving revision 1.9
> diff -u -r1.8 -r1.9
> --- build-om.xml 2001/11/07 03:54:35 1.8
> +++ build-om.xml 2001/11/13 05:35:43 1.9
> @@ -6,8 +6,8 @@
> <property file="build.properties" />
> <!-- Set default values for the build -->
> <property file="default.properties" />
> -
>
> +
> <!-- ================================================================ -->
> <!-- I N I T T A R G E T -->
> <!-- ================================================================ -->
> @@ -46,6 +46,15 @@
>
> <target name="security-om" depends="init">
>
> + <filter token="DATABASE_DEFAULT" value="${security.database.name}"/>
> + <!-- is there a way to load this from an xml file? -->
> + <filter token="EXTRA_USER_COLUMNS" value="${security.extra.user.columns}"/>
> + <copy
> + todir="${build.src}"
> + file="${schemaDirectory}/turbine-schema.xml"
> + filtering="yes"
> + />
> +
> <torque-om
> contextProperties="default.properties"
> controlTemplate="${OMControlTemplate}"
> @@ -53,7 +62,8 @@
> templatePath="${templatePath}"
> outputFile="report.turbine.om.generation"
> targetPackage="${securityPackage}"
> - xmlFile="${schemaDirectory}/turbine-schema.xml"
> + xmlFile="${build.src}/turbine-schema.xml"
> + targetDatabase="${database}"
> />
>
> </target>
> @@ -61,6 +71,13 @@
>
> <target name="scheduler-om" depends="init">
>
> + <filter token="DATABASE_DEFAULT" value="${scheduler.database.name}"/>
> + <copy
> + todir="${build.src}"
> + file="${schemaDirectory}/scheduler-schema.xml"
> + filtering="yes"
> + />
> +
> <torque-om
> contextProperties="default.properties"
> controlTemplate="${OMControlTemplate}"
> @@ -68,7 +85,7 @@
> templatePath="${templatePath}"
> outputFile="report.turbine.scheduler.generation"
> targetPackage="${schedulerPackage}"
> - xmlFile="${schemaDirectory}/scheduler-schema.xml"
> + xmlFile="${build.src}/scheduler-schema.xml"
> />
>
> </target>
>
>
>
> 1.5 +18 -2 jakarta-turbine-fulcrum/build-turbine-sql.xml
>
> Index: build-turbine-sql.xml
> ===================================================================
> RCS file: /home/cvs/jakarta-turbine-fulcrum/build-turbine-sql.xml,v
> retrieving revision 1.4
> retrieving revision 1.5
> diff -u -r1.4 -r1.5
> --- build-turbine-sql.xml 2001/09/20 05:18:26 1.4
> +++ build-turbine-sql.xml 2001/11/13 05:35:43 1.5
> @@ -222,12 +222,21 @@
> <echo message="| Generating Turbine SQL schema for ${database} "/>
> <echo message="+----------------------------------------------+"/>
>
> + <filter token="DATABASE_DEFAULT" value="${security.database.name}"/>
> + <!-- is there a way to load this from an xml file? -->
> + <filter token="EXTRA_USER_COLUMNS" value="${security.extra.user.columns}"/>
> + <copy
> + todir="${build.src}"
> + file="${schemaDirectory}/turbine-schema.xml"
> + filtering="yes"
> + />
> +
> <torque-sql
> controlTemplate="${SQLControlTemplate}"
> outputDirectory="${outputDirectory}"
> templatePath="${templatePath}"
> outputFile="${database}-turbine.sql"
> - xmlFile="${schemaDirectory}/turbine-schema.xml"
> + xmlFile="${build.src}/turbine-schema.xml"
> targetDatabase="${database}"
> />
>
> @@ -243,12 +252,19 @@
> <echo message="| Generating Scheduler SQL schema for ${database} "/>
> <echo message="+------------------------------------------------+"/>
>
> + <filter token="DATABASE_DEFAULT" value="${scheduler.database.name}"/>
> + <copy
> + todir="${build.src}"
> + file="${schemaDirectory}/scheduler-schema.xml"
> + filtering="yes"
> + />
> +
> <torque-sql
> controlTemplate="${SQLControlTemplate}"
> outputDirectory="${outputDirectory}"
> templatePath="${templatePath}"
> outputFile="${database}-scheduler.sql"
> - xmlFile="${schemaDirectory}/scheduler-schema.xml"
> + xmlFile="${build.src}/scheduler-schema.xml"
> targetDatabase="${database}"
> />
>
>
>
>
> 1.7 +4 -0 jakarta-turbine-fulcrum/default.properties
>
> Index: default.properties
> ===================================================================
> RCS file: /home/cvs/jakarta-turbine-fulcrum/default.properties,v
> retrieving revision 1.6
> retrieving revision 1.7
> diff -u -r1.6 -r1.7
> --- default.properties 2001/11/09 02:16:28 1.6
> +++ default.properties 2001/11/13 05:35:43 1.7
> @@ -58,6 +58,7 @@
> # system
> # -------------------------------------------------------------------
>
> +database=mysql
> addSaveMethod=true
> addGetByNameMethod=true
> complexObjectModel=true
> @@ -81,5 +82,8 @@
>
> securityPackage=org.apache.fulcrum.security.impl.db.entity
> schedulerPackage=org.apache.fulcrum.schedule
> +security.database.name = default
> +scheduler.database.name = default
> +security.extra.user.columns=
>
> omStatusFile = ./${build.src}/report.turbine.om.generation
>
>
>
> 1.2 +9 -6 jakarta-turbine-fulcrum/scheduler-schema.xml
>
> Index: scheduler-schema.xml
> ===================================================================
> RCS file: /home/cvs/jakarta-turbine-fulcrum/scheduler-schema.xml,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- scheduler-schema.xml 2001/08/31 06:50:35 1.1
> +++ scheduler-schema.xml 2001/11/13 05:35:43 1.2
> @@ -12,21 +12,24 @@
> <!-- Object Model. -->
> <!-- ==================================================================== -->
> <!-- @author: <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a> -->
> -<!-- @version $Id: scheduler-schema.xml,v 1.1 2001/08/31 06:50:35 jvanzyl Exp $
>-->
> +<!-- @version $Id: scheduler-schema.xml,v 1.2 2001/11/13 05:35:43 jmcnally Exp $
>-->
> <!-- ==================================================================== -->
>
> -<database>
> +<database name="@DATABASE_DEFAULT@">
>
> <table name="TURBINE_SCHEDULED_JOB" idMethod="idbroker" javaName="JobEntry">
> <column name="JOB_ID" required="true" primaryKey="true" type="INTEGER"/>
> - <column name="SECOND" default="-1" required="true" type="INTEGER"/>
> - <column name="MINUTE" default="-1" required="true" type="INTEGER"/>
> - <column name="HOUR" default="-1" required="true" type="INTEGER"/>
> + <column name="JOB_SECOND" javaName="Second" default="-1"
> + required="true" type="INTEGER"/>
> + <column name="JOB_MINUTE" javaName="Minute" default="-1"
> + required="true" type="INTEGER"/>
> + <column name="JOB_HOUR" javaName="Hour" default="-1"
> + required="true" type="INTEGER"/>
> <column name="WEEK_DAY" default="-1" required="true" type="INTEGER"/>
> <column name="DAY_OF_MONTH" default="-1" required="true" type="INTEGER"/>
> <column name="TASK" required="true" size="99" type="VARCHAR"/>
> <column name="EMAIL" size="99" type="VARCHAR"/>
> - <column name="PROPERTY" type="VARBINARY"/>
> + <column name="JOB_PROPERTY" javaName="Property" type="VARBINARY"/>
> </table>
>
> </database>
>
>
>
> 1.2 +3 -3 jakarta-turbine-fulcrum/turbine-schema.xml
>
> Index: turbine-schema.xml
> ===================================================================
> RCS file: /home/cvs/jakarta-turbine-fulcrum/turbine-schema.xml,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- turbine-schema.xml 2001/08/31 06:50:35 1.1
> +++ turbine-schema.xml 2001/11/13 05:35:43 1.2
> @@ -13,10 +13,10 @@
> <!-- users and security. -->
> <!-- ==================================================================== -->
> <!-- @author: <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a> -->
> -<!-- @version $Id: turbine-schema.xml,v 1.1 2001/08/31 06:50:35 jvanzyl Exp $
>-->
> +<!-- @version $Id: turbine-schema.xml,v 1.2 2001/11/13 05:35:43 jmcnally Exp $
> -->
> <!-- ==================================================================== -->
>
> -<database>
> +<database name="@DATABASE_DEFAULT@">
>
> <table name="TURBINE_PERMISSION" idMethod="idbroker">
> <column name="PERMISSION_ID" required="true" primaryKey="true"
>type="INTEGER"/>
> @@ -73,7 +73,7 @@
> <column name="CREATED" type="TIMESTAMP" javaName="CreateDate"/>
> <column name="LAST_LOGIN" type="TIMESTAMP"/>
> <column name="OBJECTDATA" type="VARBINARY"/>
> -
> + @EXTRA_USER_COLUMNS@
> <unique>
> <unique-column name="LOGIN_NAME"/>
> </unique>
>
>
>
>
> --
> To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
