Merged 1.4 to HEAD

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4329 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4331 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4332 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4339 .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4653 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-12-19 12:35:52 +00:00
parent 00e6c989fc
commit 473c9ff1ff
20 changed files with 751 additions and 64 deletions

View File

@@ -9,7 +9,8 @@
-->
<beans>
<!-- Datasource bean -->
<!-- DBCP Configuration -->
<!-- http://jakarta.apache.org/commons/dbcp/configuration.html -->
<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
<!-- connection settings -->
<property name="driverClassName">
@@ -28,30 +29,39 @@
<value>false</value>
</property>
<!-- pool settings -->
<property name="initialSize" >
<property name="minIdle" >
<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>
<value>10000</value>
</property>
<property name="validationQuery" >
<value>select 1</value>
</property>
<property name="timeBetweenEvictionRunsMillis" >
<value>300000</value>
</property>
<property name="minEvictableIdleTimeMillis" >
<value>60000</value>
</property>
<property name="testOnBorrow" >
<value>false</value>
</property>
<property name="testOnReturn" >
<value>false</value>
</property>
<property name="testWhileIdle" >
<value>true</value>
</property>
<property name="removeAbandoned" >
<value>true</value>
</property>
<property name="removeAbandonedTimeout" >
<value>30</value>
</property>
</bean>
</beans>