From 492aabbbcc124f966353320edf5a856a0ed3f2a9 Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Mon, 23 Oct 2006 13:30:28 +0000
Subject: [PATCH] Merged V1.4 to HEAD    svn merge
 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4197
 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4198 .

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4199 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/core-services-context.xml     |  3 +
 .../custom-connection-pool-context.xml.sample | 57 +++++++++++++++++++
 config/alfresco/repository.properties         |  1 -
 3 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 config/alfresco/extension/custom-connection-pool-context.xml.sample

diff --git a/config/alfresco/core-services-context.xml b/config/alfresco/core-services-context.xml
index c2a7980704..3243cd34f8 100644
--- a/config/alfresco/core-services-context.xml
+++ b/config/alfresco/core-services-context.xml
@@ -42,6 +42,9 @@
         <property name="maxActive" >
             <value>${db.pool.max}</value>
         </property>
+        <property name="defaultAutoCommit" >
+            <value>false</value>
+        </property>
     </bean>
 
     <!-- transaction service -->
diff --git a/config/alfresco/extension/custom-connection-pool-context.xml.sample b/config/alfresco/extension/custom-connection-pool-context.xml.sample
new file mode 100644
index 0000000000..546c1d3ac1
--- /dev/null
+++ b/config/alfresco/extension/custom-connection-pool-context.xml.sample
@@ -0,0 +1,57 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
+
+<!--
+   An example of how to override the dataSource bean.
+   If an alternative pool is desired, such as C3P0, then it can be referenced by
+   changing the 'class' attribute and adding or removing the required properties.
+   The required libraries can be dropped into the servers extension lib folders.
+-->
+<beans>
+
+    <!-- Datasource bean -->
+    <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+        <!-- connection settings -->
+        <property name="driverClassName">
+            <value>${db.driver}</value>
+        </property>
+        <property name="url">
+            <value>${db.url}</value>
+        </property>
+        <property name="username">
+            <value>${db.username}</value>
+        </property>
+        <property name="password">
+            <value>${db.password}</value>
+        </property>
+        <property name="defaultAutoCommit" >
+            <value>false</value>
+        </property>
+        <!-- pool settings -->
+        <property name="initialSize" >
+            <value>${db.pool.initial}</value>
+        </property>
+        <property name="maxActive" >
+            <value>${db.pool.max}</value>
+        </property>
+        <property name="timeBetweenEvictionRunsMillis" >
+            <value>300000</value>
+        </property>
+        <property name="minEvictableIdleTimeMillis" >
+            <value>-1</value>
+        </property>
+        <property name="testOnBorrow" >
+            <value>false</value>
+        </property>
+        <property name="maxWait" >
+            <value>50000</value>
+        </property>
+        <property name="testWhileIdle" >
+            <value>true</value>
+        </property>
+        <property name="validationQuery" >
+            <value>select 1</value>
+        </property>
+    </bean>
+          
+</beans>
diff --git a/config/alfresco/repository.properties b/config/alfresco/repository.properties
index 7f121adff3..bbc2dfc4d2 100644
--- a/config/alfresco/repository.properties
+++ b/config/alfresco/repository.properties
@@ -65,7 +65,6 @@ db.username=alfresco
 db.password=alfresco
 db.pool.initial=10
 db.pool.max=20
-db.pool.maxIdleTime=120000
 
 # Email configuration