arminw      2005/10/06 13:57:55

  Modified:    lib      Tag: OJB_1_0_RELEASE hsqldb.jar
               profile  Tag: OJB_1_0_RELEASE db2.profile hsqldb.profile
                        informix.profile maxdb.profile msaccess.profile
                        mssqldb-JSQLConnect.profile mssqldb-ms.profile
                        mssqldb-Opta2000.profile mssqldb.profile
                        mysql.profile oracle.profile oracle9i.profile
                        postgresql.profile sapdb.profile sybase.profile
  Added:       lib      Tag: OJB_1_0_RELEASE commons-collections-3.1.jar
                        torque-gen-3.1.1.jar village-2.0-dev-20030825.jar
               profile  Tag: OJB_1_0_RELEASE firebird.profile mckoi.profile
  Removed:     lib      Tag: OJB_1_0_RELEASE commons-collections-2.1.1.jar
                        torque-3.0.2.jar
               profile  Tag: OJB_1_0_RELEASE oracle9i-Seropto.profile
  Log:
  update Torque to version 3.1.1, update hsql to version 1.8.0.2, merge DB 
profiles with HEAD, update commons-collections to version 3.1
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.3.4.1   +3145 -1049db-ojb/lib/hsqldb.jar
  
        <<Binary file>>
  
  
  No                   revision
  
        <<Binary file>>
  
  
  No                   revision
  
        <<Binary file>>
  
  
  1.1.2.1   +0 -0      db-ojb/lib/commons-collections-3.1.jar
  
        <<Binary file>>
  
  
  1.2.2.1   +0 -0      db-ojb/lib/torque-gen-3.1.1.jar
  
        <<Binary file>>
  
  
  1.1.2.1   +0 -0      db-ojb/lib/village-2.0-dev-20030825.jar
  
        <<Binary file>>
  
  
  No                   revision
  No                   revision
  1.5.2.2   +10 -9     db-ojb/profile/db2.profile
  
  Index: db2.profile
  ===================================================================
  RCS file: /home/cvs/db-ojb/profile/db2.profile,v
  retrieving revision 1.5.2.1
  retrieving revision 1.5.2.2
  diff -u -r1.5.2.1 -r1.5.2.2
  --- db2.profile       25 Feb 2005 21:00:18 -0000      1.5.2.1
  +++ db2.profile       6 Oct 2005 20:57:54 -0000       1.5.2.2
  @@ -34,7 +34,6 @@
   # -------------------------------------------------------------------
   
   torque.database = db2
  -database.manual.creation = true
   
   # -------------------------------------------------------------------
   #
  @@ -82,14 +81,16 @@
   urlDbalias = OJB
   
   
  -
  -createDatabaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
  -buildDatabaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
  -databaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
  -databaseDriver = COM.ibm.db2.jdbc.app.DB2Driver
  -databaseUser = admin
  -databasePassword = db2
  -databaseHost = 127.0.0.1
  +#
  +# 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
  
  
  
  1.4.2.2   +10 -9     db-ojb/profile/hsqldb.profile
  
  Index: hsqldb.profile
  ===================================================================
  RCS file: /home/cvs/db-ojb/profile/hsqldb.profile,v
  retrieving revision 1.4.2.1
  retrieving revision 1.4.2.2
  diff -u -r1.4.2.1 -r1.4.2.2
  --- hsqldb.profile    25 Feb 2005 21:00:18 -0000      1.4.2.1
  +++ hsqldb.profile    6 Oct 2005 20:57:54 -0000       1.4.2.2
  @@ -79,16 +79,17 @@
   urlProtocol = jdbc
   urlSubprotocol = hsqldb
   urlDbalias = ../OJB
  -#urlDbalias = /home/tom/projekte/jakarta-ojb/target/test/OJB
   
  -
  -createDatabaseUrl = ${urlProtocol}:${urlSubprotocol}:target/test/OJB
  -buildDatabaseUrl = ${urlProtocol}:${urlSubprotocol}:target/test/OJB
  -databaseUrl = ${urlProtocol}:${urlSubprotocol}:target/test/OJB
  -databaseDriver = org.hsqldb.jdbcDriver
  -databaseUser = sa
  -databasePassword =
  -databaseHost = 127.0.0.1
  +#
  +# 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
   
   
   # Tells JDBC task that javaName attribute for the tables and columns
  
  
  
  1.6.2.2   +10 -8     db-ojb/profile/informix.profile
  
  Index: informix.profile
  ===================================================================
  RCS file: /home/cvs/db-ojb/profile/informix.profile,v
  retrieving revision 1.6.2.1
  retrieving revision 1.6.2.2
  diff -u -r1.6.2.1 -r1.6.2.2
  --- informix.profile  25 Feb 2005 21:00:18 -0000      1.6.2.1
  +++ informix.profile  6 Oct 2005 20:57:54 -0000       1.6.2.2
  @@ -34,7 +34,6 @@
   # -------------------------------------------------------------------
   
   torque.database = informix
  -database.manual.creation = true
   
   # -------------------------------------------------------------------
   #
  @@ -82,14 +81,17 @@
   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
   
  -createDatabaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
  -buildDatabaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
  -databaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
  -databaseDriver = com.informix.jdbc.IfxDriver
  -databaseUser = informix
  -databasePassword = informix
  -databaseHost = 127.0.0.1
   
   
   # Tells JDBC task that javaName attribute for the tables and columns
  
  
  
  1.3.2.2   +10 -9     db-ojb/profile/maxdb.profile
  
  Index: maxdb.profile
  ===================================================================
  RCS file: /home/cvs/db-ojb/profile/maxdb.profile,v
  retrieving revision 1.3.2.1
  retrieving revision 1.3.2.2
  diff -u -r1.3.2.1 -r1.3.2.2
  --- maxdb.profile     25 Feb 2005 21:00:18 -0000      1.3.2.1
  +++ maxdb.profile     6 Oct 2005 20:57:54 -0000       1.3.2.2
  @@ -35,7 +35,6 @@
   # torque currently (version 3.1) doesn't support MaxDB by its own DB adapter
   # class, thus we use adapter of SapDB.
   torque.database = sapdb
  -database.manual.creation = true
   
   # -------------------------------------------------------------------
   #
  @@ -84,14 +83,16 @@
   urlDbalias = //localhost/OJB
   
   
  -
  -createDatabaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
  -buildDatabaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
  -databaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
  -databaseDriver = com.sap.dbtech.jdbc.DriverSapDB
  -databaseUser = user
  -databasePassword = password
  -databaseHost = 127.0.0.0
  +#
  +# 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
  
  
  
  1.6.2.2   +10 -10    db-ojb/profile/msaccess.profile
  
  Index: msaccess.profile
  ===================================================================
  RCS file: /home/cvs/db-ojb/profile/msaccess.profile,v
  retrieving revision 1.6.2.1
  retrieving revision 1.6.2.2
  diff -u -r1.6.2.1 -r1.6.2.2
  --- msaccess.profile  25 Feb 2005 21:00:18 -0000      1.6.2.1
  +++ msaccess.profile  6 Oct 2005 20:57:54 -0000       1.6.2.2
  @@ -34,7 +34,6 @@
   # -------------------------------------------------------------------
   
   torque.database = msaccess
  -database.manual.creation = true
   
   # -------------------------------------------------------------------
   #
  @@ -81,15 +80,16 @@
   urlSubprotocol = odbc
   urlDbalias = OJB
   
  -
  -
  -createDatabaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
  -buildDatabaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
  -databaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
  -databaseDriver = sun.jdbc.odbc.JdbcOdbcDriver
  -databaseUser =
  -databasePassword =
  -databaseHost = 127.0.0.1
  +#
  +# 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
  
  
  
  1.2.2.2   +9 -9      db-ojb/profile/mssqldb-JSQLConnect.profile
  
  Index: mssqldb-JSQLConnect.profile
  ===================================================================
  RCS file: /home/cvs/db-ojb/profile/mssqldb-JSQLConnect.profile,v
  retrieving revision 1.2.2.1
  retrieving revision 1.2.2.2
  diff -u -r1.2.2.1 -r1.2.2.2
  --- mssqldb-JSQLConnect.profile       25 Feb 2005 21:00:18 -0000      1.2.2.1
  +++ mssqldb-JSQLConnect.profile       6 Oct 2005 20:57:54 -0000       1.2.2.2
  @@ -33,8 +33,7 @@
   #

   # -------------------------------------------------------------------

   

  -database=mssql

  -database.manual.creation = true

  +torque.database=mssql

   

   # -------------------------------------------------------------------

   #

  @@ -80,16 +79,16 @@
   jdbcLevel = 2.0

   urlProtocol = jdbc

   urlSubprotocol = JSQLConnect

  -databaseUser = sa

  -databasePassword = motiva

  -urlDbalias = 
