You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ojb-dev@db.apache.org by ar...@apache.org on 2007/03/23 23:19:37 UTC

svn commit: r521923 - /db/ojb/trunk/profile/

Author: arminw
Date: Fri Mar 23 15:19:35 2007
New Revision: 521923

URL: http://svn.apache.org/viewvc?view=rev&rev=521923
Log:
update, cleanup profiles

Modified:
    db/ojb/trunk/profile/db2.profile
    db/ojb/trunk/profile/derby.profile
    db/ojb/trunk/profile/firebird.profile
    db/ojb/trunk/profile/hsqldb.profile
    db/ojb/trunk/profile/informix.profile
    db/ojb/trunk/profile/maxdb.profile
    db/ojb/trunk/profile/mckoi.profile
    db/ojb/trunk/profile/msaccess.profile
    db/ojb/trunk/profile/mssqldb-JSQLConnect.profile
    db/ojb/trunk/profile/mssqldb-Opta2000.profile
    db/ojb/trunk/profile/mssqldb-ms.profile
    db/ojb/trunk/profile/mssqldb.profile
    db/ojb/trunk/profile/mysql.profile
    db/ojb/trunk/profile/oracle.profile
    db/ojb/trunk/profile/oracle9i.profile
    db/ojb/trunk/profile/postgresql.profile
    db/ojb/trunk/profile/sapdb.profile
    db/ojb/trunk/profile/sybase.profile

Modified: db/ojb/trunk/profile/db2.profile
URL: http://svn.apache.org/viewvc/db/ojb/trunk/profile/db2.profile?view=diff&rev=521923&r1=521922&r2=521923
==============================================================================
--- db/ojb/trunk/profile/db2.profile (original)
+++ db/ojb/trunk/profile/db2.profile Fri Mar 23 15:19:35 2007
@@ -15,64 +15,13 @@
 # */
 #-->
 # location of jar that you will be using for testing
-# so that it can be copied into the dist/lib directory.
+# so that it can be copied into the /lib directory.
 
-torque.testDatabaseJar = ${lib.repo}/db2classes.zip
-torque.idMethod = idbroker
-torque.defaultDatabase = OJB
-
-# -------------------------------------------------------------------
-#
-# T O R Q U E  C O N F I G U R A T I O N  F I L E
-#
-# -------------------------------------------------------------------
-
-# -------------------------------------------------------------------
-#
-#  T A R G E T  D A T A B A S E
-#
-# -------------------------------------------------------------------
-
-torque.database=db2
-
-# -------------------------------------------------------------------
-#
-#  O B J E C T  M O D E L  I N F O R M A T I O N
-#
-# -------------------------------------------------------------------
-# These settings will allow you to customize the way your
-# Peer-based object model is created.
 # -------------------------------------------------------------------
-# addSaveMethod=true adds tracking code to determine how to save objects
 #
-# addGetByNameMethod=true adds methods to get fields by name/position
-#
-# complexObjectModel=true generates an om with collection support
-#
-# addTimeStamp=true puts time stamps in generated files
-#
-# addIntakeRetrievable=implement Intake's Retrievable interface
-# -------------------------------------------------------------------
-
-targetPackage=org.apache.torque.test
-basePrefix=Base
-addSaveMethod=true
-addGetByNameMethod=true
-complexObjectModel=true
-addTimeStamp=true
-addIntakeRetrievable=false
-useManagers=true
-
-# -------------------------------------------------------------------
-#
-#  D A T A B A S E  S E T T I N G S
+#  O J B  S E T T I N G S
 #
 # -------------------------------------------------------------------
-# JDBC connection settings. This is used by the JDBCToXML task that
-# will create an XML database schema from JDBC metadata. These
-# settings are also used by the SQL Ant task to initialize your
-# Turbine system with the generated SQL.
-# -------------------------------------------------------------------
 
 dbmsName = Db2
 jdbcLevel = 1.0
@@ -81,71 +30,26 @@
 urlDbalias = OJB
 
 
-#
-# settings for torque 3.1.1
-#
-torque.database.createUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
-torque.database.buildUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
-torque.database.url = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
-torque.database.driver = COM.ibm.db2.jdbc.app.DB2Driver
-torque.database.user = admin
-torque.database.password = db2
-torque.database.host = 127.0.0.1
-
-
-# Tells JDBC task that javaName attribute for the tables and columns
-# should be made same as SQL name.
-sameJavaName=false
-
-# -------------------------------------------------------------------
-#
-#  D O C U M E N T A T I O N   S E T T I N G S
-#
-# -------------------------------------------------------------------
-# These settings will allow you to customize the way your schema
-# documentation is created.
-# Valid formats are: html, anakia (for use with jakarta-site2)
-# -------------------------------------------------------------------
-documentationFormat=html
-
-# -------------------------------------------------------------------
-# You should NOT have to edit anything below here.
-# -------------------------------------------------------------------
-
-# -------------------------------------------------------------------
-#
-#  T E M P L A T E  P A T H
-#
-# -------------------------------------------------------------------
-
-templatePath = ../templates
-
 # -------------------------------------------------------------------
 #
-#  C O N T R O L  T E M P L A T E S
+# D D L U T I L S  S E T T I N G S
 #
 # -------------------------------------------------------------------
 
-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
-
-# -------------------------------------------------------------------
-#
-#  O U T P U T  D I R E C T O R Y
-#
-# -------------------------------------------------------------------
+#ddlutils.shutdownDatabase = false
 
-outputDirectory=src
 
 # -------------------------------------------------------------------
 #
-#  S C H E M A  D I R E C T O R Y
+# T O R Q U E  S E T T I N G S
 #
 # -------------------------------------------------------------------
 
-schemaDirectory=schema
+torque.database = db2
+torque.database.createUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
+torque.database.buildUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
+torque.database.url = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
+torque.database.driver = COM.ibm.db2.jdbc.app.DB2Driver
+torque.database.host = 127.0.0.1
+torque.database.user = admin
+torque.database.password = db2

Modified: db/ojb/trunk/profile/derby.profile
URL: http://svn.apache.org/viewvc/db/ojb/trunk/profile/derby.profile?view=diff&rev=521923&r1=521922&r2=521923
==============================================================================
--- db/ojb/trunk/profile/derby.profile (original)
+++ db/ojb/trunk/profile/derby.profile Fri Mar 23 15:19:35 2007
@@ -15,64 +15,13 @@
 # */
 #-->
 # location of jar that you will be using for testing
-# so that it can be copied into the dist/lib directory.
-
-torque.testDatabaseJar = ${lib.repo}/derby.jar
-torque.idMethod = idbroker
-torque.defaultDatabase = OJB
-
-# -------------------------------------------------------------------
-#
-# T O R Q U E  C O N F I G U R A T I O N  F I L E
-#
-# -------------------------------------------------------------------
-
-# -------------------------------------------------------------------
-#
-#  T A R G E T  D A T A B A S E
-#
-# -------------------------------------------------------------------
-
-torque.database = db2
-
-# -------------------------------------------------------------------
-#
-#  O B J E C T  M O D E L  I N F O R M A T I O N
-#
-# -------------------------------------------------------------------
-# These settings will allow you to customize the way your
-# Peer-based object model is created.
-# -------------------------------------------------------------------
-# addSaveMethod=true adds tracking code to determine how to save objects
-#
-# addGetByNameMethod=true adds methods to get fields by name/position
-#
-# complexObjectModel=true generates an om with collection support
-#
-# addTimeStamp=true puts time stamps in generated files
-#
-# addIntakeRetrievable=implement Intake's Retrievable interface
-# -------------------------------------------------------------------
-
-targetPackage=org.apache.torque.test
-basePrefix=Base
-addSaveMethod=true
-addGetByNameMethod=true
-complexObjectModel=true
-addTimeStamp=true
-addIntakeRetrievable=false
-useManagers=true
+# so that it can be copied into the /lib directory.
 
 # -------------------------------------------------------------------
 #
