You are viewing a plain text version of this content. The canonical link for it is here.
Posted to tdk-dev@turbine.apache.org by jv...@apache.org on 2001/08/31 21:03:44 UTC
cvs commit: jakarta-turbine-tdk/src/share/sample30/build build.properties build.xml
jvanzyl 01/08/31 12:03:44
Modified: src/share/sample30/build build.properties build.xml
Log:
- change torque targets to use the templates inside the torque jar
Revision Changes Path
1.3 +9 -17 jakarta-turbine-tdk/src/share/sample30/build/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/share/sample30/build/build.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.properties 2001/08/29 04:29:31 1.2
+++ build.properties 2001/08/31 19:03:44 1.3
@@ -7,7 +7,7 @@
# in this file will override properties set anywhere else.
# -------------------------------------------------------------------
-project=@PROJECT@
+project=newapp
version=0.1
build.dest=../classes
@@ -36,7 +36,7 @@
# Default: none
# -------------------------------------------------------------------
-database=@DATABASE@
+database=mysql
#database.manual.creation = true
# -------------------------------------------------------------------
@@ -51,8 +51,8 @@
extend=TurbineMapBuilder
mapname=TurbineMap
suffix=MapBuilder
-targetPackage=@TARGET_PACKAGE@.om
-targetDirectory=@TARGET_DIRECTORY@/om
+targetPackage=org.mycompany.newapp.om
+targetDirectory=org/mycompany/newapp/om
addSaveMethod=true
addGetByNameMethod=false
complexObjectModel=true
@@ -75,12 +75,12 @@
# Note: either torque or HSQL is really touchy about extra spaces
# or other stuff after each line below.
#--------------------------------------------------------------------
-#databaseUrl=jdbc:HypersonicSQL:FULLPATH/@PROJECT@
+#databaseUrl=jdbc:HypersonicSQL:FULLPATH/newapp
#databaseDriver=org.hsql.jdbcDriver
#databaseUser=sa
#databasePassword=
-databaseUrl = jdbc:mysql://127.0.0.1/@PROJECT@
+databaseUrl = jdbc:mysql://127.0.0.1/newapp
databaseDriver = org.gjt.mm.mysql.Driver
databaseUser = user
databasePassword = password
@@ -92,14 +92,6 @@
# -------------------------------------------------------------------
#
-# T E M P L A T E P A T H
-#
-# -------------------------------------------------------------------
-
-templatePath = @TEMPLATE_PATH@
-
-# -------------------------------------------------------------------
-#
# C O N T R O L T E M P L A T E S
#
# -------------------------------------------------------------------
@@ -119,8 +111,8 @@
# are duplicated is due to a bug in Ant with the <exec> task.
# -------------------------------------------------------------------
-outputDirectory = @OUTPUT_DIRECTORY@
-fullPathOutputDirectory = @OUTPUT_DIRECTORY@
+outputDirectory = ../src
+fullPathOutputDirectory = ../src
# -------------------------------------------------------------------
#
@@ -128,4 +120,4 @@
#
# -------------------------------------------------------------------
-schemaDirectory = @SCHEMA_DIRECTORY@
+schemaDirectory = ../conf
1.6 +8 -8 jakarta-turbine-tdk/src/share/sample30/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/share/sample30/build/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 2001/08/29 04:29:31 1.5
+++ build.xml 2001/08/31 19:03:44 1.6
@@ -125,7 +125,7 @@
<torque-create-db
controlTemplate="sql/db-init/Control.vm"
outputDirectory="${outputDirectory}/sql"
- templatePath="${templatePath}"
+ useClasspath="true"
outputFile="${script}"
targetPlatform="${platform}"
targetDatabase="${database}"
@@ -163,7 +163,7 @@
contextProperties="${build.properties}"
controlTemplate="${SQLControlTemplate}"
outputDirectory="${outputDirectory}/sql"
- templatePath="${templatePath}"
+ useClasspath="true"
outputFile="report.${project}.sql.generation"
xmlFile="${schemaDirectory}/${project}-schema.xml"
targetDatabase="${database}"
@@ -192,7 +192,7 @@
contextProperties="${build.properties}"
controlTemplate="${OMControlTemplate}"
outputDirectory="${outputDirectory}/java"
- templatePath="${templatePath}"
+ useClasspath="true"
outputFile="report.${project}.om.generation"
targetPackage="${targetPackage}.om"
xmlFile="${schemaDirectory}/${project}-schema.xml"
@@ -229,7 +229,7 @@
<torque-sql
controlTemplate="${SQLControlTemplate}"
outputDirectory="${outputDirectory}/sql"
- templatePath="${templatePath}"
+ useClasspath="true"
outputFile="turbine-schema.sql"
xmlFile="${schemaDirectory}/turbine-schema.xml"
targetDatabase="${database}"
@@ -257,7 +257,7 @@
<torque-sql
controlTemplate="${SQLControlTemplate}"
outputDirectory="${outputDirectory}/sql"
- templatePath="${templatePath}"
+ useClasspath="true"
outputFile="id-table-schema.sql"
xmlFile="${schemaDirectory}/id-table-schema.xml"
targetDatabase="${database}"
@@ -282,7 +282,7 @@
contextProperties="bin/torque/templates/sql/id-table/turbine.props"
controlTemplate="${idTableControlTemplate}"
outputDirectory="${outputDirectory}/sql"
- templatePath="${templatePath}"
+ useClasspath="true"
outputFile="turbine-id-table-init.sql"
xmlFile="${schemaDirectory}/turbine-schema.xml"
targetDatabase="${database}"
@@ -307,7 +307,7 @@
contextProperties="bin/torque/templates/sql/id-table/project.props"
controlTemplate="${idTableControlTemplate}"
outputDirectory="${outputDirectory}/sql"
- templatePath="${templatePath}"
+ useClasspath="true"
outputFile="${project}-id-table-init.sql"
xmlFile="${schemaDirectory}/${project}-schema.xml"
targetDatabase="${database}"
@@ -333,7 +333,7 @@
contextProperties="bin/torque/templates/sql/id-table/project.props"
controlTemplate="${securityControlTemplate}"
outputDirectory="${outputDirectory}/sql"
- templatePath="${templatePath}"
+ useClasspath="true"
outputFile="turbine-security.sql"
xmlFile="${schemaDirectory}/${project}-schema.xml"
targetDatabase="${database}"
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-tdk-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-tdk-dev-help@jakarta.apache.org