//localhost/database=OJB/user=${databaseUser}/password=${databasePassword}

  +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

   

  -createDatabaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}

  -buildDatabaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}

  -databaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}

  -databaseDriver = com.jnetdirect.jsql.JSQLDriver

  +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

   

   

   # Tells JDBC task that javaName attribute for the tables and columns

  @@ -148,3 +147,4 @@
   # -------------------------------------------------------------------

   

   schemaDirectory=schema

  +ok

  
  
  
  1.2.2.2   +9 -9      db-ojb/profile/mssqldb-ms.profile
  
  Index: mssqldb-ms.profile
  ===================================================================
  RCS file: /home/cvs/db-ojb/profile/mssqldb-ms.profile,v
  retrieving revision 1.2.2.1
  retrieving revision 1.2.2.2
  diff -u -r1.2.2.1 -r1.2.2.2
  --- mssqldb-ms.profile        25 Feb 2005 21:00:18 -0000      1.2.2.1
  +++ mssqldb-ms.profile        6 Oct 2005 20:57:54 -0000       1.2.2.2
  @@ -33,8 +33,7 @@
   #

   # -------------------------------------------------------------------

   

  -database=mssql

  -database.manual.creation = true

  +torque.database=mssql

   

   # -------------------------------------------------------------------

   #

  @@ -80,16 +79,16 @@
   jdbcLevel = 2.0

   urlProtocol = jdbc

   urlSubprotocol = microsoft:sqlserver

  -databaseUser = sa

  -databasePassword = ce

  -urlDbalias = 
