stephenh 2002/07/24 23:37:05
Modified: src/conf default.properties build-torque.xml
Log:
Finished moving to torque.xxx naming.
Revision Changes Path
1.3 +22 -16 jakarta-turbine-torque/src/conf/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/conf/default.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- default.properties 25 Jul 2002 06:01:44 -0000 1.2
+++ default.properties 25 Jul 2002 06:37:05 -0000 1.3
@@ -77,6 +77,10 @@
# databasePassword =
# databaseHost = 127.0.0.1
+# databaseSchema =
+# databaseName =
+# database.manual.creation =
+
torque.database.createUrl = ${createDatabaseUrl}
torque.database.buildUrl = ${buildDatabaseUrl}
torque.database.url = ${databaseUrl}
@@ -85,6 +89,10 @@
torque.database.password = ${databasePassword}
torque.database.host = ${databaseHost}
+torque.database.schema = ${databaseSchema}
+torque.database.name = ${databaseName}
+torque.database.manualCreation = ${database.manual.creation}
+
#######################################
#
@@ -156,19 +164,17 @@
useClasspath = false
targetPackage = org.apache.torque
-# torque.context.addGetByNameMethod = ${addGetByNameMethod}
-# torque.context.addIntakeRetrievable = ${addIntakeRetrievable}
-# torque.context.addSaveMethod = ${addSaveMethod}
-# torque.context.addTimeStamp = ${addTimeStamp}
-# torque.context.basePrefix = ${basePrefix}
-# torque.context.complexObjectModel = ${complexObjectModel}
-# torque.context.overloadKeySetters = ${overloadKeySetters}
-# torque.context.useManagers = ${useManagers}
-# torque.context.useClasspath = ${useClasspath}
-# torque.context.targetPackage = ${targetPackage}
-
-#### Left ####
-# database.manual.creation
-# databaseSchema
-# dababaseName
-# buildDatabaseUrl
\ No newline at end of file
+sameJavaName = false
+
+torque.addGetByNameMethod = ${addGetByNameMethod}
+torque.addIntakeRetrievable = ${addIntakeRetrievable}
+torque.addSaveMethod = ${addSaveMethod}
+torque.addTimeStamp = ${addTimeStamp}
+torque.basePrefix = ${basePrefix}
+torque.complexObjectModel = ${complexObjectModel}
+torque.overloadKeySetters = ${overloadKeySetters}
+torque.useManagers = ${useManagers}
+torque.useClasspath = ${useClasspath}
+torque.targetPackage = ${targetPackage}
+
+torque.saveJavaName = ${sameJavaName}
1.40 +13 -6 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.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- build-torque.xml 25 Jul 2002 06:01:44 -0000 1.39
+++ build-torque.xml 25 Jul 2002 06:37:05 -0000 1.40
@@ -228,9 +228,16 @@
<!-- that is capable of performing the task. -->
<!-- ================================================================ -->
+ <target name="create-db-check">
+ <condition property="torque.internal.manualCreation">
+ <equals arg1="${torque.database.manualCreation}" arg2="true"/>
+ </condition>
+ </target>
+
<target
name="create-db"
- unless="database.manual.creation"
+ unless="torque.internal.manualCreation"
+ depends="create-db-check"
description="==> generates the target database">
<torque-data-model
@@ -299,11 +306,11 @@
<torque-jdbc-transform
dbDriver="${torque.database.driver}"
dbPassword="${torque.database.password}"
- dbSchema="${databaseSchema}"
+ dbSchema="${torque.database.schema}"
dbUrl="${torque.database.url}"
dbUser="${torque.database.user}"
outputFile="${torque.schema.dir}/schema.xml"
- sameJavaName="${sameJavaName}"
+ sameJavaName="${torque.sameJavaName}"
/>
</target>
@@ -387,7 +394,7 @@
contextProperties="${torque.contextProperties}"
controlTemplate="${torque.template.dataDump}"
databaseDriver="${torque.database.driver}"
- databaseName="${databaseName}"
+ databaseName="${torque.database.name}"
databaseUrl="${torque.database.url}"
databaseUser="${torque.database.user}"
databasePassword="${torque.database.password}"
@@ -498,13 +505,13 @@
<jar
jarfile="${torque.basezip.dir}/${torque.project}-om-base.jar"
basedir="${torque.java.dir}"
- includes="${targetPackage}/${basePrefix}*.java"
+ includes="${torque.targetPackage}/${torque.basePrefix}*.java"
/>
<delete>
<fileset
dir="${torque.java.dir}"
- includes="${targetPackage}/${basePrefix}*.java"
+ includes="${torque.targetPackage}/${torque.basePrefix}*.java"
/>
</delete>
</target>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