-#  D A T A B A S E  S E T T I N G S
+#  O J B  S E T T I N G S
 #
 # -------------------------------------------------------------------
-# JDBC connection settings. This is used by the JDBCToXML task that
-# will create an XML database schema from JDBC metadata. These
-# settings are also used by the SQL Ant task to initialize your
-# Turbine system with the generated SQL.
-# -------------------------------------------------------------------
 
 dbmsName = Derby
 jdbcLevel = 3.0
@@ -82,76 +31,27 @@
 urlDbalias = //localhost/OJB
 
 
-#
-# settings for torque 3.1.1
-#
-torque.database.createUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
-torque.database.buildUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
-torque.database.url = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
-torque.database.host = 127.0.0.1
-
-#torque.database.driver = org.apache.derby.jdbc.EmbeddedDriver
-#torque.database.user = app
-#torque.database.password = 
-
-torque.database.driver = org.apache.derby.jdbc.ClientDriver
-torque.database.user = ojb
-torque.database.password = ojb
-
-
-# Tells JDBC task that javaName attribute for the tables and columns
-# should be made same as SQL name.
-sameJavaName=false
-
-# -------------------------------------------------------------------
-#
-#  D O C U M E N T A T I O N   S E T T I N G S
-#
-# -------------------------------------------------------------------
-# These settings will allow you to customize the way your schema
-# documentation is created.
-# Valid formats are: html, anakia (for use with jakarta-site2)
-# -------------------------------------------------------------------
-documentationFormat=html
-
-# -------------------------------------------------------------------
-# You should NOT have to edit anything below here.
-# -------------------------------------------------------------------
-
-# -------------------------------------------------------------------
-#
-#  T E M P L A T E  P A T H
-#
-# -------------------------------------------------------------------
-
-templatePath = ../templates
-
 # -------------------------------------------------------------------
 #
-#  C O N T R O L  T E M P L A T E S
+# D D L U T I L S  S E T T I N G S
 #
 # -------------------------------------------------------------------
 
-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
-
-# -------------------------------------------------------------------
-#
-#  O U T P U T  D I R E C T O R Y
-#
-# -------------------------------------------------------------------
+#ddlutils.shutdownDatabase = false
 
-outputDirectory=src
 
 # -------------------------------------------------------------------
 #
-#  S C H E M A  D I R E C T O R Y
+# T O R Q U E  S E T T I N G S
 #
 # -------------------------------------------------------------------
 
-schemaDirectory=schema
+torque.database = derby
+torque.database.createUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
+torque.database.buildUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
+torque.database.url = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
+#torque.database.driver = org.apache.derby.jdbc.EmbeddedDriver
+torque.database.driver = org.apache.derby.jdbc.ClientDriver
+torque.database.host = 127.0.0.1
+torque.database.user = ojb
+torque.database.password = ojb

Modified: db/ojb/trunk/profile/firebird.profile
URL: http://svn.apache.org/viewvc/db/ojb/trunk/profile/firebird.profile?view=diff&rev=521923&r1=521922&r2=521923
==============================================================================
--- db/ojb/trunk/profile/firebird.profile (original)
+++ db/ojb/trunk/profile/firebird.profile Fri Mar 23 15:19:35 2007
@@ -14,27 +14,43 @@
 # * limitations under the License.
 # */
 #-->
+# location of jar that you will be using for testing
+# so that it can be copied into the /lib directory.
 
+# -------------------------------------------------------------------
 #
-# Firebird is not supported by Torque (at least not by the version that comes with OJB)
-# but only by the commons-sql database handling
-# Therefore this profile does not contain Torque properties
+#  O J B  S E T T I N G S
 #
+# -------------------------------------------------------------------
 
-dbmsName = Firebird
+dbmsName = MaxDB
 jdbcLevel = 3.0
 urlProtocol = jdbc
 urlSubprotocol = firebirdsql
 urlDbalias = localhost/3050:OJB.gdb
 
+
+# -------------------------------------------------------------------
+#
+# D D L U T I L S  S E T T I N G S
+#
+# -------------------------------------------------------------------
+
+#ddlutils.shutdownDatabase = false
+
+
+# -------------------------------------------------------------------
 #
-# settings for torque 3.1.1
+# T O R Q U E  S E T T I N G S
 #
+# -------------------------------------------------------------------
+
+# not supported by torque
+#torque.database = firebird
 torque.database.createUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
 torque.database.buildUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
 torque.database.url = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
 torque.database.driver = org.firebirdsql.jdbc.FBDriver
+torque.database.host = 127.0.0.1
 torque.database.user = sysdba
 torque.database.password = masterkey
-torque.database.host = 127.0.0.1
-

Modified: db/ojb/trunk/profile/hsqldb.profile
URL: http://svn.apache.org/viewvc/db/ojb/trunk/profile/hsqldb.profile?view=diff&rev=521923&r1=521922&r2=521923
==============================================================================
--- db/ojb/trunk/profile/hsqldb.profile (original)
+++ db/ojb/trunk/profile/hsqldb.profile Fri Mar 23 15:19:35 2007
@@ -15,64 +15,13 @@
 # */
 #-->
 # location of jar that you will be using for testing
-# so that it can be copied into the dist/lib directory.
+# so that it can be copied into the /lib directory.
 
-torque.testDatabaseJar = ${lib.repo}/hsqldb.jar
-torque.idMethod = idbroker
-torque.defaultDatabase = bookstore
-
-# -------------------------------------------------------------------
-#
-# T O R Q U E  C O N F I G U R A T I O N  F I L E
-#
-# -------------------------------------------------------------------
-
-# -------------------------------------------------------------------
-#
-#  T A R G E T  D A T A B A S E
-#
-# -------------------------------------------------------------------
-
-torque.database=hypersonic
-
-# -------------------------------------------------------------------
-#
-#  O B J E C T  M O D E L  I N F O R M A T I O N
-#
-# -------------------------------------------------------------------
-# These settings will allow you to customize the way your
-# Peer-based object model is created.
 # -------------------------------------------------------------------
-# addSaveMethod=true adds tracking code to determine how to save objects
 #
-# addGetByNameMethod=true adds methods to get fields by name/position
-#
-# complexObjectModel=true generates an om with collection support
-#
-# addTimeStamp=true puts time stamps in generated files
-#
-# addIntakeRetrievable=implement Intake's Retrievable interface
-# -------------------------------------------------------------------
-
-targetPackage=org.apache.torque.test
-basePrefix=Base
-addSaveMethod=true
-addGetByNameMethod=true
-complexObjectModel=true
-addTimeStamp=true
-addIntakeRetrievable=false
-useManagers=true
-
-# -------------------------------------------------------------------
-#
-#  D A T A B A S E  S E T T I N G S
+#  O J B  S E T T I N G S
 #
 # -------------------------------------------------------------------
-# JDBC connection settings. This is used by the JDBCToXML task that
-# will create an XML database schema from JDBC metadata. These
-# settings are also used by the SQL Ant task to initialize your
-# Turbine system with the generated SQL.
-# -------------------------------------------------------------------
 
 dbmsName = Hsqldb
 jdbcLevel = 2.0
@@ -80,71 +29,28 @@
 urlSubprotocol = hsqldb
 urlDbalias = ../OJB
 
-#
-# settings for torque 3.1.1
-#
-torque.database.createUrl = ${urlProtocol}:${urlSubprotocol}:target/test/OJB
-torque.database.buildUrl = ${urlProtocol}:${urlSubprotocol}:target/test/OJB
-torque.database.url = ${urlProtocol}:${urlSubprotocol}:target/test/OJB
-torque.database.driver = org.hsqldb.jdbcDriver
-torque.database.user = sa
-torque.database.password =
-torque.database.host = 127.0.0.1
-ddlutils.shutdownDatabase = true
-
-# Tells JDBC task that javaName attribute for the tables and columns
-# should be made same as SQL name.
-sameJavaName=false
-
-# -------------------------------------------------------------------
-#
-#  D O C U M E N T A T I O N   S E T T I N G S
-#
-# -------------------------------------------------------------------
-# These settings will allow you to customize the way your schema
-# documentation is created.
-# Valid formats are: html, anakia (for use with jakarta-site2)
-# -------------------------------------------------------------------
-documentationFormat=html
-
-# -------------------------------------------------------------------
-# You should NOT have to edit anything below here.
-# -------------------------------------------------------------------
 
 # -------------------------------------------------------------------
 #
