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 build-torque.xml build.properties build.xml
Date Fri, 11 Mar 2005 18:49:56 GMT
mkalen      2005/03/11 10:49:56

  Modified:    profile  oracle.profile oracle9i.profile
               src/doc/forrest/src/documentation/content/xdocs/docu/guides
                        platforms.xml
               .        build-torque.xml build.properties build.xml
  Removed:     profile  oracle9i-Seropto.profile
  Log:
  Fix SQL execution with Oracle and new Torque (PL/SQL code generated for conditional dropping
of tables is using "\" as delimiter character, see http://db.apache.org/torque/oracle-howto.html).
Drop unmaintained private "oracle9i-Seropto"-profile (use oracle9i.profile and set DB params
there).
  
  Revision  Changes    Path
  1.11      +4 -0      db-ojb/profile/oracle.profile
  
  Index: oracle.profile
  ===================================================================
  RCS file: /home/cvs/db-ojb/profile/oracle.profile,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- oracle.profile	13 Nov 2004 16:20:16 -0000	1.10
  +++ oracle.profile	11 Mar 2005 18:49:55 -0000	1.11
  @@ -29,6 +29,10 @@
   
   project = ojbtest
   
  +# 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
  
  
  
  1.7       +4 -2      db-ojb/profile/oracle9i.profile
  
  Index: oracle9i.profile
  ===================================================================
  RCS file: /home/cvs/db-ojb/profile/oracle9i.profile,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- oracle9i.profile	11 Mar 2005 16:54:42 -0000	1.6
  +++ oracle9i.profile	11 Mar 2005 18:49:55 -0000	1.7
  @@ -14,8 +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.
   
   # -------------------------------------------------------------------
   #
  @@ -25,6 +23,10 @@
   
   project = ojbtest
   
  +# 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
  
  
  
  1.3       +1 -2      db-ojb/src/doc/forrest/src/documentation/content/xdocs/docu/guides/platforms.xml
  
  Index: platforms.xml
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/doc/forrest/src/documentation/content/xdocs/docu/guides/platforms.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- platforms.xml	30 Jun 2004 21:57:11 -0000	1.2
  +++ platforms.xml	11 Mar 2005 18:49:56 -0000	1.3
  @@ -279,7 +279,6 @@
   #profile=db2
   #profile=oracle
   #profile=oracle9i
  -#profile=oracle9i-Seropto
   #profile=msaccess
   #profile=postgresql
   #profile=informix
  
  
  
  1.10      +2 -1      db-ojb/build-torque.xml
  
  Index: build-torque.xml
  ===================================================================
  RCS file: /home/cvs/db-ojb/build-torque.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- build-torque.xml	11 Mar 2005 14:02:47 -0000	1.9
  +++ build-torque.xml	11 Mar 2005 18:49:56 -0000	1.10
  @@ -392,7 +392,8 @@
         sqldbmap="${torque.sql.dir}/sqldb.map"
         srcDir="${torque.sql.dir}"
         url="${torque.database.buildUrl}"
  -      userid="${torque.database.user}">
  +      userid="${torque.database.user}"
  +      delimiter="${torque.delimiter}">
         <classpath refid="torque-classpath"/>
       </torque-sql-exec>
   
  
  
  
  1.73      +1 -2      db-ojb/build.properties
  
  Index: build.properties
  ===================================================================
  RCS file: /home/cvs/db-ojb/build.properties,v
  retrieving revision 1.72
  retrieving revision 1.73
  diff -u -r1.72 -r1.73
  --- build.properties	14 Sep 2004 16:55:04 -0000	1.72
  +++ build.properties	11 Mar 2005 18:49:56 -0000	1.73
  @@ -36,7 +36,6 @@
   #profile=db2
   #profile=oracle
   #profile=oracle9i
  -#profile=oracle9i-Seropto
   #profile=msaccess
   #profile=postgresql
   #profile=informix
  
  
  
  1.168     +2 -1      db-ojb/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/db-ojb/build.xml,v
  retrieving revision 1.167
  retrieving revision 1.168
  diff -u -r1.167 -r1.168
  --- build.xml	11 Mar 2005 16:53:05 -0000	1.167
  +++ build.xml	11 Mar 2005 18:49:56 -0000	1.168
  @@ -38,6 +38,7 @@
       <property file="profile/${profile}.profile"/>
   
       <!-- Set default values for properties not initialized by profile -->
  +    <property name="torque.delimiter" value=";"/>
       <property name="validationQuery" value=""/>
       <property name="testOnBorrow" value="true"/>
       <property name="testOnReturn" value="false"/>
  
  
  

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