diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-03-21 15:49:24 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-03-21 15:49:24 +0100 |
| commit | 54a26c8e353069abacefe5232f8270bec6b3cc60 (patch) | |
| tree | af0bdc8377085ffab2d6899a645a4d6a2b041ea1 /id/server/idserverlib/src/main/resources | |
| parent | 8746e1a7e3e4a3d19922acf81a952bf27618989f (diff) | |
| download | moa-id-spss-54a26c8e353069abacefe5232f8270bec6b3cc60.tar.gz moa-id-spss-54a26c8e353069abacefe5232f8270bec6b3cc60.tar.bz2 moa-id-spss-54a26c8e353069abacefe5232f8270bec6b3cc60.zip | |
update libs
Diffstat (limited to 'id/server/idserverlib/src/main/resources')
| -rw-r--r-- | id/server/idserverlib/src/main/resources/moaid.configuration.beans.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/id/server/idserverlib/src/main/resources/moaid.configuration.beans.xml b/id/server/idserverlib/src/main/resources/moaid.configuration.beans.xml index 5855fc766..9c27ba581 100644 --- a/id/server/idserverlib/src/main/resources/moaid.configuration.beans.xml +++ b/id/server/idserverlib/src/main/resources/moaid.configuration.beans.xml @@ -15,7 +15,7 @@ <constructor-arg value="#{systemProperties['moa.id.configuration']}"/> </bean> - <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" lazy-init="true" destroy-method="close"> + <bean id="dataSource" class="org.apache.commons.dbcp2.BasicDataSource" lazy-init="true" destroy-method="close"> <aop:scoped-proxy/> <property name="driverClassName" value="${configuration.hibernate.connection.driver_class}" /> <property name="url" value="${configuration.hibernate.connection.url}"/> @@ -24,10 +24,10 @@ <property name="connectionProperties" value="${configuration.dbcp.connectionProperties}" /> <property name="initialSize" value="${configuration.dbcp.initialSize}" /> - <property name="maxActive" value="${configuration.dbcp.maxActive}" /> + <property name="maxTotal" value="${configuration.dbcp.maxActive}" /> <property name="maxIdle" value="${configuration.dbcp.maxIdle}" /> <property name="minIdle" value="${configuration.dbcp.minIdle}" /> - <property name="maxWait" value="${configuration.dbcp.maxWaitMillis}" /> + <!-- property name="maxWait" value="${configuration.dbcp.maxWaitMillis}" / --> <property name="testOnBorrow" value="${configuration.dbcp.testOnBorrow}" /> <property name="testOnReturn" value="${configuration.dbcp.testOnReturn}" /> <property name="testWhileIdle" value="${configuration.dbcp.testWhileIdle}" /> |