inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V1.4 to HEAD

Browse Source 
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
This commit is contained in:
Derek Hulley
2006-10-23 13:30:28 +00:00
parent ed140c671f
commit 492aabbbcc
3 changed files with 60 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/alfresco/core-services-context.xml
View File

@@ -42,6 +42,9 @@
<property name="maxActive" >
<value>${db.pool.max}</value>
</property>
<property name="defaultAutoCommit" >
<value>false</value>
</property>
</bean>
<!-- transaction service -->

57
config/alfresco/extension/custom-connection-pool-context.xml.sample Normal file
View File

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

1
config/alfresco/repository.properties
View File

@@ -65,7 +65,6 @@ db.username=alfresco
db.password=alfresco
db.pool.initial=10
db.pool.max=20
db.pool.maxIdleTime=120000
# Email configuration