//localhost:1433;DatabaseName=OJB;SelectMethod=cursor;User=${databaseUser};Password=${databasePassword};

  +torque.database.user = sa

  +torque.database.password = ce

  +urlDbalias = 
//localhost:1433;DatabaseName=OJB;SelectMethod=cursor;User=${torque.database.user};Password=${torque.database.password};

   

   
#jdbc:microsoft:sqlserver://localhost:1433;DatabaseName=OJB;SelectMethod=cursor;User=bill;Password=gates;

   

  -createDatabaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}

  -buildDatabaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}

  -databaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}

  -databaseDriver = com.microsoft.jdbc.sqlserver.SQLServerDriver

  +torque.database.createUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}

  +torque.database.buildUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}

  +torque.database.url = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}

  +torque.database.driver = com.microsoft.jdbc.sqlserver.SQLServerDriver

   

   

   # Tells JDBC task that javaName attribute for the tables and columns

  @@ -148,3 +147,4 @@
   # -------------------------------------------------------------------

   

   schemaDirectory=schema

  +ok

  
  
  
  1.2.2.2   +9 -9      db-ojb/profile/mssqldb-Opta2000.profile
  
  Index: mssqldb-Opta2000.profile
  ===================================================================
  RCS file: /home/cvs/db-ojb/profile/mssqldb-Opta2000.profile,v
  retrieving revision 1.2.2.1
  retrieving revision 1.2.2.2
  diff -u -r1.2.2.1 -r1.2.2.2
  --- mssqldb-Opta2000.profile  25 Feb 2005 21:00:18 -0000      1.2.2.1
  +++ mssqldb-Opta2000.profile  6 Oct 2005 20:57:54 -0000       1.2.2.2
  @@ -33,8 +33,7 @@
   #

   # -------------------------------------------------------------------

   

  -database=mssql

  -database.manual.creation = true

  +torque.database=mssql

   

   # -------------------------------------------------------------------

   #

  @@ -80,16 +79,16 @@
   jdbcLevel = 2.0

   urlProtocol = jdbc

   urlSubprotocol = inetdae7a

  -databaseUser = sa

  -databasePassword = 

  -urlDbalias = 
?database=OJB&amp;sql7=true&amp;useCursorsAlways=false&amp;username=${databaseUser};password=${databasePassword};

  +torque.database.user = sa

  +torque.database.password =

  +urlDbalias = 
