Scarab commit: svn commit: r10395 - trunk: . src/conf/conf www/repository/commons-pool/jars

Author: ronvoe122
Date: 2006-12-28 06:50:52-0800
New Revision: 10395

Added:
   trunk/www/repository/commons-pool/jars/commons-pool-1.3.jar
      - copied unchanged from r10357, /branches/release/b21/www/repository/commons-pool/jars/commons-pool-1.3.jar
Removed:
   trunk/www/repository/commons-pool/jars/commons-pool-1.2.jar
Modified:
   trunk/   (props changed)
   trunk/project.xml
   trunk/src/conf/conf/Torque.properties

Log:
Merged revisions 10356-10357 via svnmerge from 
http://scarab.tigris.org/svn/scarab/branches/release/b21

........
  r10356 | spjames | 2006-11-13 17:56:47 +0100 (Mo, 13 Nov 2006) | 1 line
  
  In pursuit of SCB1877, updated commons-pool from 1.2 to 1.3
........
  r10357 | spjames | 2006-11-14 17:28:42 +0100 (Di, 14 Nov 2006) | 1 line
  
  Possible resolution to SCB1877 (Scarab stops responding after many days of use) by restoring torque.dsfactory.scarab.pool.testOnBorrow to its default of 'true'
........


Modified: trunk/project.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/project.xml?view=diff&rev=10395&p1=trunk/project.xml&p2=trunk/project.xml&r1=10394&r2=10395
==============================================================================
--- trunk/project.xml	(original)
+++ trunk/project.xml	2006-12-28 06:50:52-0800
@@ -336,7 +336,7 @@
     <dependency>
       <groupId>commons-pool</groupId>
       <artifactId>commons-pool</artifactId>
-      <version>1.2</version>
+      <version>1.3</version>
       <type>jar</type>
       <properties>
         <war.bundle>true</war.bundle>

Modified: trunk/src/conf/conf/Torque.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/conf/Torque.properties?view=diff&rev=10395&p1=trunk/src/conf/conf/Torque.properties&p2=trunk/src/conf/conf/Torque.properties&r1=10394&r2=10395
==============================================================================
--- trunk/src/conf/conf/Torque.properties	(original)
+++ trunk/src/conf/conf/Torque.properties	2006-12-28 06:50:52-0800
@@ -40,14 +40,17 @@
 #
 # The parameters to connect to the default database.  You MUST
 # configure these properly.
+# 
+# See http://jakarta.apache.org/commons/dbcp/configuration.html for
+# the possible dbcp configuration parameters.
+# See also this relevant thread: http://mail-archives.apache.org/mod_mbox/db-ojb-user/200504.mbox/<42708881.6030202%40apache.org> Other configuration 
+# combinations are discussed there.
 # -------------------------------------------------------------------
 
 torque.database.default=scarab
 torque.database.scarab.adapter=mysql
 
 torque.dsfactory.scarab.factory=org.apache.torque.dsfactory.SharedPoolDataSourceFactory
-torque.dsfactory.scarab.pool.maxActive=10
-torque.dsfactory.scarab.pool.testOnBorrow=false
 torque.dsfactory.scarab.pool.validationQuery=SELECT 1
 torque.dsfactory.scarab.pool.maxWait=30000
 torque.dsfactory.scarab.connection.driver=org.gjt.mm.mysql.Driver

Removed: trunk/www/repository/commons-pool/jars/commons-pool-1.2.jar
Url: http://scarab.tigris.org/source/browse/scarab/trunk/www/repository/commons-pool/jars/commons-pool-1.2.jar?view=auto&rev=10394