-#  T E M P L A T E  P A T H
+# D D L U T I L S  S E T T I N G S
 #
 # -------------------------------------------------------------------
 
-templatePath = ../templates
-
-# -------------------------------------------------------------------
-#
-#  C O N T R O L  T E M P L A T E S
-#
-# -------------------------------------------------------------------
+ddlutils.shutdownDatabase = true
 
-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
 
 # -------------------------------------------------------------------
 #
-#  O U T P U T  D I R E C T O R Y
+# T O R Q U E  S E T T I N G S
 #
 # -------------------------------------------------------------------
 
-outputDirectory=src
-
-# -------------------------------------------------------------------
-#
-#  S C H E M A  D I R E C T O R Y
-#
-# -------------------------------------------------------------------
+torque.database = hypersonic
+torque.database.createUrl = ${urlProtocol}:${urlSubprotocol}:target/test/OJB
+torque.database.buildUrl = ${urlProtocol}:${urlSubprotocol}:target/test/OJB
+torque.database.url = ${urlProtocol}:${urlSubprotocol}:target/test/OJB
+torque.database.driver = org.hsqldb.jdbcDriver
+torque.database.host = 127.0.0.1
+torque.database.user = sa
+torque.database.password =
 
-schemaDirectory=schema
\ No newline at end of file

Modified: db/ojb/trunk/profile/informix.profile
URL: http://svn.apache.org/viewvc/db/ojb/trunk/profile/informix.profile?view=diff&rev=521923&r1=521922&r2=521923
==============================================================================
--- db/ojb/trunk/profile/informix.profile (original)
+++ db/ojb/trunk/profile/informix.profile Fri Mar 23 15:19:35 2007
@@ -15,65 +15,14 @@
 # */
 #-->
 # location of jar that you will be using for testing
-# so that it can be copied into the dist/lib directory.
-
-torque.testDatabaseJar = ${lib.repo}/informix.jar
-torque.idMethod = idbroker
-torque.defaultDatabase = OJB
+# so that it can be copied into the /lib directory.
 
 # -------------------------------------------------------------------
 #
-# T O R Q U E  C O N F I G U R A T I O N  F I L E
+#  O J B  S E T T I N G S
 #
 # -------------------------------------------------------------------
 
-# -------------------------------------------------------------------
-#
-#  T A R G E T  D A T A B A S E
-#
-# -------------------------------------------------------------------
-
-torque.database=informix
-
-# -------------------------------------------------------------------
-#
-#  O B J E C T  M O D E L  I N F O R M A T I O N
-#
-# -------------------------------------------------------------------
-# These settings will allow you to customize the way your
-# Peer-based object model is created.
-# -------------------------------------------------------------------
-# addSaveMethod=true adds tracking code to determine how to save objects
-#
-# addGetByNameMethod=true adds methods to get fields by name/position
-#
-# complexObjectModel=true generates an om with collection support
-#
-# addTimeStamp=true puts time stamps in generated files
-#
-# addIntakeRetrievable=implement Intake's Retrievable interface
-# -------------------------------------------------------------------
-
-targetPackage=org.apache.torque.test
-basePrefix=Base
-addSaveMethod=true
-addGetByNameMethod=true
-complexObjectModel=true
-addTimeStamp=true
-addIntakeRetrievable=false
-useManagers=true
-
-# -------------------------------------------------------------------
-#
-#  D A T A B A S E  S E T T I N G S
-#
-# -------------------------------------------------------------------
-# JDBC connection settings. This is used by the JDBCToXML task that
-# will create an XML database schema from JDBC metadata. These
-# settings are also used by the SQL Ant task to initialize your
-# Turbine system with the generated SQL.
-# -------------------------------------------------------------------
-
 dbmsName = Informix
 jdbcLevel = 1.0
 urlProtocol = jdbc
@@ -81,72 +30,26 @@
 urlDbalias = //<host>:<port>/<database>:INFORMIXSERVER=<servername>;user=informix;password=informix
 
 
-#
-# settings for torque 3.1.1
-#
-torque.database.createUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
-torque.database.buildUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
-torque.database.url = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
-torque.database.driver = com.informix.jdbc.IfxDriver
-torque.database.user = informix
-torque.database.password = informix
-torque.database.host = 127.0.0.1
-
-
-
-# Tells JDBC task that javaName attribute for the tables and columns
-# should be made same as SQL name.
-sameJavaName=false
-
-# -------------------------------------------------------------------
-#
-#  D O C U M E N T A T I O N   S E T T I N G S
-#
-# -------------------------------------------------------------------
-# These settings will allow you to customize the way your schema
-# documentation is created.
-# Valid formats are: html, anakia (for use with jakarta-site2)
-# -------------------------------------------------------------------
-documentationFormat=html
-
-# -------------------------------------------------------------------
-# You should NOT have to edit anything below here.
-# -------------------------------------------------------------------
-
-# -------------------------------------------------------------------
-#
-#  T E M P L A T E  P A T H
-#
-# -------------------------------------------------------------------
-
-templatePath = ../templates
-
 # -------------------------------------------------------------------
 #
-#  C O N T R O L  T E M P L A T E S
+# D D L U T I L S  S E T T I N G S
 #
 # -------------------------------------------------------------------
 
-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
-
-# -------------------------------------------------------------------
-#
-#  O U T P U T  D I R E C T O R Y
-#
-# -------------------------------------------------------------------
+#ddlutils.shutdownDatabase = false
 
-outputDirectory=src
 
 # -------------------------------------------------------------------
 #
-#  S C H E M A  D I R E C T O R Y
+# T O R Q U E  S E T T I N G S
 #
 # -------------------------------------------------------------------
 
-schemaDirectory=schema
+torque.database = informix
+torque.database.createUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
+torque.database.buildUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
+torque.database.url = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
+torque.database.driver = com.informix.jdbc.IfxDriver
+torque.database.host = 127.0.0.1
+torque.database.user = informix
+torque.database.password = informix

Modified: db/ojb/trunk/profile/maxdb.profile
URL: http://svn.apache.org/viewvc/db/ojb/trunk/profile/maxdb.profile?view=diff&rev=521923&r1=521922&r2=521923
==============================================================================
--- db/ojb/trunk/profile/maxdb.profile (original)
+++ db/ojb/trunk/profile/maxdb.profile Fri Mar 23 15:19:35 2007
@@ -15,67 +15,14 @@
 # */
 #-->
 # location of jar that you will be using for testing
-# so that it can be copied into the dist/lib directory.
-
-torque.testDatabaseJar = ${lib.repo}/sapdb.jar
-torque.idMethod = idbroker
-torque.defaultDatabase = OJB
-
-# -------------------------------------------------------------------
-#
-# T O R Q U E  C O N F I G U R A T I O N  F I L E
-#
-# -------------------------------------------------------------------
+# so that it can be copied into the /lib directory.
 
 # -------------------------------------------------------------------
 #
-#  T A R G E T  D A T A B A S E
+#  O J B  S E T T I N G S
 #
 # -------------------------------------------------------------------
-# torque currently (version 3.1) doesn't support MaxDB by its own DB adapter
-# class, thus we use adapter of SapDB.
-torque.database=sapdb
 
