db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arm...@apache.org
Subject cvs commit: db-ojb build.xml
Date Thu, 24 Jun 2004 10:02:46 GMT
arminw      2004/06/24 03:02:46

  Modified:    profile  oracle9i.profile
               src/test/org/apache/ojb repository_database.xml
               .        build.xml
  Log:
  - OJB270,
  fix by martin kalen,
  better oracle9i support, activate "validationQuery" for oracle out of the box
  
  - remove deprecated "eager-release" entry from repository_database.xml
  (only older JBoss versions need this flag)
  
  Revision  Changes    Path
  1.4       +21 -9     db-ojb/profile/oracle9i.profile
  
  Index: oracle9i.profile
  ===================================================================
  RCS file: /home/cvs/db-ojb/profile/oracle9i.profile,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- oracle9i.profile	5 Apr 2004 13:58:58 -0000	1.3
  +++ oracle9i.profile	24 Jun 2004 10:02:46 -0000	1.4
  @@ -80,19 +80,31 @@
   dbmsName = Oracle9i
   jdbcLevel = 2.0
   urlProtocol = jdbc
  -urlSubprotocol = oracle
  -#urlDbalias = oci8:@(description=(address=(host=127.0.0.1)(protocol=tcp)(port=1521))(connect_data=(sid=orcl)))
  -urlDbalias = thin:@plqaibm2:1521:QADBI2
   
  +databaseDriver = oracle.jdbc.OracleDriver
  +databaseUser = ojb_test
  +databasePassword = ojb_test
  +dbHost = 127.0.0.1
  +dbPort = 1521
  +dbSID = ORACLE
  +
  +# 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})))
   
  -createDatabaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
  -buildDatabaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
   databaseUrl = ${urlProtocol}:${urlSubprotocol}:${urlDbalias}
  -databaseDriver = oracle.jdbc.driver.OracleDriver
  -databaseUser = mbaird
  -databasePassword = mbaird
  -databaseHost = plqaibm2
  +createDatabaseUrl = ${databaseUrl}
  +buildDatabaseUrl = ${databaseUrl}
   
  +# validation query used to detect timed out connections
  +# connection was checked when borrowed from pool
  +validationQuery=SELECT 1 FROM DUAL
  +testOnBorrow=true
   
   # Tells JDBC task that javaName attribute for the tables and columns
   # should be made same as SQL name.
  
  
  
  1.22      +5 -3      db-ojb/src/test/org/apache/ojb/repository_database.xml
  
  Index: repository_database.xml
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/repository_database.xml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- repository_database.xml	5 Apr 2004 13:58:59 -0000	1.21
  +++ repository_database.xml	24 Jun 2004 10:02:46 -0000	1.22
  @@ -41,7 +41,6 @@
      		dbalias="@URL_DBALIAS@"
      		username="@USER_NAME@"
      		password="@USER_PASSWD@"
  -        eager-release="false"
      		batch-mode="false"
           useAutoCommit="1"
           ignoreAutoCommitExceptions="false"
  @@ -54,7 +53,10 @@
   
           <connection-pool
               maxActive="21"
  -            validationQuery="" />
  +            validationQuery="@VALIDATION_QUERY@"
  +            testOnBorrow="@TEST_ON_BORROW@"
  +            testOnReturn="@TEST_ON_RETURN@"
  +        />
   
           <sequence-manager className="org.apache.ojb.broker.util.sequence.SequenceManagerHighLowImpl">
               <attribute attribute-name="grabSize" attribute-value="20"/>
  
  
  
  1.141     +11 -3     db-ojb/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/db-ojb/build.xml,v
  retrieving revision 1.140
  retrieving revision 1.141
  diff -u -r1.140 -r1.141
  --- build.xml	22 Jun 2004 20:46:48 -0000	1.140
  +++ build.xml	24 Jun 2004 10:02:46 -0000	1.141
  @@ -34,6 +34,11 @@
       <!-- Set values in test profile -->
       <property file="${ojb.testProfile}"/>
   
  +    <!-- Set default  values for properties not initialized by profile -->
  +    <property name="validationQuery" value=""/>
  +    <property name="testOnBorrow" value="true"/>
  +    <property name="testOnReturn" value="false"/>
  +
       <!-- clover initialization-->
       <property name="clover.initstring" location="${build.dir}/coverage.db"/>
   
  @@ -341,6 +346,9 @@
                   <filter token="URL_DBALIAS" value="${urlDbalias}" />
                   <filter token="USER_NAME" value="${databaseUser}" />
                   <filter token="USER_PASSWD" value="${databasePassword}" />
  +                <filter token="VALIDATION_QUERY" value="${validationQuery}" />
  +                <filter token="TEST_ON_BORROW" value="${testOnBorrow}" />
  +                <filter token="TEST_ON_RETURN" value="${testOnReturn}" />
               </filterset>
   
           </copy>
  @@ -1020,9 +1028,9 @@
   
               <!-- For whatever reason you have to provide source files to batchtest
                    so the usage of this would be somthing like:
  -                 
  +
                    and -Dojb.testsToRun=org/apache/ojb/broker/AllTests.java
  -                 
  +
                    to execute all PB tests -->
               <batchtest fork="yes" haltonfailure="no"
                          todir="target/test" >
  
  
  

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