db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Daniel Rall <...@collab.net>
Subject Re: cvs commit: db-torque/src/generator/src/conf default.properties
Date Tue, 09 Dec 2003 01:53:06 GMT
+1!  Gotta shout about this one in the change log.

mpoeschl@apache.org wrote:
> mpoeschl    2003/12/07 05:23:59
> 
>   Modified:    src/maven-plugin plugin.properties
>                xdocs    changes.xml
>                src/generator/src/conf default.properties
>   Log:
>   drop support for old properties
>   
>   Revision  Changes    Path
>   1.5       +46 -93    db-torque/src/maven-plugin/plugin.properties
>   
>   Index: plugin.properties
>   ===================================================================
>   RCS file: /home/cvs/db-torque/src/maven-plugin/plugin.properties,v
>   retrieving revision 1.4
>   retrieving revision 1.5
>   diff -u -r1.4 -r1.5
>   --- plugin.properties	23 Oct 2003 10:19:48 -0000	1.4
>   +++ plugin.properties	7 Dec 2003 13:23:59 -0000	1.5
>   @@ -14,13 +14,9 @@
>    #
>    # -------------------------------------------------------------------
>    
>   -project = torque
>   -# database = postgresql
>   -targetPackage = org.apache.torque
>   -
>   -torque.project = ${project}
>   -torque.database = ${database}
>   -torque.targetPackage = ${targetPackage}
>   +torque.project = torque
>   +#torque.database = postgresql
>   +torque.targetPackage = org.apache.torque
>    torque.runOnlyOnSchemaChange = true
>    
>    # -------------------------------------------------------------------
>   @@ -29,13 +25,9 @@
>    #
>    # -------------------------------------------------------------------
>    
>   -outputDirectory = ${maven.build.dest}
>   -schemaDirectory = ${maven.src.dir}/schema
>   -templatePath = ${maven.src.dir}/torqueTemplates
>   -
>   -torque.output.dir = ${outputDirectory}
>   -torque.schema.dir = ${schemaDirectory}
>   -torque.templatePath = ${templatePath}
>   +torque.output.dir = ${maven.build.dest}
>   +torque.schema.dir = ${maven.src.dir}/schema
>   +torque.templatePath = ${maven.src.dir}/torqueTemplates
>    
>    torque.doc.dir = ${torque.output.dir}/doc/schema
>    torque.java.dir = ${maven.src.dir}/java
>   @@ -43,39 +35,24 @@
>    torque.sql.dir = ${torque.output.dir}/sql
>    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
>   -# databaseUrl = jdbc:postgresql://127.0.0.1:5432/bookstore
>   -# databaseDriver = org.postgresql.Driver
>   -# databaseUser = jvanzyl
>   -# databasePassword =
>   -# databaseHost = 127.0.0.1
>   -
>   -# databaseSchema =
>   -# databaseName =
>   -database.manual.creation = false
>   -sameJavaName = false
>   -
>   -torque.database.createUrl = ${createDatabaseUrl}
>   -torque.database.buildUrl = ${buildDatabaseUrl}
>   -torque.database.url = ${databaseUrl}
>   -torque.database.driver = ${databaseDriver}
>   -torque.database.user = ${databaseUser}
>   -torque.database.password = ${databasePassword}
>   -torque.database.host = ${databaseHost}
>   -
>   -torque.database.schema = ${databaseSchema}
>   -torque.database.name = ${databaseName}
>   -torque.database.manualCreation = ${database.manual.creation}
>   -torque.saveJavaName = ${sameJavaName}
>   -
>   +#torque.database.createUrl = jdbc:postgresql://127.0.0.1:5432/template1
>   +#torque.database.buildUrl = jdbc:postgresql://127.0.0.1:5432/bookstore
>   +#torque.database.url = jdbc:postgresql://127.0.0.1:5432/bookstore
>   +#torque.database.driver = org.postgresql.Driver
>   +#torque.database.user = username
>   +#torque.database.password = password
>   +#torque.database.host = 127.0.0.1
>   +
>   +#torque.database.schema =
>   +#torque.database.name =
>   +torque.database.manualCreation = false
>   +torque.saveJavaName = false
>    
>    # -------------------------------------------------------------------
>    #
>   @@ -83,25 +60,17 @@
>    #
>    # -------------------------------------------------------------------
>    
>   -addGetByNameMethod = true
>   -addIntakeRetrievable = false
>   -addSaveMethod = true
>   -addTimeStamp = true
>   -basePrefix = Base
>   -complexObjectModel = true
>   -useManagers = false
>   -useClasspath = true
>   -
>   -torque.addGetByNameMethod = ${addGetByNameMethod}
>   -torque.addIntakeRetrievable = ${addIntakeRetrievable}
>   +torque.addGetByNameMethod = true
>   +torque.addIntakeRetrievable = false
>    torque.retrievableInterface = org.apache.turbine.om.Retrievable
>   -torque.addSaveMethod = ${addSaveMethod}
>   -torque.addTimeStamp = ${addTimeStamp}
>   -torque.basePrefix = ${basePrefix}
>   -torque.complexObjectModel = ${complexObjectModel}
>   +torque.addSaveMethod = true
>   +torque.addTimeStamp = true
>   +torque.basePrefix = Base
>   +torque.complexObjectModel = true
>    torque.saveException = Exception
>   -torque.useClasspath = ${useClasspath}
>   -torque.useManagers = ${useManagers}
>   +torque.useClasspath = true
>   +torque.useManagers = false
>   +torque.objectIsCaching = true
>    
>    torque.omzip.src.base = false
>    torque.omzip.src.extension = false
>   @@ -117,16 +86,16 @@
>    #
>    # -------------------------------------------------------------------
>    
>   -idTableXMLFile =
>   -documentationFormat = html
>   -initialID = 101
>   +# ID Broker Default Values
>   +torque.idTableXMLFile = 
>   +torque.initialID = 101
>   +torque.initialIDValue = 1000
>   +torque.initialIDStep  = 10
>    
>   -torque.idTableXMLFile = ${idTableXMLFile}
>   -torque.doc.format = ${documentationFormat}
>   +# Doc settings
>   +torque.doc.format = html
>    torque.doc.html.normalFont = font-family: Verdana; font-size: 10pt;
>    torque.doc.html.fkColor = afe295
>   -torque.initialID = ${initialID}
>   -
>    
>    # -------------------------------------------------------------------
>    #
>   @@ -134,44 +103,28 @@
>    #
>    # -------------------------------------------------------------------
>    
>   -SQLControlTemplate = sql/base/Control.vm
>   -OMControlTemplate = om/Control.vm
>   -idTableControlTemplate = sql/id-table/Control.vm
>   -DataDTDControlTemplate = data/Control.vm
>   -DataDumpControlTemplate = data/dump/Control.vm
>   -DataSQLControlTemplate = sql/load/Control.vm
>   -DocControlTemplate = doc/Control.vm
>   -
>   -torque.template.sql = ${SQLControlTemplate}
>   -torque.template.om = ${OMControlTemplate}
>   -torque.template.idTable = ${idTableControlTemplate}
>   -torque.template.dataDtd = ${DataDTDControlTemplate}
>   -torque.template.dataDump = ${DataDumpControlTemplate}
>   -torque.template.dataSql = ${DataSQLControlTemplate}
>   -torque.template.doc = ${DocControlTemplate}
>   +torque.template.sql = sql/base/Control.vm
>   +torque.template.om = om/Control.vm
>   +torque.template.idTable = sql/id-table/Control.vm
>   +torque.template.dataDtd = data/Control.vm
>   +torque.template.dataDump = data/dump/Control.vm
>   +torque.template.dataSql = sql/load/Control.vm
>   +torque.template.doc = doc/Control.vm
>    torque.template.sqlDbInit = sql/db-init/Control.vm
>    torque.template.ojb = ojb/repository/Control.vm
>    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
>   -debug = on
>   -deprecation = off
>   -optimize = off
>   -
>   -torque.compile.src.dir = ${src.dir}
>   -torque.compile.build.dir = ${build.dest}
>   -torque.compile.debug = ${debug}
>   -torque.compile.deprecation = ${deprecation}
>   -torque.compile.optimize = ${optimize}
>   -
>   +torque.compile.src.dir = ${torque.java.dir}
>   +torque.compile.build.dir = $bin/classes
>   +torque.compile.debug = on
>   +torque.compile.deprecation = off
>   +torque.compile.optimize = off
>    
>    # -------------------------------------------------------------------
>    #
>   
>   
>   
>   1.120     +3 -0      db-torque/xdocs/changes.xml
>   
>   Index: changes.xml
>   ===================================================================
>   RCS file: /home/cvs/db-torque/xdocs/changes.xml,v
>   retrieving revision 1.119
>   retrieving revision 1.120
>   diff -u -r1.119 -r1.120
>   --- changes.xml	5 Dec 2003 05:04:37 -0000	1.119
>   +++ changes.xml	7 Dec 2003 13:23:59 -0000	1.120
>   @@ -10,6 +10,9 @@
>        <release version="3.2-alpha" date="in CVS">
>    
>          <action dev='mpoeschl' type='remove'>
>   +        Remove support for old properties (properties without 'torque.' prefix)
>   +      </action>
>   +      <action dev='mpoeschl' type='remove'>
>            Remove support for idMethod=sequence and autoincrement.
>          </action>
>          <action dev='mpoeschl' type='add'>
>   
>   
>   
>   1.6       +43 -99    db-torque/src/generator/src/conf/default.properties
>   
>   Index: default.properties
>   ===================================================================
>   RCS file: /home/cvs/db-torque/src/generator/src/conf/default.properties,v
>   retrieving revision 1.5
>   retrieving revision 1.6
>   diff -u -r1.5 -r1.6
>   --- default.properties	9 Oct 2003 01:33:22 -0000	1.5
>   +++ default.properties	7 Dec 2003 13:23:59 -0000	1.6
>   @@ -10,9 +10,6 @@
>    # 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 to
>   -# help organize things.
>    # -------------------------------------------------------------------
>    
>    
>   @@ -24,13 +21,9 @@
>    
>    torque.home = .
>    
>   -# project = bookstore
>   -# database = postgresql
>   -targetPackage = org.apache.torque
>   -
>   -torque.project = ${project}
>   -torque.database = ${database}
>   -torque.targetPackage = ${targetPackage}
>   +#torque.project = ${project}
>   +#torque.database = ${database}
>   +torque.targetPackage = org.apache.torque
>    torque.runOnlyOnSchemaChange = false
>    
>    # -------------------------------------------------------------------
>   @@ -39,15 +32,10 @@
>    #
>    # -------------------------------------------------------------------
>    
>   -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.output.dir = ${torque.home}/src
>   +torque.schema.dir = ${torque.home}/schema
>   +torque.templatePath = templates
>   +torque.useClasspath = false
>    
>    torque.doc.dir = ${torque.output.dir}/doc
>    torque.java.dir = ${torque.output.dir}/java
>   @@ -63,31 +51,18 @@
>    #
>    # -------------------------------------------------------------------
>    
>   -# createDatabaseUrl = jdbc:postgresql://127.0.0.1:5432/template1
>   -# buildDatabaseUrl = jdbc:postgresql://127.0.0.1:5432/bookstore
>   -# databaseUrl = jdbc:postgresql://127.0.0.1:5432/bookstore
>   -# databaseDriver = org.postgresql.Driver
>   -# databaseUser = jvanzyl
>   -# databasePassword =
>   -# databaseHost = 127.0.0.1
>   -
>   -# databaseSchema =
>   -# databaseName =
>   -database.manual.creation = false
>   -sameJavaName = false
>   -
>   -torque.database.createUrl = ${createDatabaseUrl}
>   -torque.database.buildUrl = ${buildDatabaseUrl}
>   -torque.database.url = ${databaseUrl}
>   -torque.database.driver = ${databaseDriver}
>   -torque.database.user = ${databaseUser}
>   -torque.database.password = ${databasePassword}
>   -torque.database.host = ${databaseHost}
>   -
>   -torque.database.schema = ${databaseSchema}
>   -torque.database.name = ${databaseName}
>   -torque.database.manualCreation = ${database.manual.creation}
>   -torque.saveJavaName = ${sameJavaName}
>   +#torque.database.createUrl = jdbc:postgresql://127.0.0.1:5432/template1
>   +#torque.database.buildUrl = jdbc:postgresql://127.0.0.1:5432/bookstore
>   +#torque.database.url = jdbc:postgresql://127.0.0.1:5432/bookstore
>   +#torque.database.driver = org.postgresql.Driver
>   +#torque.database.user = username
>   +#torque.database.password = password
>   +#torque.database.host = 127.0.0.1
>   +
>   +#torque.database.schema = ${databaseSchema}
>   +#torque.database.name = ${databaseName}
>   +torque.database.manualCreation = false
>   +torque.saveJavaName = false
>    
>    
>    # -------------------------------------------------------------------
>   @@ -96,27 +71,17 @@
>    #
>    # -------------------------------------------------------------------
>    
>   -addGetByNameMethod = true
>   -addIntakeRetrievable = false
>   -addSaveMethod = true
>   -addTimeStamp = true
>   -basePrefix = Base
>   -complexObjectModel = true
>   -useManagers = false
>   -useClasspath = false
>   -objectIsCaching = true
>   -
>   -torque.addGetByNameMethod = ${addGetByNameMethod}
>   -torque.addIntakeRetrievable = ${addIntakeRetrievable}
>   +torque.addGetByNameMethod = true
>   +torque.addIntakeRetrievable = false
>    torque.retrievableInterface = org.apache.turbine.om.Retrievable
>   -torque.addSaveMethod = ${addSaveMethod}
>   -torque.addTimeStamp = ${addTimeStamp}
>   -torque.basePrefix = ${basePrefix}
>   -torque.complexObjectModel = ${complexObjectModel}
>   +torque.addSaveMethod = true
>   +torque.addTimeStamp = true
>   +torque.basePrefix = Base
>   +torque.complexObjectModel = true
>    torque.saveException = Exception
>   -torque.useClasspath = ${useClasspath}
>   +torque.useClasspath = false
>    # Whether to generate Manager classes for JCS-based caching.
>   -torque.useManagers = ${useManagers}
>   +torque.useManagers = false
>    torque.objectIsCaching = true
>    
>    torque.omzip.src.base = false
>   @@ -133,22 +98,16 @@
>    #
>    # -------------------------------------------------------------------
>    
>   -idTableXMLFile =
>   -documentationFormat = html
>   -
>   -#
>    # ID Broker Default Values
>   -#
>   -initialID      = 101
>   +torque.idTableXMLFile = 
>   +torque.initialID = 101
>    torque.initialIDValue = 1000
>    torque.initialIDStep  = 10
>    
>   -torque.idTableXMLFile = ${idTableXMLFile}
>   -torque.doc.format = ${documentationFormat}
>   +# Doc settings
>   +torque.doc.format = html
>    torque.doc.html.normalFont = font-family: Verdana; font-size: 10pt;
>    torque.doc.html.fkColor = afe295
>   -torque.initialID = ${initialID}
>   -
>    
>    # -------------------------------------------------------------------
>    #
>   @@ -156,21 +115,13 @@
>    #
>    # -------------------------------------------------------------------
>    
>   -SQLControlTemplate = sql/base/Control.vm
>   -OMControlTemplate = om/Control.vm
>   -idTableControlTemplate = sql/id-table/Control.vm
>   -DataDTDControlTemplate = data/Control.vm
>   -DataDumpControlTemplate = data/dump/Control.vm
>   -DataSQLControlTemplate = sql/load/Control.vm
>   -DocControlTemplate = doc/Control.vm
>   -
>   -torque.template.sql = ${SQLControlTemplate}
>   -torque.template.om = ${OMControlTemplate}
>   -torque.template.idTable = ${idTableControlTemplate}
>   -torque.template.dataDtd = ${DataDTDControlTemplate}
>   -torque.template.dataDump = ${DataDumpControlTemplate}
>   -torque.template.dataSql = ${DataSQLControlTemplate}
>   -torque.template.doc = ${DocControlTemplate}
>   +torque.template.sql = sql/base/Control.vm
>   +torque.template.om = om/Control.vm
>   +torque.template.idTable = sql/id-table/Control.vm
>   +torque.template.dataDtd = data/Control.vm
>   +torque.template.dataDump = data/dump/Control.vm
>   +torque.template.dataSql = sql/load/Control.vm
>   +torque.template.doc = doc/Control.vm
>    torque.template.sqlDbInit = sql/db-init/Control.vm
>    torque.template.ojb = ojb/repository/Control.vm
>    torque.template.ojbModel = ojb/model/Control.vm
>   @@ -182,18 +133,11 @@
>    #
>    # -------------------------------------------------------------------
>    
>   -src.dir = ${torque.java.dir}
>   -build.dest = bin/classes
>   -debug = on
>   -deprecation = off
>   -optimize = off
>   -
>   -torque.compile.src.dir = ${src.dir}
>   -torque.compile.build.dir = ${build.dest}
>   -torque.compile.debug = ${debug}
>   -torque.compile.deprecation = ${deprecation}
>   -torque.compile.optimize = ${optimize}
>   -
>   +torque.compile.src.dir = ${torque.java.dir}
>   +torque.compile.build.dir = bin/classes
>   +torque.compile.debug = on
>   +torque.compile.deprecation = off
>   +torque.compile.optimize = off



---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org


Mime
View raw message