-# -------------------------------------------------------------------
-#
-#  O B J E C T  M O D E L  I N F O R M A T I O N
-#
-# -------------------------------------------------------------------
-# These settings will allow you to customize the way your
-# Peer-based object model is created.
-# -------------------------------------------------------------------
-# addSaveMethod=true adds tracking code to determine how to save objects
-#
-# addGetByNameMethod=true adds methods to get fields by name/position
-#
-# complexObjectModel=true generates an om with collection support
-#
-# addTimeStamp=true puts time stamps in generated files
-#
-# addIntakeRetrievable=implement Intake's Retrievable interface
-# -------------------------------------------------------------------
-
-targetPackage=org.apache.torque.test
-basePrefix=Base
-addSaveMethod=true
-addGetByNameMethod=true
-complexObjectModel=true
-addTimeStamp=true
-addIntakeRetrievable=false
-useManagers=true
-
-# -------------------------------------------------------------------
-#
-#  D A T A B A S E  S E T T I N G S
-#
-# -------------------------------------------------------------------
-# JDBC connection settings. This is used by the JDBCToXML task that
-# will create an XML database schema from JDBC metadata. These
-# settings are also used by the SQL Ant task to initialize your
-# Turbine system with the generated SQL.
-# -------------------------------------------------------------------
-# torque currently (version 3.1) doesn't support MaxDB by its own DB adapter
-# class, thus we use adapter of SapDB.
 dbmsName = MaxDB
 jdbcLevel = 2.0
 urlProtocol = jdbc
@@ -83,71 +30,26 @@
 urlDbalias = //localhost/OJB
 
 
-#
-# settings for torque 3.1.1
-#
-torque.database.createUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
-torque.database.buildUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
-torque.database.url = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
-torque.database.driver = com.sap.dbtech.jdbc.DriverSapDB
-torque.database.user = dba
-torque.database.password = dba
-torque.database.host = 127.0.0.1
-
-
-# Tells JDBC task that javaName attribute for the tables and columns
-# should be made same as SQL name.
-sameJavaName=false
-
 # -------------------------------------------------------------------
 #
-#  D O C U M E N T A T I O N   S E T T I N G S
+# D D L U T I L S  S E T T I N G S
 #
 # -------------------------------------------------------------------
-# These settings will allow you to customize the way your schema
-# documentation is created.
-# Valid formats are: html, anakia (for use with jakarta-site2)
-# -------------------------------------------------------------------
-documentationFormat=html
-
-# -------------------------------------------------------------------
-# You should NOT have to edit anything below here.
-# -------------------------------------------------------------------
 
-# -------------------------------------------------------------------
-#
-#  T E M P L A T E  P A T H
-#
-# -------------------------------------------------------------------
+#ddlutils.shutdownDatabase = false
 
-templatePath = ../templates
 
 # -------------------------------------------------------------------
 #
-#  C O N T R O L  T E M P L A T E S
+# T O R Q U E  S E T T I N G S
 #
 # -------------------------------------------------------------------
 
-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
-
-# -------------------------------------------------------------------
-#
-#  O U T P U T  D I R E C T O R Y
-#
-# -------------------------------------------------------------------
-
-outputDirectory=src
-
-# -------------------------------------------------------------------
-#
-#  S C H E M A  D I R E C T O R Y
-#
-# -------------------------------------------------------------------
-
-schemaDirectory=schema
+torque.database = sapdb
+torque.database.createUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
+torque.database.buildUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
+torque.database.url = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
+torque.database.driver = com.sap.dbtech.jdbc.DriverSapDB
+torque.database.host = 127.0.0.1
+torque.database.user = dba
+torque.database.password = dba

Modified: db/ojb/trunk/profile/mckoi.profile
URL: http://svn.apache.org/viewvc/db/ojb/trunk/profile/mckoi.profile?view=diff&rev=521923&r1=521922&r2=521923
==============================================================================
--- db/ojb/trunk/profile/mckoi.profile (original)
+++ db/ojb/trunk/profile/mckoi.profile Fri Mar 23 15:19:35 2007
@@ -14,12 +14,14 @@
 # * limitations under the License.
 # */
 #-->
+# location of jar that you will be using for testing
+# so that it can be copied into the /lib directory.
 
+# -------------------------------------------------------------------
 #
-# McKoi is not supported by Torque (at least not by the version that comes with OJB)
-# but only by the commons-sql database handling
-# Therefore this profile does not contain Torque properties
+#  O J B  S E T T I N G S
 #
+# -------------------------------------------------------------------
 
 dbmsName = Mckoi
 jdbcLevel = 2.0
@@ -27,15 +29,27 @@
 urlSubprotocol = mckoi
 urlDbalias = //localhost/OJB
 
+
+# -------------------------------------------------------------------
+#
+# D D L U T I L S  S E T T I N G S
+#
+# -------------------------------------------------------------------
+
+#ddlutils.shutdownDatabase = false
+
+
+# -------------------------------------------------------------------
 #
-# settings for torque 3.1.1
+# T O R Q U E  S E T T I N G S
 #
+# -------------------------------------------------------------------
+# not supported by torque
+#torque.database=mckoi
 torque.database.createUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
 torque.database.buildUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
 torque.database.url = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
 torque.database.driver = com.mckoi.JDBCDriver
+torque.database.host = 127.0.0.1
 torque.database.user = admin_user
 torque.database.password = aupass00
-torque.database.host = 127.0.0.1
-
-

Modified: db/ojb/trunk/profile/msaccess.profile
URL: http://svn.apache.org/viewvc/db/ojb/trunk/profile/msaccess.profile?view=diff&rev=521923&r1=521922&r2=521923
==============================================================================
--- db/ojb/trunk/profile/msaccess.profile (original)
+++ db/ojb/trunk/profile/msaccess.profile Fri Mar 23 15:19:35 2007
@@ -15,63 +15,12 @@
 # */
 #-->
 # location of jar that you will be using for testing
-# so that it can be copied into the dist/lib directory.
+# so that it can be copied into the /lib directory.
 
-#torque.testDatabaseJar = ${lib.repo}/
-torque.idMethod = idbroker
-torque.defaultDatabase = OJB
-
-# -------------------------------------------------------------------
-#
-# T O R Q U E  C O N F I G U R A T I O N  F I L E
-#
-# -------------------------------------------------------------------
-
-# -------------------------------------------------------------------
-#
-#  T A R G E T  D A T A B A S E
-#
-# -------------------------------------------------------------------
-
-torque.database=msaccess
-
-# -------------------------------------------------------------------
-#
-#  O B J E C T  M O D E L  I N F O R M A T I O N
-#
 # -------------------------------------------------------------------
-# These settings will allow you to customize the way your
-# Peer-based object model is created.
-# -------------------------------------------------------------------
-# addSaveMethod=true adds tracking code to determine how to save objects
-#
-# addGetByNameMethod=true adds methods to get fields by name/position
 #
-# complexObjectModel=true generates an om with collection support
+#  O J B  S E T T I N G S
 #
-# addTimeStamp=true puts time stamps in generated files
-#
-# addIntakeRetrievable=implement Intake's Retrievable interface
-# -------------------------------------------------------------------
-
-targetPackage=org.apache.torque.test
-basePrefix=Base
-addSaveMethod=true
-addGetByNameMethod=true
-complexObjectModel=true
-addTimeStamp=true
-addIntakeRetrievable=false
-useManagers=true
-
-# -------------------------------------------------------------------
-#
-#  D A T A B A S E  S E T T I N G S
-#
-# -------------------------------------------------------------------
-# JDBC connection settings. This is used by the JDBCToXML task that
-# will create an XML database schema from JDBC metadata. These
-# settings are also used by the SQL Ant task to initialize your
-# Turbine system with the generated SQL.
 # -------------------------------------------------------------------
 
 dbmsName = MsAccess
@@ -80,71 +29,27 @@
 urlSubprotocol = odbc
 urlDbalias = OJB
 