?database=OJB&amp;sql7=true&amp;useCursorsAlways=false&amp;username=${torque.database.user};password=${torque.database.password};

   

   
#jdbc:inetdae7a:localhost:1433?database=OJB&amp;sql7=true&amp;useCursorsAlways=false

   

  -createDatabaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}

  -buildDatabaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}

  -databaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}

  -databaseDriver = com.inet.tds.TdsDriver

  +torque.database.createUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}

  +torque.database.buildUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}

  +torque.database.url = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}

  +torque.database.driver = com.inet.tds.TdsDriver

   

   

   # Tells JDBC task that javaName attribute for the tables and columns

  @@ -148,3 +147,4 @@
   # -------------------------------------------------------------------

   

   schemaDirectory=schema

  +ok

  
  
  
  1.4.2.2   +8 -9      db-ojb/profile/mssqldb.profile
  
  Index: mssqldb.profile
  ===================================================================
  RCS file: /home/cvs/db-ojb/profile/mssqldb.profile,v
  retrieving revision 1.4.2.1
  retrieving revision 1.4.2.2
  diff -u -r1.4.2.1 -r1.4.2.2
  --- mssqldb.profile   25 Feb 2005 21:00:18 -0000      1.4.2.1
  +++ mssqldb.profile   6 Oct 2005 20:57:54 -0000       1.4.2.2
  @@ -33,8 +33,7 @@
   #
   # -------------------------------------------------------------------
   
  -database=mssql
  -database.manual.creation = true
  +torque.database=mssql
   
   # -------------------------------------------------------------------
   #
  @@ -80,16 +79,16 @@
   jdbcLevel = 2.0
   urlProtocol = jdbc
   urlSubprotocol = JSQLConnect
  -databaseUser = sa
  -databasePassword = motiva
  -urlDbalias = 
//localhost/database=OJB/user=${databaseUser}/password=${databasePassword}
  +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
   
  -createDatabaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
  -buildDatabaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
  -databaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
  -databaseDriver = com.jnetdirect.jsql.JSQLDriver
  +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
   
   
   # Tells JDBC task that javaName attribute for the tables and columns
  
  
  
  1.8.2.2   +11 -7     db-ojb/profile/mysql.profile
  
  Index: mysql.profile
  ===================================================================
  RCS file: /home/cvs/db-ojb/profile/mysql.profile,v
  retrieving revision 1.8.2.1
  retrieving revision 1.8.2.2
  diff -u -r1.8.2.1 -r1.8.2.2
  --- mysql.profile     25 Feb 2005 21:00:18 -0000      1.8.2.1
  +++ mysql.profile     6 Oct 2005 20:57:54 -0000       1.8.2.2
  @@ -80,13 +80,17 @@
   urlSubprotocol = mysql
   urlDbalias = //localhost:3306/ojb
   
  -createDatabaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
  -buildDatabaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
  -databaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
  -databaseDriver = org.gjt.mm.mysql.Driver
  -databaseUser = root
  -databasePassword =
  -databaseHost = 127.0.0.1
  +#
  +# 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.
  
  
  
  1.9.2.2   +14 -10    db-ojb/profile/oracle.profile
  
  Index: oracle.profile
  ===================================================================
  RCS file: /home/cvs/db-ojb/profile/oracle.profile,v
  retrieving revision 1.9.2.1
  retrieving revision 1.9.2.2
  diff -u -r1.9.2.1 -r1.9.2.2
  --- oracle.profile    25 Feb 2005 21:00:18 -0000      1.9.2.1
  +++ oracle.profile    6 Oct 2005 20:57:54 -0000       1.9.2.2
  @@ -27,6 +27,10 @@
   #
   # -------------------------------------------------------------------
   
  +# Special Oracle-handling of the delimiter character
  +# (See note at http://db.apache.org/torque/oracle-howto.html)
  +torque.delimiter=/
  +
   # -------------------------------------------------------------------
   #
   #  T A R G E T  D A T A B A S E
  @@ -34,7 +38,6 @@
   # -------------------------------------------------------------------
   
   torque.database = oracle
  -database.manual.creation = true
   
   # -------------------------------------------------------------------
   #
  @@ -82,15 +85,16 @@
   urlDbalias = 
