stephenh 2002/07/27 23:31:12
Modified: src/conf default.properties
Log:
Minor organization and formatting changes.
Revision Changes Path
1.4 +74 -77 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- default.properties 25 Jul 2002 06:37:05 -0000 1.3
+++ default.properties 28 Jul 2002 06:31:12 -0000 1.4
@@ -1,73 +1,67 @@
+# -------------------------------------------------------------------
#
-# This file maps old properties (and their defaults) to the
+# D E F A U L T P R O P E R T I E S
+#
+# -------------------------------------------------------------------
+# This file maps old properties (and their default values) to the
# new properties to maintain backwards compatibility.
#
# Note: lib.dir/torque.lib.dir and build.properties/
-# torque.contextProperties are handled manually in
-# the build-torque.xml
+# torque.contextProperties are set manually in the build-torque.xml
+# file as they need to be defined before this file can be loaded from
+# the classpath.
#
-# Old properties that are commented out are just
-# place holders and could be removed other than they
-# help me know what I have and haven't changed.
+# Old properties that are commented out are just place holders to
+# help organize things.
+# -------------------------------------------------------------------
-#######################################
+# -------------------------------------------------------------------
#
# B A S I C P R O P E R T I E S
#
-#######################################
+# -------------------------------------------------------------------
torque.home = .
# project = bookstore
# database = postgresql
-idTableXMLFile =
-documentationFormat = html
-initialID = 101
+targetPackage = org.apache.torque
torque.project = ${project}
torque.database = ${database}
-torque.idTableXMLFile = ${idTableXMLFile}
-torque.doc.format = ${documentationFormat}
-torque.initialID = ${initialID}
+torque.targetPackage = ${targetPackage}
-#######################################
+
+# -------------------------------------------------------------------
#
# D I R E C T O R I E S
#
-#######################################
+# -------------------------------------------------------------------
outputDirectory = src
schemaDirectory = schema
+templatePath = templates
+useClasspath = false
torque.output.dir = ${torque.home}/${outputDirectory}
torque.schema.dir = ${torque.home}/${schemaDirectory}
+torque.templatePath = ${templatePath}
+torque.useClasspath = ${useClasspath}
torque.doc.dir = ${torque.output.dir}/doc
torque.java.dir = ${torque.output.dir}/java
torque.javadoc.dir = ${torque.output.dir}/javadoc
torque.ojb.dir = ${torque.output.dir}/ojb
torque.sql.dir = ${torque.output.dir}/sql
-torque.basezip.dir = ${torque.output.dir}
-
-#######################################
-#
-# P A T H S
-#
-#######################################
-
-templatePath = templates
-useClasspath = false
-
-torque.templatePath = ${templatePath}
-torque.useClasspath = ${useClasspath}
+torque.omzip.dir = ${torque.output.dir}
-#######################################
+# -------------------------------------------------------------------
#
# D A T A B A S E S E T T I N G S
#
-#######################################
+# -------------------------------------------------------------------
# createDatabaseUrl = jdbc:postgresql://127.0.0.1:5432/template1
# buildDatabaseUrl = jdbc:postgresql://127.0.0.1:5432/bookstore
@@ -79,7 +73,8 @@
# databaseSchema =
# databaseName =
-# database.manual.creation =
+database.manual.creation = false
+sameJavaName = false
torque.database.createUrl = ${createDatabaseUrl}
torque.database.buildUrl = ${buildDatabaseUrl}
@@ -92,13 +87,56 @@
torque.database.schema = ${databaseSchema}
torque.database.name = ${databaseName}
torque.database.manualCreation = ${database.manual.creation}
+torque.saveJavaName = ${sameJavaName}
+
+
+# -------------------------------------------------------------------
+#
+# T E M P L A T E V A R I A B L E S
+#
+# -------------------------------------------------------------------
+
+addGetByNameMethod = true
+addIntakeRetrievable = false
+addSaveMethod = true
+addTimeStamp = true
+basePrefix = Base
+complexObjectModel = true
+overloadKeySetters = true
+useManagers = false
+useClasspath = false
+
+torque.addGetByNameMethod = ${addGetByNameMethod}
+torque.addIntakeRetrievable = ${addIntakeRetrievable}
+torque.addSaveMethod = ${addSaveMethod}
+torque.addTimeStamp = ${addTimeStamp}
+torque.basePrefix = ${basePrefix}
+torque.complexObjectModel = ${complexObjectModel}
+torque.overloadKeySetters = ${overloadKeySetters}
+torque.useClasspath = ${useClasspath}
+torque.useManagers = ${useManagers}
+
+
+# -------------------------------------------------------------------
+#
+# M I S C . S E T T I N G S
+#
+# -------------------------------------------------------------------
+
+idTableXMLFile =
+documentationFormat = html
+initialID = 101
+
+torque.idTableXMLFile = ${idTableXMLFile}
+torque.doc.format = ${documentationFormat}
+torque.initialID = ${initialID}
-#######################################
+# -------------------------------------------------------------------
#
# C O N T R O L T E M P L A T E S
#
-#######################################
+# -------------------------------------------------------------------
SQLControlTemplate = sql/base/Control.vm
OMControlTemplate = om/Control.vm
@@ -120,11 +158,11 @@
torque.template.ojbModel = ojb/model/Control.vm
-#######################################
+# -------------------------------------------------------------------
#
# C O M P I L E S E T T I N G S
#
-#######################################
+# -------------------------------------------------------------------
src.dir = ${torque.java.dir}
build.dest = bin/classes
@@ -137,44 +175,3 @@
torque.compile.debug = ${debug}
torque.compile.deprecation = ${deprecation}
torque.compile.optimize = ${optimize}
-
-
-#######################################
-#
-# T E M P L A T E V A R I A B L E S
-#
-# Eventually, I'd like to see any variables that are used by
-# the templates specifically designated as so via a naming
-# convention such as torque.context.xxx.
-#
-# Then when Texen loads the contextProperites, it can
-# screen from torque.context.xxx and forget all the other
-# junk.
-#
-#######################################
-
-addGetByNameMethod = true
-addIntakeRetrievable = false
-addSaveMethod = true
-addTimeStamp = true
-basePrefix = Base
-complexObjectModel = true
-overloadKeySetters = true
-useManagers = false
-useClasspath = false
-targetPackage = org.apache.torque
-
-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}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