-#
-# settings for torque 3.1.1
-#
-torque.database.createUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
-torque.database.buildUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
-torque.database.url = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
-torque.database.driver = sun.jdbc.odbc.JdbcOdbcDriver
-torque.database.user = 
-torque.database.password = 
-torque.database.host = 127.0.0.1
-
-
-# Tells JDBC task that javaName attribute for the tables and columns
-# should be made same as SQL name.
-sameJavaName=false
 
 # -------------------------------------------------------------------
 #
-#  D O C U M E N T A T I O N  S E T T I N G S
+# D D L U T I L S  S E T T I N G S
 #
 # -------------------------------------------------------------------
-# These settings will allow you to customize the way your schema
-# documentation is created.
-# Valid formats are: html, anakia (for use with jakarta-site2)
-# -------------------------------------------------------------------
-documentationFormat=html
 
-# -------------------------------------------------------------------
-# You should NOT have to edit anything below here.
-# -------------------------------------------------------------------
+#ddlutils.shutdownDatabase = false
 
-# -------------------------------------------------------------------
-#
-#  T E M P L A T E  P A T H
-#
-# -------------------------------------------------------------------
-
-templatePath = ../templates
 
 # -------------------------------------------------------------------
 #
-#  C O N T R O L  T E M P L A T E S
+# T O R Q U E  S E T T I N G S
 #
 # -------------------------------------------------------------------
 
-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
-
-# -------------------------------------------------------------------
-#
-#  O U T P U T  D I R E C T O R Y
-#
-# -------------------------------------------------------------------
-
-outputDirectory=src
-
-# -------------------------------------------------------------------
-#
-#  S C H E M A  D I R E C T O R Y
-#
-# -------------------------------------------------------------------
-
-schemaDirectory=schema
+torque.database = msaccess
+torque.database.createUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
+torque.database.buildUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
+torque.database.url = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
+torque.database.driver = sun.jdbc.odbc.JdbcOdbcDriver
+torque.database.host = 127.0.0.1
+torque.database.user =
+torque.database.password =

Modified: db/ojb/trunk/profile/mssqldb-JSQLConnect.profile
URL: http://svn.apache.org/viewvc/db/ojb/trunk/profile/mssqldb-JSQLConnect.profile?view=diff&rev=521923&r1=521922&r2=521923
==============================================================================
Binary files - no diff available.

Modified: db/ojb/trunk/profile/mssqldb-Opta2000.profile
URL: http://svn.apache.org/viewvc/db/ojb/trunk/profile/mssqldb-Opta2000.profile?view=diff&rev=521923&r1=521922&r2=521923
==============================================================================
Binary files - no diff available.

Modified: db/ojb/trunk/profile/mssqldb-ms.profile
URL: http://svn.apache.org/viewvc/db/ojb/trunk/profile/mssqldb-ms.profile?view=diff&rev=521923&r1=521922&r2=521923
==============================================================================
Binary files - no diff available.

Modified: db/ojb/trunk/profile/mssqldb.profile
URL: http://svn.apache.org/viewvc/db/ojb/trunk/profile/mssqldb.profile?view=diff&rev=521923&r1=521922&r2=521923
==============================================================================
--- db/ojb/trunk/profile/mssqldb.profile (original)
+++ db/ojb/trunk/profile/mssqldb.profile Fri Mar 23 15:19:35 2007
@@ -15,135 +15,45 @@
 # */
 #-->
 # location of jar that you will be using for testing
-# so that it can be copied into the dist/lib directory.
+# so that it can be copied into the /lib directory.
 
-torque.testDatabaseJar = ${lib.repo}/hsqldb.jar
-torque.idMethod = idbroker
-torque.defaultDatabase = OJB
-
-# -------------------------------------------------------------------
-#
-# T O R Q U E  C O N F I G U R A T I O N  F I L E
-#
-# -------------------------------------------------------------------
-
-# -------------------------------------------------------------------
-#
-#  T A R G E T  D A T A B A S E
-#
-# -------------------------------------------------------------------
-
-torque.database=mssql
-
-# -------------------------------------------------------------------
-#
-#  O B J E C T  M O D E L  I N F O R M A T I O N
-#
-# -------------------------------------------------------------------
-# These settings will allow you to customize the way your
-# Peer-based object model is created.
-# -------------------------------------------------------------------
-# addSaveMethod=true adds tracking code to determine how to save objects
-#
-# addGetByNameMethod=true adds methods to get fields by name/position
-#
-# complexObjectModel=true generates an om with collection support
-#
-# addTimeStamp=true puts time stamps in generated files
-#
-# addIntakeRetrievable=implement Intake's Retrievable interface
-# -------------------------------------------------------------------
-
-targetPackage=org.apache.torque.test
-basePrefix=Base
-addSaveMethod=true
-addGetByNameMethod=true
-complexObjectModel=true
-addTimeStamp=true
-addIntakeRetrievable=false
-useManagers=true
+#jdbc:JSQLConnect://ServerName:port/opt=value/opt=value
 
 # -------------------------------------------------------------------
 #
-#  D A T A B A S E  S E T T I N G S
+#  O J B  S E T T I N G S
 #
 # -------------------------------------------------------------------
-# JDBC connection settings. This is used by the JDBCToXML task that
-# will create an XML database schema from JDBC metadata. These
-# settings are also used by the SQL Ant task to initialize your
-# Turbine system with the generated SQL.
-# -------------------------------------------------------------------
 
 dbmsName = MsSQLServer
 databaseHost = localhost:1433
 jdbcLevel = 2.0
 urlProtocol = jdbc
 urlSubprotocol = JSQLConnect
-torque.database.user = sa
-torque.database.password = motiva
-urlDbalias = //localhost/database=OJB/user=${torque.database.user}/password=${torque.database.password}
-
-#jdbc:JSQLConnect://ServerName:port/opt=value/opt=value
-
-torque.database.createUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
-torque.database.buildUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
-torque.database.url = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
-torque.database.driver = com.jnetdirect.jsql.JSQLDriver
+urlDbalias = //localhost/database=OJB
 
 
-# Tells JDBC task that javaName attribute for the tables and columns
-# should be made same as SQL name.
-sameJavaName=false
-
 # -------------------------------------------------------------------
 #
-#  D O C U M E N T A T I O N   S E T T I N G S
+# D D L U T I L S  S E T T I N G S
 #
 # -------------------------------------------------------------------
-# These settings will allow you to customize the way your schema
-# documentation is created.
-# Valid formats are: html, anakia (for use with jakarta-site2)
-# -------------------------------------------------------------------
-documentationFormat=html
-
-# -------------------------------------------------------------------
-# You should NOT have to edit anything below here.
-# -------------------------------------------------------------------
 
-# -------------------------------------------------------------------
-#
-#  T E M P L A T E  P A T H
-#
-# -------------------------------------------------------------------
+#ddlutils.shutdownDatabase = false
 
-templatePath = ../templates
 
 # -------------------------------------------------------------------
 #
-#  C O N T R O L  T E M P L A T E S
+# T O R Q U E  S E T T I N G S
 #
 # -------------------------------------------------------------------
 
-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
-
-# -------------------------------------------------------------------
-#
-#  O U T P U T  D I R E C T O R Y
-#
-# -------------------------------------------------------------------
-
-outputDirectory=src
-
-# -------------------------------------------------------------------
-#
-#  S C H E M A  D I R E C T O R Y
-#
-# -------------------------------------------------------------------
+torque.database=mssql
+torque.database.createUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
+torque.database.buildUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
+torque.database.url = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
+torque.database.driver = com.jnetdirect.jsql.JSQLDriver
+torque.database.host = 127.0.0.1
+torque.database.user = sa
+torque.database.password = motiva
 
-schemaDirectory=schema

Modified: db/ojb/trunk/profile/mysql.profile
URL: http://svn.apache.org/viewvc/db/ojb/trunk/profile/mysql.profile?view=diff&rev=521923&r1=521922&r2=521923
==============================================================================
--- db/ojb/trunk/profile/mysql.profile (original)
+++ db/ojb/trunk/profile/mysql.profile Fri Mar 23 15:19:35 2007
@@ -15,136 +15,41 @@
 # */
 #-->
 # location of jar that you will be using for testing
