You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jv...@apache.org on 2001/10/28 19:33:45 UTC
cvs commit: jakarta-turbine-torque/src/conf build-torque.xml build.properties build.xml
jvanzyl 01/10/28 10:33:45
Modified: src/conf build-torque.xml build.properties build.xml
Log:
- making the build.properties the standard test build.properties.
can also be used as an example.
Revision Changes Path
1.2 +38 -39 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build-torque.xml 2001/10/28 17:06:29 1.1
+++ build-torque.xml 2001/10/28 18:33:45 1.2
@@ -1,6 +1,6 @@
<project name="Torque" default="main" basedir=".">
- <property name="torque.home" value="@TORQUE_HOME@"/>
+ <property name="torque.home" value="."/>
<!-- Override this property if you build a "lite" distribution. -->
<property name="lib.dir" value="lib"/>
@@ -46,6 +46,43 @@
</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"
+ description="==> generates the SQL for your project">
+
+ <echo message="+------------------------------------------+"/>
+ <echo message="| |"/>
+ <echo message="| Generating SQL for YOUR Turbine project! |"/>
+ <echo message="| Woo hoo! |"/>
+ <echo message="| |"/>
+ <echo message="+------------------------------------------+"/>
+
+ <taskdef
+ name="torque-sql"
+ classname="org.apache.torque.task.TorqueSQLTask">
+ <classpath refid="classpath"/>
+ </taskdef>
+
+ <torque-sql
+ contextProperties="${build.properties}"
+ controlTemplate="${SQLControlTemplate}"
+ outputDirectory="${torque.home}/${outputDirectory}/sql"
+ templatePath="${templatePath}"
+ outputFile="report.${project}.sql.generation"
+ xmlFile="${torque.home}/${schemaDirectory}/${project}-schema.xml"
+ targetDatabase="${database}"
+ />
+
+ </target>
+
+ <!-- ================================================================ -->
<!-- J D B C TO X M L -->
<!-- ================================================================ -->
@@ -177,44 +214,6 @@
templatePath="${templatePath}"
outputFile="report.${project}.datadtd.generation"
xmlFile="${torque.home}/${schemaDirectory}/${project}-schema.xml"
- />
-
- </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"
- description="==> generates the SQL for your project">
-
- <echo message="+------------------------------------------+"/>
- <echo message="| |"/>
- <echo message="| Generating SQL for YOUR Turbine project! |"/>
- <echo message="| Woo hoo! |"/>
- <echo message="| |"/>
- <echo message="+------------------------------------------+"/>
-
- <taskdef
- name="torque-sql"
- classname="org.apache.torque.task.TorqueSQLTask">
- <classpath refid="classpath"/>
- </taskdef>
-
- <torque-sql
- contextProperties="${build.properties}"
- controlTemplate="${SQLControlTemplate}"
- outputDirectory="${torque.home}/${outputDirectory}/sql"
- templatePath="${templatePath}"
- outputFile="report.${project}.sql.generation"
- xmlFile="${torque.home}/${schemaDirectory}/${project}-schema.xml"
- targetDatabase="${database}"
/>
</target>
1.3 +4 -4 jakarta-turbine-torque/src/conf/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/conf/build.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.properties 2001/09/10 21:14:02 1.2
+++ build.properties 2001/10/28 18:33:45 1.3
@@ -24,7 +24,7 @@
# the project name selected.
# -------------------------------------------------------------------
-project=project
+project = bookstore
# -------------------------------------------------------------------
#
@@ -44,7 +44,7 @@
# Default: none
# -------------------------------------------------------------------
-database=mysql
+database = mysql
# -------------------------------------------------------------------
#
@@ -63,7 +63,7 @@
# addTimeStamp=true puts time stamps in generated files
# -------------------------------------------------------------------
-targetPackage=org.apache.turbine
+targetPackage=org.apache.torque
basePrefix=Base
addSaveMethod=true
secureSaveMethod=false
@@ -82,7 +82,7 @@
# Turbine system with the generated SQL.
# -------------------------------------------------------------------
-databaseUrl = jdbc:mysql://127.0.0.1/turbine
+databaseUrl = jdbc:mysql://127.0.0.1/bookstore
databaseDriver = org.gjt.mm.mysql.Driver
databaseUser = user
databasePassword = password
1.8 +38 -42 jakarta-turbine-torque/src/conf/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/conf/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 2001/10/27 19:11:11 1.7
+++ build.xml 2001/10/28 18:33:45 1.8
@@ -1,6 +1,6 @@
<project name="Torque" default="main" basedir=".">
- <property name="torque.home" value="@TORQUE_HOME@"/>
+ <property name="torque.home" value="."/>
<!-- Override this property if you build a "lite" distribution. -->
<property name="lib.dir" value="lib"/>
@@ -10,9 +10,6 @@
<fileset dir="${lib.dir}">
<include name="**/*.jar"/>
</fileset>
- <fileset dir="lib">
- <include name="torque*.jar"/>
- </fileset>
</path>
<!--
@@ -49,6 +46,43 @@
</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"
+ description="==> generates the SQL for your project">
+
+ <echo message="+------------------------------------------+"/>
+ <echo message="| |"/>
+ <echo message="| Generating SQL for YOUR Turbine project! |"/>
+ <echo message="| Woo hoo! |"/>
+ <echo message="| |"/>
+ <echo message="+------------------------------------------+"/>
+
+ <taskdef
+ name="torque-sql"
+ classname="org.apache.torque.task.TorqueSQLTask">
+ <classpath refid="classpath"/>
+ </taskdef>
+
+ <torque-sql
+ contextProperties="${build.properties}"
+ controlTemplate="${SQLControlTemplate}"
+ outputDirectory="${torque.home}/${outputDirectory}/sql"
+ templatePath="${templatePath}"
+ outputFile="report.${project}.sql.generation"
+ xmlFile="${torque.home}/${schemaDirectory}/${project}-schema.xml"
+ targetDatabase="${database}"
+ />
+
+ </target>
+
+ <!-- ================================================================ -->
<!-- J D B C TO X M L -->
<!-- ================================================================ -->
@@ -180,44 +214,6 @@
templatePath="${templatePath}"
outputFile="report.${project}.datadtd.generation"
xmlFile="${torque.home}/${schemaDirectory}/${project}-schema.xml"
- />
-
- </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"
- description="==> generates the SQL for your project">
-
- <echo message="+------------------------------------------+"/>
- <echo message="| |"/>
- <echo message="| Generating SQL for YOUR Turbine project! |"/>
- <echo message="| Woo hoo! |"/>
- <echo message="| |"/>
- <echo message="+------------------------------------------+"/>
-
- <taskdef
- name="torque-sql"
- classname="org.apache.torque.task.TorqueSQLTask">
- <classpath refid="classpath"/>
- </taskdef>
-
- <torque-sql
- contextProperties="${build.properties}"
- controlTemplate="${SQLControlTemplate}"
- outputDirectory="${torque.home}/${outputDirectory}/sql"
- templatePath="${templatePath}"
- outputFile="report.${project}.sql.generation"
- xmlFile="${torque.home}/${schemaDirectory}/${project}-schema.xml"
- targetDatabase="${database}"
/>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org