oci8:@(description=(address=(host=127.0.0.1)(protocol=tcp)(port=1521))(connect_data=(sid=orcl)))
   #urlDbalias = thin:@127.0.0.1:1521:orcl
   
  -
  -createDatabaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
  -buildDatabaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
  -databaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
  -databaseDriver = oracle.jdbc.driver.OracleDriver
  -databaseUser = scott
  -databasePassword = tiger
  -databaseHost = 127.0.0.1
  -
  +#
  +# 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 = scott
  +torque.database.password = tiger
  +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.
  
  
  
  1.4.2.2   +18 -14    db-ojb/profile/oracle9i.profile
  
  Index: oracle9i.profile
  ===================================================================
  RCS file: /home/cvs/db-ojb/profile/oracle9i.profile,v
  retrieving revision 1.4.2.1
  retrieving revision 1.4.2.2
  diff -u -r1.4.2.1 -r1.4.2.2
  --- oracle9i.profile  25 Feb 2005 21:00:18 -0000      1.4.2.1
  +++ oracle9i.profile  6 Oct 2005 20:57:54 -0000       1.4.2.2
  @@ -14,12 +14,6 @@
   # * limitations under the License.

   # */

   #-->

  -# 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

   

   # -------------------------------------------------------------------

   #

  @@ -27,13 +21,17 @@
   #

   # -------------------------------------------------------------------

   

  +# Special Oracle-handling of the delimiter character

  +# (See note at http://db.apache.org/torque/oracle-howto.html)

  +torque.delimiter=/

  +

   # -------------------------------------------------------------------

   #

   #  T A R G E T  D A T A B A S E

   #

   # -------------------------------------------------------------------

   

  -torque.database = oracle9

  +torque.database=oracle

   

   # -------------------------------------------------------------------

   #

  @@ -47,12 +45,9 @@
   # -------------------------------------------------------------------

   

   dbmsName = Oracle9i

  -jdbcLevel = 2.0

  +jdbcLevel = 3.0

   urlProtocol = jdbc

   

  -databaseDriver = oracle.jdbc.OracleDriver

  -databaseUser = ojb_test

  -databasePassword = ojb_test

   dbHost = 127.0.0.1

   dbPort = 1521

   dbSID = ORACLE

  @@ -66,9 +61,17 @@
   #urlDbalias = @MY_TNSNAME

   #urlDbalias = 
@(description=(address=(host=${dbHost})(protocol=tcp)(${dbPort}))(connect_data=(sid=${dbSID})))

   

  -databaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}

  -createDatabaseUrl = ${databaseUrl}

  -buildDatabaseUrl = ${databaseUrl}

  +

  +#

  +# 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.OracleDriver

  +torque.database.user = ojb_test

  +torque.database.password = ojb_test

  +torque.database.host = ${dbHost}

   

   # validation query used to detect timed out connections

   # connection was checked when borrowed from pool

  @@ -131,3 +134,4 @@
   # -------------------------------------------------------------------

   

   schemaDirectory=schema

  +ok

  
  
  
  1.9.2.3   +12 -11    db-ojb/profile/postgresql.profile
  
  Index: postgresql.profile
  ===================================================================
  RCS file: /home/cvs/db-ojb/profile/postgresql.profile,v
  retrieving revision 1.9.2.2
  retrieving revision 1.9.2.3
  diff -u -r1.9.2.2 -r1.9.2.3
  --- postgresql.profile        4 Mar 2005 23:33:47 -0000       1.9.2.2
  +++ postgresql.profile        6 Oct 2005 20:57:54 -0000       1.9.2.3
  @@ -51,21 +51,22 @@
   urlProtocol = jdbc
   urlSubprotocol = postgresql
   urlDbalias = ${torque.project}
  -databaseDriver = org.postgresql.Driver
  -databaseUser = ojb
  -databasePassword = ojb
  -databaseHost = localhost
   
  -databaseUrl = 
${urlProtocol}:${urlSubprotocol}://${databaseHost}/${urlDbalias}
  +
  +#
  +# 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
  -createDatabaseUrl = 
${urlProtocol}:${urlSubprotocol}://${databaseHost}/template1
  -buildDatabaseUrl = ${databaseUrl}
  +torque.database.createUrl = 