-# so that it can be copied into the dist/lib directory.
-
-torque.testDatabaseJar = ${lib.repo}/mysql-connector-java-2.0.14-bin.jar
-torque.idMethod = idbroker
-torque.defaultDatabase = bookstore
-
-# -------------------------------------------------------------------
-#
-# T O R Q U E  C O N F I G U R A T I O N  F I L E
-#
-# -------------------------------------------------------------------
+# so that it can be copied into the /lib directory.
 
 # -------------------------------------------------------------------
 #
-#  T A R G E T  D A T A B A S E
+#  O J B  S E T T I N G S
 #
 # -------------------------------------------------------------------
 
-torque.database=mysql
-
-# -------------------------------------------------------------------
-#
-#  O B J E C T  M O D E L  I N F O R M A T I O N
-#
-# -------------------------------------------------------------------
-# These settings will allow you to customize the way your
-# Peer-based object model is created.
-# -------------------------------------------------------------------
-# addSaveMethod=true adds tracking code to determine how to save objects
-#
-# addGetByNameMethod=true adds methods to get fields by name/position
-#
-# complexObjectModel=true generates an om with collection support
-#
-# addTimeStamp=true puts time stamps in generated files
-#
-# addIntakeRetrievable=implement Intake's Retrievable interface
-# -------------------------------------------------------------------
-
-targetPackage=org.apache.torque.test
-basePrefix=Base
-addSaveMethod=true
-addGetByNameMethod=true
-complexObjectModel=true
-addTimeStamp=true
-addIntakeRetrievable=false
-useManagers=true
-
-# -------------------------------------------------------------------
-#
-#  D A T A B A S E  S E T T I N G S
-#
-# -------------------------------------------------------------------
-# JDBC connection settings. This is used by the JDBCToXML task that
-# will create an XML database schema from JDBC metadata. These
-# settings are also used by the SQL Ant task to initialize your
-# Turbine system with the generated SQL.
-# -------------------------------------------------------------------
-
 dbmsName = MySQL
 jdbcLevel = 2.0
 urlProtocol = jdbc
 urlSubprotocol = mysql
-urlDbalias = //localhost:3306/ojb
+urlDbalias = //localhost:3306/ojb?autoReconnectForPools=true?cacheCallableStmts=true?cachePrepStmts=true
 
-#
-# settings for torque 3.1.1
-#
-torque.database.createUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
-torque.database.buildUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
-torque.database.url = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
-torque.database.driver = org.gjt.mm.mysql.Driver
-torque.database.user = root
-torque.database.password = 
-torque.database.host = 127.0.0.1
-
-
-# Tells JDBC task that javaName attribute for the tables and columns
-# should be made same as SQL name.
-sameJavaName=false
-
-# -------------------------------------------------------------------
-#
-#  D O C U M E N T A T I O N   S E T T I N G S
-#
-# -------------------------------------------------------------------
-# These settings will allow you to customize the way your schema
-# documentation is created.
-# Valid formats are: html, anakia (for use with jakarta-site2)
-# -------------------------------------------------------------------
-documentationFormat=html
-
-# -------------------------------------------------------------------
-# You should NOT have to edit anything below here.
-# -------------------------------------------------------------------
-
-# -------------------------------------------------------------------
-#
-#  T E M P L A T E  P A T H
-#
-# -------------------------------------------------------------------
-
-templatePath = ../templates
 
 # -------------------------------------------------------------------
 #
-#  C O N T R O L  T E M P L A T E S
+# D D L U T I L S  S E T T I N G S
 #
 # -------------------------------------------------------------------
 
-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
+#ddlutils.shutdownDatabase = false
 
-# -------------------------------------------------------------------
-#
-#  O U T P U T  D I R E C T O R Y
-#
-# -------------------------------------------------------------------
-
-outputDirectory=src
 
 # -------------------------------------------------------------------
 #
-#  S C H E M A  D I R E C T O R Y
+# T O R Q U E  S E T T I N G S
 #
 # -------------------------------------------------------------------
 
-schemaDirectory=schema
+torque.database = mysql
+torque.database.createUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
+torque.database.buildUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
+torque.database.url = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
+torque.database.driver = org.gjt.mm.mysql.Driver
+torque.database.host = 127.0.0.1
+torque.database.user = root
+torque.database.password =

Modified: db/ojb/trunk/profile/oracle.profile
URL: http://svn.apache.org/viewvc/db/ojb/trunk/profile/oracle.profile?view=diff&rev=521923&r1=521922&r2=521923
==============================================================================
--- db/ojb/trunk/profile/oracle.profile (original)
+++ db/ojb/trunk/profile/oracle.profile Fri Mar 23 15:19:35 2007
@@ -15,155 +15,58 @@
 # */
 #-->
 # location of jar that you will be using for testing
-# so that it can be copied into the dist/lib directory.
-
-torque.testDatabaseJar = ${lib.repo}/oracle.jar
-torque.idMethod = idbroker
-torque.defaultDatabase = OJB
-
-# -------------------------------------------------------------------
-#
-# T O R Q U E  C O N F I G U R A T I O N  F I L E
-#
-# -------------------------------------------------------------------
-
-# Special Oracle-handling of the delimiter character
-# (See note at http://db.apache.org/torque/oracle-howto.html)
-torque.delimiter=/
+# so that it can be copied into the /lib directory.
 
 # -------------------------------------------------------------------
 #
-#  T A R G E T  D A T A B A S E
+#  O J B  S E T T I N G S
 #
 # -------------------------------------------------------------------
 
-torque.database=oracle
-
-# -------------------------------------------------------------------
-#
-#  O B J E C T  M O D E L  I N F O R M A T I O N
-#
-# -------------------------------------------------------------------
-# These settings will allow you to customize the way your
-# Peer-based object model is created.
-# -------------------------------------------------------------------
-# addSaveMethod=true adds tracking code to determine how to save objects
-#
-# addGetByNameMethod=true adds methods to get fields by name/position
-#
-# complexObjectModel=true generates an om with collection support
-#
-# addTimeStamp=true puts time stamps in generated files
-#
-# addIntakeRetrievable=implement Intake's Retrievable interface
-# -------------------------------------------------------------------
-
-targetPackage=org.apache.torque.test
-basePrefix=Base
-addSaveMethod=true
-addGetByNameMethod=true
-complexObjectModel=true
-addTimeStamp=true
-addIntakeRetrievable=false
-useManagers=true
-
-# -------------------------------------------------------------------
-#
-#  D A T A B A S E  S E T T I N G S
-#
-# -------------------------------------------------------------------
-# JDBC connection settings. This is used by the JDBCToXML task that
-# will create an XML database schema from JDBC metadata. These
-# settings are also used by the SQL Ant task to initialize your
-# Turbine system with the generated SQL.
-# -------------------------------------------------------------------
-
 dbmsName = Oracle
 jdbcLevel = 3.0
 urlProtocol = jdbc
-
 dbHost = 127.0.0.1
 dbPort = 1521
 #dbSID = ORACLE
 dbSID = XE
-
 # THIN
 urlSubprotocol = oracle:thin
 urlDbalias = @${dbHost}:${dbPort}:${dbSID}
-
 # OCI
 #urlSubprotocol = oracle:oci
 #urlDbalias = @MY_TNSNAME
 #urlDbalias = @(description=(address=(host=${dbHost})(protocol=tcp)(${dbPort}))(connect_data=(sid=${dbSID})))
-
+#
 # validation query used to detect timed out connections
 # connection was checked when borrowed from pool
 #validationQuery=SELECT 1 FROM DUAL
 
