db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mka...@apache.org
Subject cvs commit: db-ojb readme_torque_patch.txt build.xml
Date Fri, 25 Feb 2005 21:00:19 GMT
mkalen      2005/02/25 13:00:19

  Modified:    lib      Tag: OJB_1_0_RELEASE torque-3.0.2.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-Seropto.profile oracle9i.profile
                        postgresql.profile sapdb.profile sybase.profile
               src/schema Tag: OJB_1_0_RELEASE ojbtest-schema.xml
               src/test/org/apache/ojb/broker Tag: OJB_1_0_RELEASE
                        BlobTest.java OptimisticLockingTest.java
                        RsIteratorTest.java
               .        Tag: OJB_1_0_RELEASE build.xml
  Added:       .        Tag: OJB_1_0_RELEASE readme_torque_patch.txt
  Log:
  Patch Torque JAR to add "oracle9" platform with TIMESTAMP and change CLOB-mapping for sapDB.
Tested with Oracle9i and hsqldb. See the readme_torque_patch.txt and the following ojb-dev
thread for details: http://article.gmane.org/gmane.comp.jakarta.ojb.devel/9318
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.1.4.1   +169 -91   db-ojb/lib/Attic/torque-3.0.2.jar
  
  	<<Binary file>>
  
  
  No                   revision
  No                   revision
  1.5.2.1   +1 -3      db-ojb/profile/db2.profile
  
  Index: db2.profile
  ===================================================================
  RCS file: /home/cvs/db-ojb/profile/db2.profile,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- db2.profile	5 Apr 2004 13:58:58 -0000	1.5
  +++ db2.profile	25 Feb 2005 21:00:18 -0000	1.5.2.1
  @@ -27,15 +27,13 @@
   #
   # -------------------------------------------------------------------
   
  -project = ojbtest
  -
   # -------------------------------------------------------------------
   #
   #  T A R G E T  D A T A B A S E
   #
   # -------------------------------------------------------------------
   
  -database = db2
  +torque.database = db2
   database.manual.creation = true
   
   # -------------------------------------------------------------------
  
  
  
  1.4.2.1   +1 -3      db-ojb/profile/hsqldb.profile
  
  Index: hsqldb.profile
  ===================================================================
  RCS file: /home/cvs/db-ojb/profile/hsqldb.profile,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- hsqldb.profile	5 Apr 2004 13:58:58 -0000	1.4
  +++ hsqldb.profile	25 Feb 2005 21:00:18 -0000	1.4.2.1
  @@ -27,15 +27,13 @@
   #
   # -------------------------------------------------------------------
   
  -project = ojbtest
  -
   # -------------------------------------------------------------------
   #
   #  T A R G E T  D A T A B A S E
   #
   # -------------------------------------------------------------------
   
  -database = hypersonic
  +torque.database = hypersonic
   
   # -------------------------------------------------------------------
   #
  
  
  
  1.6.2.1   +1 -3      db-ojb/profile/informix.profile
  
  Index: informix.profile
  ===================================================================
  RCS file: /home/cvs/db-ojb/profile/informix.profile,v
  retrieving revision 1.6
  retrieving revision 1.6.2.1
  diff -u -r1.6 -r1.6.2.1
  --- informix.profile	5 Apr 2004 13:58:58 -0000	1.6
  +++ informix.profile	25 Feb 2005 21:00:18 -0000	1.6.2.1
  @@ -27,15 +27,13 @@
   #
   # -------------------------------------------------------------------
   
  -project = ojbtest
  -
   # -------------------------------------------------------------------
   #
   #  T A R G E T  D A T A B A S E
   #
   # -------------------------------------------------------------------
   
  -database = informix
  +torque.database = informix
   database.manual.creation = true
   
   # -------------------------------------------------------------------
  
  
  
  1.3.2.1   +1 -3      db-ojb/profile/maxdb.profile
  
  Index: maxdb.profile
  ===================================================================
  RCS file: /home/cvs/db-ojb/profile/maxdb.profile,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- maxdb.profile	5 Apr 2004 13:58:58 -0000	1.3
  +++ maxdb.profile	25 Feb 2005 21:00:18 -0000	1.3.2.1
  @@ -27,8 +27,6 @@
   #
   # -------------------------------------------------------------------
   
  -project = ojbtest
  -
   # -------------------------------------------------------------------
   #
   #  T A R G E T  D A T A B A S E
  @@ -36,7 +34,7 @@
   # -------------------------------------------------------------------
   # torque currently (version 3.1) doesn't support MaxDB by its own DB adapter
   # class, thus we use adapter of SapDB.
  -database = sapdb
  +torque.database = sapdb
   database.manual.creation = true
   
   # -------------------------------------------------------------------
  
  
  
  1.6.2.1   +1 -3      db-ojb/profile/msaccess.profile
  
  Index: msaccess.profile
  ===================================================================
  RCS file: /home/cvs/db-ojb/profile/msaccess.profile,v
  retrieving revision 1.6
  retrieving revision 1.6.2.1
  diff -u -r1.6 -r1.6.2.1
  --- msaccess.profile	5 Apr 2004 13:58:58 -0000	1.6
  +++ msaccess.profile	25 Feb 2005 21:00:18 -0000	1.6.2.1
  @@ -27,15 +27,13 @@
   #
   # -------------------------------------------------------------------
   
  -project = ojbtest
  -
   # -------------------------------------------------------------------
   #
   #  T A R G E T  D A T A B A S E
   #
   # -------------------------------------------------------------------
   
  -database = msaccess
  +torque.database = msaccess
   database.manual.creation = true
   
   # -------------------------------------------------------------------
  
  
  
  1.2.2.1   +0 -2      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
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- mssqldb-JSQLConnect.profile	5 Apr 2004 13:58:58 -0000	1.2
  +++ mssqldb-JSQLConnect.profile	25 Feb 2005 21:00:18 -0000	1.2.2.1
  @@ -27,8 +27,6 @@
   #
   # -------------------------------------------------------------------
   
  -project = ojbtest
  -
   # -------------------------------------------------------------------
   #
   #  T A R G E T  D A T A B A S E
  
  
  
  1.2.2.1   +0 -2      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
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- mssqldb-ms.profile	5 Apr 2004 13:58:58 -0000	1.2
  +++ mssqldb-ms.profile	25 Feb 2005 21:00:18 -0000	1.2.2.1
  @@ -27,8 +27,6 @@
   #
   # -------------------------------------------------------------------
   
  -project = ojbtest
  -
   # -------------------------------------------------------------------
   #
   #  T A R G E T  D A T A B A S E
  
  
  
  1.2.2.1   +0 -2      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
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- mssqldb-Opta2000.profile	5 Apr 2004 13:58:58 -0000	1.2
  +++ mssqldb-Opta2000.profile	25 Feb 2005 21:00:18 -0000	1.2.2.1
  @@ -27,8 +27,6 @@
   #
   # -------------------------------------------------------------------
   
  -project = ojbtest
  -
   # -------------------------------------------------------------------
   #
   #  T A R G E T  D A T A B A S E
  
  
  
  1.4.2.1   +0 -2      db-ojb/profile/mssqldb.profile
  
  Index: mssqldb.profile
  ===================================================================
  RCS file: /home/cvs/db-ojb/profile/mssqldb.profile,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- mssqldb.profile	5 Apr 2004 13:58:58 -0000	1.4
  +++ mssqldb.profile	25 Feb 2005 21:00:18 -0000	1.4.2.1
  @@ -27,8 +27,6 @@
   #
   # -------------------------------------------------------------------
   
  -project = ojbtest
  -
   # -------------------------------------------------------------------
   #
   #  T A R G E T  D A T A B A S E
  
  
  
  1.8.2.1   +1 -3      db-ojb/profile/mysql.profile
  
  Index: mysql.profile
  ===================================================================
  RCS file: /home/cvs/db-ojb/profile/mysql.profile,v
  retrieving revision 1.8
  retrieving revision 1.8.2.1
  diff -u -r1.8 -r1.8.2.1
  --- mysql.profile	5 Apr 2004 13:58:58 -0000	1.8
  +++ mysql.profile	25 Feb 2005 21:00:18 -0000	1.8.2.1
  @@ -27,15 +27,13 @@
   #
   # -------------------------------------------------------------------
   
  -project = ojbtest
  -
   # -------------------------------------------------------------------
   #
   #  T A R G E T  D A T A B A S E
   #
   # -------------------------------------------------------------------
   
  -database = mysql
  +torque.database = mysql
   
   # -------------------------------------------------------------------
   #
  
  
  
  1.9.2.1   +1 -3      db-ojb/profile/oracle.profile
  
  Index: oracle.profile
  ===================================================================
  RCS file: /home/cvs/db-ojb/profile/oracle.profile,v
  retrieving revision 1.9
  retrieving revision 1.9.2.1
  diff -u -r1.9 -r1.9.2.1
  --- oracle.profile	5 Apr 2004 13:58:58 -0000	1.9
  +++ oracle.profile	25 Feb 2005 21:00:18 -0000	1.9.2.1
  @@ -27,15 +27,13 @@
   #
   # -------------------------------------------------------------------
   
  -project = ojbtest
  -
   # -------------------------------------------------------------------
   #
   #  T A R G E T  D A T A B A S E
   #
   # -------------------------------------------------------------------
   
  -database = oracle
  +torque.database = oracle
   database.manual.creation = true
   
   # -------------------------------------------------------------------
  
  
  
  1.3.2.1   +1 -3      db-ojb/profile/oracle9i-Seropto.profile
  
  Index: oracle9i-Seropto.profile
  ===================================================================
  RCS file: /home/cvs/db-ojb/profile/oracle9i-Seropto.profile,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- oracle9i-Seropto.profile	5 Apr 2004 13:58:58 -0000	1.3
  +++ oracle9i-Seropto.profile	25 Feb 2005 21:00:18 -0000	1.3.2.1
  @@ -27,15 +27,13 @@
   #
   # -------------------------------------------------------------------
   
  -project = ojbtest
  -
   # -------------------------------------------------------------------
   #
   #  T A R G E T  D A T A B A S E
   #
   # -------------------------------------------------------------------
   
  -database = oracle
  +torque.database = oracle9
   database.manual.creation = true
   
   # -------------------------------------------------------------------
  
  
  
  1.4.2.1   +1 -32     db-ojb/profile/oracle9i.profile
  
  Index: oracle9i.profile
  ===================================================================
  RCS file: /home/cvs/db-ojb/profile/oracle9i.profile,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- oracle9i.profile	24 Jun 2004 10:02:46 -0000	1.4
  +++ oracle9i.profile	25 Feb 2005 21:00:18 -0000	1.4.2.1
  @@ -27,44 +27,13 @@
   #
   # -------------------------------------------------------------------
   
  -project = ojbtest
  -
   # -------------------------------------------------------------------
   #
   #  T A R G E T  D A T A B A S E
   #
   # -------------------------------------------------------------------
   
  -database = oracle
  -database.manual.creation = true
  -
  -# -------------------------------------------------------------------
  -#
  -#  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
  +torque.database = oracle9
   
   # -------------------------------------------------------------------
   #
  
  
  
  1.9.2.1   +150 -152  db-ojb/profile/postgresql.profile
  
  Index: postgresql.profile
  ===================================================================
  RCS file: /home/cvs/db-ojb/profile/postgresql.profile,v
  retrieving revision 1.9
  retrieving revision 1.9.2.1
  diff -u -r1.9 -r1.9.2.1
  --- postgresql.profile	19 Jun 2004 14:49:12 -0000	1.9
  +++ postgresql.profile	25 Feb 2005 21:00:18 -0000	1.9.2.1
  @@ -1,152 +1,150 @@
  -#<!--
  -#/* Copyright 2002-2004 The Apache Software Foundation
  -# *
  -# * Licensed under the Apache License, Version 2.0 (the "License");
  -# * you may not use this file except in compliance with the License.
  -# * You may obtain a copy of the License at
  -# *
  -# *     http://www.apache.org/licenses/LICENSE-2.0
  -# *
  -# * Unless required by applicable law or agreed to in writing, software
  -# * distributed under the License is distributed on an "AS IS" BASIS,
  -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  -# * See the License for the specific language governing permissions and
  -# * 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}/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
  -#
  -# -------------------------------------------------------------------
  -
  -project = ojbtest
  -
  -# -------------------------------------------------------------------
  -#
  -#  T A R G E T  D A T A B A S E
  -#
  -# -------------------------------------------------------------------
  -
  -database = postgresql
  -# Set this to true if you want to create the database manually
  -database.manual.creation = false
  -
  -# -------------------------------------------------------------------
  -#
  -#  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 = PostgreSQL
  -jdbcLevel = 3.0
  -urlProtocol = jdbc
  -urlSubprotocol = postgresql
  -urlDbalias = ${project}
  -databaseDriver = org.postgresql.Driver
  -databaseUser = ojb
  -databasePassword = 
  -databaseHost = localhost
  -
  -databaseUrl = ${urlProtocol}:${urlSubprotocol}://${databaseHost}/${urlDbalias}
  -# 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}
  -
  -# 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
  -#
  -# -------------------------------------------------------------------
  -
  -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
  +#<!--
  +#/* Copyright 2002-2004 The Apache Software Foundation
  +# *
  +# * Licensed under the Apache License, Version 2.0 (the "License");
  +# * you may not use this file except in compliance with the License.
  +# * You may obtain a copy of the License at
  +# *
  +# *     http://www.apache.org/licenses/LICENSE-2.0
  +# *
  +# * Unless required by applicable law or agreed to in writing, software
  +# * distributed under the License is distributed on an "AS IS" BASIS,
  +# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +# * See the License for the specific language governing permissions and
  +# * 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}/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
  +# Set this to true if you want to create the database manually
  +database.manual.creation = false
  +
  +# -------------------------------------------------------------------
  +#
  +#  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 = PostgreSQL
  +jdbcLevel = 3.0
  +urlProtocol = jdbc
  +urlSubprotocol = postgresql
  +urlDbalias = ${project}
  +databaseDriver = org.postgresql.Driver
  +databaseUser = ojb
  +databasePassword =
  +databaseHost = localhost
  +
  +databaseUrl = ${urlProtocol}:${urlSubprotocol}://${databaseHost}/${urlDbalias}
  +# 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}
  +
  +# 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
  +#
  +# -------------------------------------------------------------------
  +
  +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
  
  
  
  1.10.2.1  +1 -3      db-ojb/profile/sapdb.profile
  
  Index: sapdb.profile
  ===================================================================
  RCS file: /home/cvs/db-ojb/profile/sapdb.profile,v
  retrieving revision 1.10
  retrieving revision 1.10.2.1
  diff -u -r1.10 -r1.10.2.1
  --- sapdb.profile	5 Apr 2004 13:58:58 -0000	1.10
  +++ sapdb.profile	25 Feb 2005 21:00:18 -0000	1.10.2.1
  @@ -27,15 +27,13 @@
   #
   # -------------------------------------------------------------------
   
  -project = ojbtest
  -
   # -------------------------------------------------------------------
   #
   #  T A R G E T  D A T A B A S E
   #
   # -------------------------------------------------------------------
   
  -database = sapdb
  +torque.database = sapdb
   database.manual.creation = true
   
   # -------------------------------------------------------------------
  
  
  
  1.6.2.1   +1 -3      db-ojb/profile/sybase.profile
  
  Index: sybase.profile
  ===================================================================
  RCS file: /home/cvs/db-ojb/profile/sybase.profile,v
  retrieving revision 1.6
  retrieving revision 1.6.2.1
  diff -u -r1.6 -r1.6.2.1
  --- sybase.profile	5 Apr 2004 13:58:58 -0000	1.6
  +++ sybase.profile	25 Feb 2005 21:00:18 -0000	1.6.2.1
  @@ -27,15 +27,13 @@
   #
   # -------------------------------------------------------------------
   
  -project = ojbtest
  -
   # -------------------------------------------------------------------
   #
   #  T A R G E T  D A T A B A S E
   #
   # -------------------------------------------------------------------
   
  -database = sybase
  +torque.database = sybase
   database.manual.creation = true
   
   # -------------------------------------------------------------------
  
  
  
  No                   revision
  No                   revision
  1.80.2.10 +3 -3      db-ojb/src/schema/ojbtest-schema.xml
  
  Index: ojbtest-schema.xml
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/schema/ojbtest-schema.xml,v
  retrieving revision 1.80.2.9
  retrieving revision 1.80.2.10
  diff -u -r1.80.2.9 -r1.80.2.10
  --- ojbtest-schema.xml	19 Dec 2004 02:24:47 -0000	1.80.2.9
  +++ ojbtest-schema.xml	25 Feb 2005 21:00:19 -0000	1.80.2.10
  @@ -203,8 +203,8 @@
   
     <table name="BLOB_TEST">
       <column name="ID" required="true" primaryKey="true" type="INTEGER"/>
  -    <column name="BLOB_VALUE_" type="LONGVARBINARY"/>
  -    <column name="CLOB_VALUE_" type="LONGVARCHAR"/>
  +    <column name="BLOB_VALUE_" type="BLOB"/>
  +    <column name="CLOB_VALUE_" type="CLOB"/>
     </table>
   
     <table name="MDTEST_MASTER">
  
  
  
  No                   revision
  No                   revision
  1.9.2.2   +0 -9      db-ojb/src/test/org/apache/ojb/broker/BlobTest.java
  
  Index: BlobTest.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/BlobTest.java,v
  retrieving revision 1.9.2.1
  retrieving revision 1.9.2.2
  diff -u -r1.9.2.1 -r1.9.2.2
  --- BlobTest.java	23 Feb 2005 21:16:16 -0000	1.9.2.1
  +++ BlobTest.java	25 Feb 2005 21:00:19 -0000	1.9.2.2
  @@ -11,10 +11,6 @@
    */
   public class BlobTest extends PBTestCase
   {
  -    // TODO: resolv according to message string:
  -    private static final String ORACLE_TORQUE_LOB_MESSAGE =
  -            "TODO: Resolv if we can get Torque to generate proper BLOB/CLOB" +
  -            " columns instead of LONG RAW and VARCHAR2(2000).";
       private static final String SKIP_MESSAGE =
               "# Skip "+BlobTest.class.getName()+", DB does not support Blob/Clob #";
   
  @@ -43,11 +39,6 @@
           {
               skipTest = true;
           }
  -        else if (platformClass.startsWith("org.apache.ojb.broker.platforms.PlatformOracle")
  -                 && ojbSkipKnownIssueProblem(ORACLE_TORQUE_LOB_MESSAGE))
  -        {
  -            skipTest = true;
  -        }
       }
   
       public void testBlobInsertion() throws Exception
  
  
  
  1.10.2.5  +1 -14     db-ojb/src/test/org/apache/ojb/broker/OptimisticLockingTest.java
  
  Index: OptimisticLockingTest.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/OptimisticLockingTest.java,v
  retrieving revision 1.10.2.4
  retrieving revision 1.10.2.5
  diff -u -r1.10.2.4 -r1.10.2.5
  --- OptimisticLockingTest.java	23 Feb 2005 22:10:15 -0000	1.10.2.4
  +++ OptimisticLockingTest.java	25 Feb 2005 21:00:19 -0000	1.10.2.5
  @@ -7,10 +7,6 @@
    */
   public class OptimisticLockingTest extends PBTestCase
   {
  -    // TODO: resolv this:
  -    private static final String ORACLE_TORQUE_TIMETSAMP =
  -            "TODO: Resolv if we can get Torque to generate proper TIMESTAMP" +
  -            " columns instead of DATE (NB: TIMESTAMP is introduced in Orcale 9).";
   
   	public static void main(String[] args)
   	{
  @@ -121,16 +117,6 @@
   /** Test optimistic Lock by timestamp.*/
   	public void testTimestampLock() throws Exception
   	{
  -        // mkalen: Torque will produce DATE in DDL when using Oracle so
  -        //          we only get second (sic!) precision on the lock.
  -        //          Skip test to avoid undeterministic behaviour (until we can get
  -        //          proper DDL with TIMESTAMP).
  -        if (getPlatformClass().startsWith("org.apache.ojb.broker.platforms.PlatformOracle")
  -            && ojbSkipKnownIssueProblem(ORACLE_TORQUE_TIMETSAMP))
  -        {
  -                return;
  -        }
  -
   		LockedByTimestamp obj = new LockedByTimestamp();
           obj.setValue("original");
           Identity oid = new Identity(obj, broker);
  @@ -196,4 +182,5 @@
           }
           fail("Should throw an Optimistic Lock exception");
       }
  +
   }
  
  
  
  1.5.2.1   +2 -7      db-ojb/src/test/org/apache/ojb/broker/RsIteratorTest.java
  
  Index: RsIteratorTest.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/RsIteratorTest.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- RsIteratorTest.java	20 Dec 2003 12:35:40 -0000	1.5
  +++ RsIteratorTest.java	25 Feb 2005 21:00:19 -0000	1.5.2.1
  @@ -329,12 +329,7 @@
           Query query = new QueryByCriteria(Person.class, criteria);
           // Run the query.
           Person person = (Person) broker.getObjectByQuery(query);
  -        // The previous call may or may not return a 'real' Person
  -        // object.  What it returns is not important.  The test here
  -        // is whether or not this call raises an error or not.  When
  -        // this code runs using hsqldb, it works fine.  However, when
  -        // this code runs against Oracle, it fails with a null pointer
  -        // exception.
  +        assertNotNull("Person with id 1 was not found", person);
       }
  -}
   
  +}
  
  
  
  No                   revision
  No                   revision
  1.144.2.21 +2 -2      db-ojb/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/db-ojb/build.xml,v
  retrieving revision 1.144.2.20
  retrieving revision 1.144.2.21
  diff -u -r1.144.2.20 -r1.144.2.21
  --- build.xml	19 Feb 2005 21:41:46 -0000	1.144.2.20
  +++ build.xml	25 Feb 2005 21:00:19 -0000	1.144.2.21
  @@ -371,7 +371,7 @@
           <copy todir="${build.test}">
               <fileset dir="${src.dir}/schema" includes="*.xml,*.dtd"/>
               <filterset>
  -                <filter token="DATABASE_DEFAULT" value="${project}" />
  +                <filter token="DATABASE_DEFAULT" value="${torque.project}" />
               </filterset>
   
           </copy>
  
  
  
  No                   revision
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/db-ojb/build.xml,v
  retrieving revision 1.144.2.20
  retrieving revision 1.144.2.21
  diff -u -r1.144.2.20 -r1.144.2.21
  --- build.xml	19 Feb 2005 21:41:46 -0000	1.144.2.20
  +++ build.xml	25 Feb 2005 21:00:19 -0000	1.144.2.21
  @@ -371,7 +371,7 @@
           <copy todir="${build.test}">
               <fileset dir="${src.dir}/schema" includes="*.xml,*.dtd"/>
               <filterset>
  -                <filter token="DATABASE_DEFAULT" value="${project}" />
  +                <filter token="DATABASE_DEFAULT" value="${torque.project}" />
               </filterset>
   
           </copy>
  
  
  
  No                   revision
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/db-ojb/build.xml,v
  retrieving revision 1.144.2.20
  retrieving revision 1.144.2.21
  diff -u -r1.144.2.20 -r1.144.2.21
  --- build.xml	19 Feb 2005 21:41:46 -0000	1.144.2.20
  +++ build.xml	25 Feb 2005 21:00:19 -0000	1.144.2.21
  @@ -371,7 +371,7 @@
           <copy todir="${build.test}">
               <fileset dir="${src.dir}/schema" includes="*.xml,*.dtd"/>
               <filterset>
  -                <filter token="DATABASE_DEFAULT" value="${project}" />
  +                <filter token="DATABASE_DEFAULT" value="${torque.project}" />
               </filterset>
   
           </copy>
  
  
  
  1.1.2.1   +77 -0     db-ojb/Attic/readme_torque_patch.txt
  
  
  
  

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


Mime
View raw message