${urlProtocol}:${urlSubprotocol}://${torque.database.host}/template1
   
  -# Validation query, used to detect timed out connections.
  -# Connection are checked when borrowed from pool.
  -validationQuery=SELECT 1
  -testOnBorrow=true
  +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.
  
  
  
  1.10.2.2  +10 -10    db-ojb/profile/sapdb.profile
  
  Index: sapdb.profile
  ===================================================================
  RCS file: /home/cvs/db-ojb/profile/sapdb.profile,v
  retrieving revision 1.10.2.1
  retrieving revision 1.10.2.2
  diff -u -r1.10.2.1 -r1.10.2.2
  --- sapdb.profile     25 Feb 2005 21:00:18 -0000      1.10.2.1
  +++ sapdb.profile     6 Oct 2005 20:57:54 -0000       1.10.2.2
  @@ -34,7 +34,6 @@
   # -------------------------------------------------------------------
   
   torque.database = sapdb
  -database.manual.creation = true
   
   # -------------------------------------------------------------------
   #
  @@ -81,15 +80,16 @@
   urlSubprotocol = sapdb
   urlDbalias = //localhost/OJB
   
  -
  -
  -createDatabaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
  -buildDatabaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
  -databaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
  -databaseDriver = com.sap.dbtech.jdbc.DriverSapDB
  -databaseUser = user
  -databasePassword = password
  -databaseHost = 127.0.0.1
  +#
  +# 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
  
  
  
  1.6.2.2   +10 -10    db-ojb/profile/sybase.profile
  
  Index: sybase.profile
  ===================================================================
  RCS file: /home/cvs/db-ojb/profile/sybase.profile,v
  retrieving revision 1.6.2.1
  retrieving revision 1.6.2.2
  diff -u -r1.6.2.1 -r1.6.2.2
  --- sybase.profile    25 Feb 2005 21:00:18 -0000      1.6.2.1
  +++ sybase.profile    6 Oct 2005 20:57:54 -0000       1.6.2.2
  @@ -34,7 +34,6 @@
   # -------------------------------------------------------------------
   
   torque.database = sybase
  -database.manual.creation = true
   
   # -------------------------------------------------------------------
   #
  @@ -81,15 +80,16 @@
   urlSubprotocol = ???
   urlDbalias = ???
   
  -
  -
  -createDatabaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
  -buildDatabaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
  -databaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
  -databaseDriver = ???
  -databaseUser =
  -databasePassword =
  -databaseHost = 127.0.0.1
  +#
  +# 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
  
  
  
  No                   revision
  
  Index: sybase.profile
  ===================================================================
  RCS file: /home/cvs/db-ojb/profile/sybase.profile,v
  retrieving revision 1.6.2.1
  retrieving revision 1.6.2.2
  diff -u -r1.6.2.1 -r1.6.2.2
  --- sybase.profile    25 Feb 2005 21:00:18 -0000      1.6.2.1
  +++ sybase.profile    6 Oct 2005 20:57:54 -0000       1.6.2.2
  @@ -34,7 +34,6 @@
   # -------------------------------------------------------------------
   
   torque.database = sybase
  -database.manual.creation = true
   
   # -------------------------------------------------------------------
   #
  @@ -81,15 +80,16 @@
   urlSubprotocol = ???
   urlDbalias = ???
   
  -
  -
  -createDatabaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
  -buildDatabaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
  -databaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
  -databaseDriver = ???
  -databaseUser =
  -databasePassword =
  -databaseHost = 127.0.0.1
  +#
  +# 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
  
  
  
  No                   revision
  
  Index: sybase.profile
  ===================================================================
  RCS file: /home/cvs/db-ojb/profile/sybase.profile,v
  retrieving revision 1.6.2.1
  retrieving revision 1.6.2.2
  diff -u -r1.6.2.1 -r1.6.2.2
  --- sybase.profile    25 Feb 2005 21:00:18 -0000      1.6.2.1
  +++ sybase.profile    6 Oct 2005 20:57:54 -0000       1.6.2.2
  @@ -34,7 +34,6 @@
   # -------------------------------------------------------------------
   
   torque.database = sybase
  -database.manual.creation = true
   
   # -------------------------------------------------------------------
   #
  @@ -81,15 +80,16 @@
   urlSubprotocol = ???
   urlDbalias = ???
   
  -
  -
  -createDatabaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
  -buildDatabaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
  -databaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
  -databaseDriver = ???
  -databaseUser =
  -databasePassword =
  -databaseHost = 127.0.0.1
  +#
  +# 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
  
  
  
  1.3.2.1   +0 -0      db-ojb/profile/firebird.profile
  
  
  
  
  1.3.2.1   +0 -0      db-ojb/profile/mckoi.profile
  
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to