-#
-# settings for torque 3.1.1
-#
-torque.database.createUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
-torque.database.buildUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
-torque.database.url = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
-torque.database.driver = oracle.jdbc.driver.OracleDriver
-torque.database.user = ojb
-torque.database.password = ojb
-torque.database.host = 127.0.0.1
-
-# Tells JDBC task that javaName attribute for the tables and columns
-# should be made same as SQL name.
-sameJavaName=false
-
-# -------------------------------------------------------------------
-#
-#  D O C U M E N T A T I O N   S E T T I N G S
-#
-# -------------------------------------------------------------------
-# These settings will allow you to customize the way your schema
-# documentation is created.
-# Valid formats are: html, anakia (for use with jakarta-site2)
-# -------------------------------------------------------------------
-documentationFormat=html
-
-# -------------------------------------------------------------------
-# You should NOT have to edit anything below here.
-# -------------------------------------------------------------------
 
 # -------------------------------------------------------------------
 #
-#  T E M P L A T E  P A T H
+# D D L U T I L S  S E T T I N G S
 #
 # -------------------------------------------------------------------
 
-templatePath = ../templates
-
-# -------------------------------------------------------------------
-#
-#  C O N T R O L  T E M P L A T E S
-#
-# -------------------------------------------------------------------
+#ddlutils.shutdownDatabase = false
 
-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
 
 # -------------------------------------------------------------------
 #
-#  O U T P U T  D I R E C T O R Y
+# T O R Q U E  S E T T I N G S
 #
 # -------------------------------------------------------------------
 
-outputDirectory=src
-
-# -------------------------------------------------------------------
-#
-#  S C H E M A  D I R E C T O R Y
+torque.database = oracle
+torque.database.createUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
+torque.database.buildUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
+torque.database.url = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
+torque.database.driver = oracle.jdbc.driver.OracleDriver
+torque.database.host = 127.0.0.1
+torque.database.user = ojb
+torque.database.password = ojb
 #
-# -------------------------------------------------------------------
-
-schemaDirectory=schema
+# Special Oracle-handling of the delimiter character
+# (See note at http://db.apache.org/torque/oracle-howto.html)
+torque.delimiter=/

Modified: db/ojb/trunk/profile/oracle9i.profile
URL: http://svn.apache.org/viewvc/db/ojb/trunk/profile/oracle9i.profile?view=diff&rev=521923&r1=521922&r2=521923
==============================================================================
Binary files - no diff available.

Modified: db/ojb/trunk/profile/postgresql.profile
URL: http://svn.apache.org/viewvc/db/ojb/trunk/profile/postgresql.profile?view=diff&rev=521923&r1=521922&r2=521923
==============================================================================
--- db/ojb/trunk/profile/postgresql.profile (original)
+++ db/ojb/trunk/profile/postgresql.profile Fri Mar 23 15:19:35 2007
@@ -15,36 +15,13 @@
 # */
 #-->
 # location of jar that you will be using for testing
-# so that it can be copied into the dist/lib directory.
-
-torque.testDatabaseJar = ${lib.repo}/postgres.jar
-torque.idMethod = idbroker
-torque.defaultDatabase = ojbtest
-
-# -------------------------------------------------------------------
-#
-# T O R Q U E  C O N F I G U R A T I O N  F I L E
-#
-# -------------------------------------------------------------------
-
-# -------------------------------------------------------------------
-#
-#  T A R G E T  D A T A B A S E
-#
-# -------------------------------------------------------------------
-
-torque.database=postgresql
+# so that it can be copied into the /lib directory.
 
 # -------------------------------------------------------------------
 #
-#  D A T A B A S E  S E T T I N G S
+#  O J B  S E T T I N G S
 #
 # -------------------------------------------------------------------
-# JDBC connection settings. This is used by the JDBCToXML task that
-# will create an XML database schema from JDBC metadata. These
-# settings are also used by the SQL Ant task to initialize your
-# Turbine system with the generated SQL.
-# -------------------------------------------------------------------
 
 dbmsName = PostgreSQL
 jdbcLevel = 3.0
@@ -53,74 +30,28 @@
 urlDbalias = ${torque.project}
 
 
-#
-# settings for torque 3.1.1
-#
-torque.database.host = 127.0.0.1
-torque.database.user = ojb
-torque.database.password = ojb
-
-# For PostgreSQL we have to specify a specific database when we want to
-# create a new database via JDBC
-torque.database.createUrl = ${urlProtocol}:${urlSubprotocol}://${torque.database.host}/template1
-
-torque.database.buildUrl = ${urlProtocol}:${urlSubprotocol}://${torque.database.host}/${urlDbalias}
-torque.database.url = ${urlProtocol}:${urlSubprotocol}://${torque.database.host}/${urlDbalias}
-torque.database.driver = org.postgresql.Driver
-
-# Tells JDBC task that javaName attribute for the tables and columns
-# should be made same as SQL name.
-sameJavaName=false
-
 # -------------------------------------------------------------------
 #
-#  D O C U M E N T A T I O N   S E T T I N G S
+# D D L U T I L S  S E T T I N G S
 #
 # -------------------------------------------------------------------
-# These settings will allow you to customize the way your schema
-# documentation is created.
-# Valid formats are: html, anakia (for use with jakarta-site2)
-# -------------------------------------------------------------------
-documentationFormat=html
 
-# -------------------------------------------------------------------
-# You should NOT have to edit anything below here.
-# -------------------------------------------------------------------
-
-# -------------------------------------------------------------------
-#
-#  T E M P L A T E  P A T H
-#
-# -------------------------------------------------------------------
+#ddlutils.shutdownDatabase = false
 
-templatePath = ../templates
 
 # -------------------------------------------------------------------
 #
-#  C O N T R O L  T E M P L A T E S
+# T O R Q U E  S E T T I N G S
 #
 # -------------------------------------------------------------------
 
-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
-
-# -------------------------------------------------------------------
-#
-#  O U T P U T  D I R E C T O R Y
-#
-# -------------------------------------------------------------------
-
-outputDirectory=src
-
-# -------------------------------------------------------------------
-#
-#  S C H E M A  D I R E C T O R Y
-#
-# -------------------------------------------------------------------
-
-schemaDirectory=schema
+torque.database = postgresql
+# For PostgreSQL we have to specify a specific database when we want to
+# create a new database via JDBC
+torque.database.createUrl = ${urlProtocol}:${urlSubprotocol}://${torque.database.host}/template1
+torque.database.buildUrl = ${urlProtocol}:${urlSubprotocol}://${torque.database.host}/${urlDbalias}
+torque.database.url = ${urlProtocol}:${urlSubprotocol}://${torque.database.host}/${urlDbalias}
+torque.database.driver = org.postgresql.Driver
+torque.database.host = 127.0.0.1
+torque.database.user = ojb
+torque.database.password = ojb
\ No newline at end of file

Modified: db/ojb/trunk/profile/sapdb.profile
URL: http://svn.apache.org/viewvc/db/ojb/trunk/profile/sapdb.profile?view=diff&rev=521923&r1=521922&r2=521923
==============================================================================
--- db/ojb/trunk/profile/sapdb.profile (original)
+++ db/ojb/trunk/profile/sapdb.profile Fri Mar 23 15:19:35 2007
@@ -15,63 +15,12 @@
 # */
 #-->
 # location of jar that you will be using for testing
-# so that it can be copied into the dist/lib directory.
+# so that it can be copied into the /lib directory.
 
-torque.testDatabaseJar = ${lib.repo}/sapdb.jar
-torque.idMethod = idbroker
-torque.defaultDatabase = OJB
-
-# -------------------------------------------------------------------
-#
-# T O R Q U E  C O N F I G U R A T I O N  F I L E
-#
-# -------------------------------------------------------------------
-
-# -------------------------------------------------------------------
-#
-#  T A R G E T  D A T A B A S E
-#
-# -------------------------------------------------------------------
-
-torque.database=sapdb
-
-# -------------------------------------------------------------------
-#
-#  O B J E C T  M O D E L  I N F O R M A T I O N
-#
 # -------------------------------------------------------------------
