A reminder to always do a cvs diff prior to commit. The file here has
been converted from unix line endings to dos line endings.
This can happen when checking a file out with a unix client, then
editing the file on a windows box with a program that converts the line
endings, and then moving the file back onto the unix machine before
committing it.
Java Apache CVS Development wrote:
>
> User: gonzalo
> Date: 01/02/01 07:05:41
>
> Modified: conf/torque torque.xml
> Log:
> Added support for addGetByNameMethod in torque.xml.
>
> Added an import of java.math.* in files Object.vm and Peer.vm.
> This is necessary to support BigDecimal columns.
>
> Added a static method getFieldNames() generated from Object.vm.
> It returns a Vector with the field names; these names can later
> be used as input for getByName(). Note: this method uses a
> private static variable, and there might be MT concerns here,
> since no locking is used at all.
>
> Revision Changes Path
> 1.8 +124 -123 turbine/conf/torque/torque.xml
>
> Index: torque.xml
> ===================================================================
> RCS file: /products/cvs/turbine/turbine/conf/torque/torque.xml,v
> retrieving revision 1.7
> retrieving revision 1.8
> diff -u -r1.7 -r1.8
> --- torque.xml 2001/01/27 01:49:55 1.7
> +++ torque.xml 2001/02/01 15:05:41 1.8
> @@ -1,123 +1,124 @@
> -<project name="Torque" default="main" basedir=".">
> -
> - <taskdef name="vtorque" classname="org.apache.turbine.torque.ant.VTorqueTask"/>
> - <taskdef name="sql-xml" classname="org.apache.turbine.torque.ant.SqlToXml"/>
> -
> - <property name="torque.home" value="@TORQUE_HOME@"/>
> - <property name="torque.config" value="${torque.home}/config"/>
> - <property name="torque.props" value="${torque.config}/torque.props"/>
> - <property name="torque.macros" value="${torque.config}/torque.macros"/>
> -
> - <!--
> - Load the torque properties file. All the targets use the
> - information stored in the properties file. Edit the properties
> - file! Not this build file!
> - -->
> -
> - <property file="${torque.props}"/>
> -
> -
> - <!-- ================================================================ -->
> - <!-- M A I N T A R G E T -->
> - <!-- ================================================================ -->
> - <!-- This default target will run all the targets that generate -->
> - <!-- source. You will probably only run this target once then -->
> - <!-- call individual targets as necessary to update your sources -->
> - <!-- when you change your XML schema. -->
> - <!-- ================================================================ -->
> -
> - <target name="main">
> - <antcall target="project-sql"/>
> - <antcall target="project-om"/>
> - </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 -->
> - <!-- to the base Turbine tables! The tables you require for your -->
> - <!-- project should be specified in project-schema.xml. -->
> - <!-- ================================================================ -->
> -
> - <target name="project-sql">
> -
> - <echo message="+------------------------------------------+"/>
> - <echo message="| |"/>
> - <echo message="| Generating SQL for YOUR Turbine project! |"/>
> - <echo message="| Woo hoo! |"/>
> - <echo message="| |"/>
> - <echo message="+------------------------------------------+"/>
> -
> - <vtorque
> - projectName="${project}"
> - xmlFile="${schemaDirectory}/${project}-schema.xml"
> - controlTemplate="${SQLControlTemplate}"
> - outputDirectory="${outputDirectory}"
> - templatePath="${templatePath}"
> - targetPackage="${targetPackage}"
> - outputFile="${project}-schema.sql"
> - targetDatabase="${database}"
> - />
> -
> - </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. -->
> - <!-- These are in addition to the base Turbine OM! -->
> - <!-- ================================================================ -->
> -
> - <target name="first_build_check">
> - <available property="firstbuild.present" file="firstbuild"/>
> - <echo message="${firstbuild.present}"/>
> - </target>
> -
> - <target name="delete_firstbuild" depends="first_build_check"
> - if="firstbuild.present">
> - <echo message="Deleting firstbuild..."/>
> - <delete file="firstbuild"/>
> - </target>
> -
> - <target name="project-om" depends="delete_firstbuild">
> -
> - <echo message="+------------------------------------------+"/>
> - <echo message="| |"/>
> - <echo message="| Generating Peer-based Object Model for |"/>
> - <echo message="| YOUR Turbine project! Woo hoo! |"/>
> - <echo message="| |"/>
> - <echo message="+------------------------------------------+"/>
> -
> -
> - <vtorque
> - projectName="${project}"
> - xmlFile="${schemaDirectory}/${project}-schema.xml"
> - controlTemplate="${OMControlTemplate}"
> - outputDirectory="${outputDirectory}"
> - templatePath="${templatePath}"
> - targetPackage="${targetPackage}"
> - outputFile="${project}.generation.report"
> - targetDatabase="${database}"
> - addSaveMethod="${addSaveMethod}"
> - objectModelType="${objectModelType}"
> - firstBuildExists="${firstbuild.present}"
> - />
> -
> - </target>
> -
> - <!-- =================================================================== -->
> - <!-- Create an xml schema from an sql schema. -->
> - <!-- -->
> - <!-- inputFile: The input sql file. This must be valid sql file but -->
> - <!-- it not not be in any specific format. -->
> - <!-- outputFile: The file where the xml schema will be written -->
> - <!-- =================================================================== -->
> -
> - <target name="sql2xml">
> - <sql-xml
> - inputFile="schema/schema.sql"
> - outputFile="schema/schema.xml"
> - />
> - </target>
> -
> -</project>
> +<project name="Torque" default="main" basedir=".">
> +
> + <taskdef name="vtorque" classname="org.apache.turbine.torque.ant.VTorqueTask"/>
> + <taskdef name="sql-xml" classname="org.apache.turbine.torque.ant.SqlToXml"/>
> +
> + <property name="torque.home" value="."/>
> + <property name="torque.config" value="${torque.home}/config"/>
> + <property name="torque.props" value="${torque.config}/torque.props"/>
> + <property name="torque.macros" value="${torque.config}/torque.macros"/>
> +
> + <!--
> + Load the torque properties file. All the targets use the
> + information stored in the properties file. Edit the properties
> + file! Not this build file!
> + -->
> +
> + <property file="${torque.props}"/>
> +
> +
> + <!-- ================================================================ -->
> + <!-- M A I N T A R G E T -->
> + <!-- ================================================================ -->
> + <!-- This default target will run all the targets that generate -->
> + <!-- source. You will probably only run this target once then -->
> + <!-- call individual targets as necessary to update your sources -->
> + <!-- when you change your XML schema. -->
> + <!-- ================================================================ -->
> +
> + <target name="main">
> + <antcall target="project-sql"/>
> + <antcall target="project-om"/>
> + </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 -->
> + <!-- to the base Turbine tables! The tables you require for your -->
> + <!-- project should be specified in project-schema.xml. -->
> + <!-- ================================================================ -->
> +
> + <target name="project-sql">
> +
> + <echo message="+------------------------------------------+"/>
> + <echo message="| |"/>
> + <echo message="| Generating SQL for YOUR Turbine project! |"/>
> + <echo message="| Woo hoo! |"/>
> + <echo message="| |"/>
> + <echo message="+------------------------------------------+"/>
> +
> + <vtorque
> + projectName="${project}"
> + xmlFile="${schemaDirectory}/${project}-schema.xml"
> + controlTemplate="${SQLControlTemplate}"
> + outputDirectory="${outputDirectory}"
> + templatePath="${templatePath}"
> + targetPackage="${targetPackage}"
> + outputFile="${project}-schema.sql"
> + targetDatabase="${database}"
> + />
> +
> + </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. -->
> + <!-- These are in addition to the base Turbine OM! -->
> + <!-- ================================================================ -->
> +
> + <target name="first_build_check">
> + <available property="firstbuild.present" file="firstbuild"/>
> + <echo message="${firstbuild.present}"/>
> + </target>
> +
> + <target name="delete_firstbuild" depends="first_build_check"
> + if="firstbuild.present">
> + <echo message="Deleting firstbuild..."/>
> + <delete file="firstbuild"/>
> + </target>
> +
> + <target name="project-om" depends="delete_firstbuild">
> +
> + <echo message="+------------------------------------------+"/>
> + <echo message="| |"/>
> + <echo message="| Generating Peer-based Object Model for |"/>
> + <echo message="| YOUR Turbine project! Woo hoo! |"/>
> + <echo message="| |"/>
> + <echo message="+------------------------------------------+"/>
> +
> +
> + <vtorque
> + projectName="${project}"
> + xmlFile="${schemaDirectory}/${project}-schema.xml"
> + controlTemplate="${OMControlTemplate}"
> + outputDirectory="${outputDirectory}"
> + templatePath="${templatePath}"
> + targetPackage="${targetPackage}"
> + outputFile="${project}.generation.report"
> + targetDatabase="${database}"
> + addSaveMethod="${addSaveMethod}"
> + addGetByNameMethod="${addGetByNameMethod}"
> + objectModelType="${objectModelType}"
> + firstBuildExists="${firstbuild.present}"
> + />
> +
> + </target>
> +
> + <!-- =================================================================== -->
> + <!-- Create an xml schema from an sql schema. -->
> + <!-- -->
> + <!-- inputFile: The input sql file. This must be valid sql file but -->
> + <!-- it not not be in any specific format. -->
> + <!-- outputFile: The file where the xml schema will be written -->
> + <!-- =================================================================== -->
> +
> + <target name="sql2xml">
> + <sql-xml
> + inputFile="schema/schema.sql"
> + outputFile="schema/schema.xml"
> + />
> + </target>
> +
> +</project>
>
>
>
------------------------------------------------------------
To subscribe: [EMAIL PROTECTED]
To unsubscribe: [EMAIL PROTECTED]
Search: <http://www.mail-archive.com/turbine%40list.working-dogs.com/>
Problems?: [EMAIL PROTECTED]