-# These settings will allow you to customize the way your
-# Peer-based object model is created.
-# -------------------------------------------------------------------
-# addSaveMethod=true adds tracking code to determine how to save objects
-#
-# addGetByNameMethod=true adds methods to get fields by name/position
 #
-# complexObjectModel=true generates an om with collection support
+#  O J B  S E T T I N G S
 #
-# addTimeStamp=true puts time stamps in generated files
-#
-# addIntakeRetrievable=implement Intake's Retrievable interface
-# -------------------------------------------------------------------
-
-targetPackage=org.apache.torque.test
-basePrefix=Base
-addSaveMethod=true
-addGetByNameMethod=true
-complexObjectModel=true
-addTimeStamp=true
-addIntakeRetrievable=false
-useManagers=true
-
-# -------------------------------------------------------------------
-#
-#  D A T A B A S E  S E T T I N G S
-#
-# -------------------------------------------------------------------
-# JDBC connection settings. This is used by the JDBCToXML task that
-# will create an XML database schema from JDBC metadata. These
-# settings are also used by the SQL Ant task to initialize your
-# Turbine system with the generated SQL.
 # -------------------------------------------------------------------
 
 dbmsName = Sapdb
@@ -80,71 +29,27 @@
 urlSubprotocol = sapdb
 urlDbalias = //localhost/OJB
 
-#
-# settings for torque 3.1.1
-#
-torque.database.createUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
-torque.database.buildUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
-torque.database.url = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
-torque.database.driver = com.sap.dbtech.jdbc.DriverSapDB
-torque.database.user = ojb
-torque.database.password = ojb
-torque.database.host = 127.0.0.1
-
-
-# Tells JDBC task that javaName attribute for the tables and columns
-# should be made same as SQL name.
-sameJavaName=false
 
 # -------------------------------------------------------------------
 #
-#  D O C U M E N T A T I O N   S E T T I N G S
+# D D L U T I L S  S E T T I N G S
 #
 # -------------------------------------------------------------------
-# These settings will allow you to customize the way your schema
-# documentation is created.
-# Valid formats are: html, anakia (for use with jakarta-site2)
-# -------------------------------------------------------------------
-documentationFormat=html
 
-# -------------------------------------------------------------------
-# You should NOT have to edit anything below here.
-# -------------------------------------------------------------------
+#ddlutils.shutdownDatabase = false
 
-# -------------------------------------------------------------------
-#
-#  T E M P L A T E  P A T H
-#
-# -------------------------------------------------------------------
-
-templatePath = ../templates
 
 # -------------------------------------------------------------------
 #
-#  C O N T R O L  T E M P L A T E S
+# T O R Q U E  S E T T I N G S
 #
 # -------------------------------------------------------------------
 
-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
-
-# -------------------------------------------------------------------
-#
-#  O U T P U T  D I R E C T O R Y
-#
-# -------------------------------------------------------------------
-
-outputDirectory=src
-
-# -------------------------------------------------------------------
-#
-#  S C H E M A  D I R E C T O R Y
-#
-# -------------------------------------------------------------------
-
-schemaDirectory=schema
+torque.database = sapdb
+torque.database.createUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
+torque.database.buildUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
+torque.database.url = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
+torque.database.driver = com.sap.dbtech.jdbc.DriverSapDB
+torque.database.host = 127.0.0.1
+torque.database.user = dba
+torque.database.password = dba

Modified: db/ojb/trunk/profile/sybase.profile
URL: http://svn.apache.org/viewvc/db/ojb/trunk/profile/sybase.profile?view=diff&rev=521923&r1=521922&r2=521923
==============================================================================
--- db/ojb/trunk/profile/sybase.profile (original)
+++ db/ojb/trunk/profile/sybase.profile Fri Mar 23 15:19:35 2007
@@ -15,136 +15,41 @@
 # */
 #-->
 # location of jar that you will be using for testing
-# so that it can be copied into the dist/lib directory.
-
-#torque.testDatabaseJar = ${lib.repo}/sybase.jar
-torque.idMethod = idbroker
-torque.defaultDatabase = OJB
-
-# -------------------------------------------------------------------
-#
-# T O R Q U E  C O N F I G U R A T I O N  F I L E
-#
-# -------------------------------------------------------------------
-
-# -------------------------------------------------------------------
-#
-#  T A R G E T  D A T A B A S E
-#
-# -------------------------------------------------------------------
-
-torque.database=sybase
-
-# -------------------------------------------------------------------
-#
-#  O B J E C T  M O D E L  I N F O R M A T I O N
-#
-# -------------------------------------------------------------------
-# These settings will allow you to customize the way your
-# Peer-based object model is created.
-# -------------------------------------------------------------------
-# addSaveMethod=true adds tracking code to determine how to save objects
-#
-# addGetByNameMethod=true adds methods to get fields by name/position
-#
-# complexObjectModel=true generates an om with collection support
-#
-# addTimeStamp=true puts time stamps in generated files
-#
-# addIntakeRetrievable=implement Intake's Retrievable interface
-# -------------------------------------------------------------------
-
-targetPackage=org.apache.torque.test
-basePrefix=Base
-addSaveMethod=true
-addGetByNameMethod=true
-complexObjectModel=true
-addTimeStamp=true
-addIntakeRetrievable=false
-useManagers=true
+# so that it can be copied into the /lib directory.
 
 # -------------------------------------------------------------------
 #
-#  D A T A B A S E  S E T T I N G S
+#  O J B  S E T T I N G S
 #
 # -------------------------------------------------------------------
-# JDBC connection settings. This is used by the JDBCToXML task that
-# will create an XML database schema from JDBC metadata. These
-# settings are also used by the SQL Ant task to initialize your
-# Turbine system with the generated SQL.
-# -------------------------------------------------------------------
 
 dbmsName = Sybase
-jdbcLevel = 1.0
+jdbcLevel = 3.0
 urlProtocol = jdbc
-urlSubprotocol = ???
-urlDbalias = ???
+urlSubprotocol = sybase:Tds
+urlDbalias = localhost:5000/ojb
 
-#
-# settings for torque 3.1.1
-#
-torque.database.createUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
-torque.database.buildUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
-torque.database.url = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
-torque.database.driver = ???
-torque.database.user = 
-torque.database.password = 
-torque.database.host = 127.0.0.1
-
-
-# Tells JDBC task that javaName attribute for the tables and columns
-# should be made same as SQL name.
-sameJavaName=false
 
 # -------------------------------------------------------------------
 #
-#  D O C U M E N T A T I O N  S E T T I N G S
+# D D L U T I L S  S E T T I N G S
 #
 # -------------------------------------------------------------------
-# These settings will allow you to customize the way your schema
-# documentation is created.
-# Valid formats are: html, anakia (for use with jakarta-site2)
-# -------------------------------------------------------------------
-documentationFormat=html
-
-# -------------------------------------------------------------------
-# You should NOT have to edit anything below here.
-# -------------------------------------------------------------------
 
-# -------------------------------------------------------------------
-#
-#  T E M P L A T E  P A T H
-#
-# -------------------------------------------------------------------
+#ddlutils.shutdownDatabase = false
 
-templatePath = ../templates
 
 # -------------------------------------------------------------------
 #
-#  C O N T R O L  T E M P L A T E S
+# T O R Q U E  S E T T I N G S
 #
 # -------------------------------------------------------------------
 
-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
-
-# -------------------------------------------------------------------
-#
-#  O U T P U T  D I R E C T O R Y
-#
-# -------------------------------------------------------------------
-
-outputDirectory=src
-
-# -------------------------------------------------------------------
-#
-#  S C H E M A  D I R E C T O R Y
-#
-# -------------------------------------------------------------------
-
-schemaDirectory=schema
+torque.database = sybase
+torque.database.createUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
+torque.database.buildUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
+torque.database.url = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
+torque.database.driver = com.sybase.jdbc3.jdbc.SybDriver
+torque.database.host = localhost:5000
+torque.database.user = ojb
+torque.database.password = ojb



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