diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-04-08 07:50:20 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-04-08 07:50:20 +0200 |
| commit | 50c500dd107d88988cbee8207c91a16b321d6136 (patch) | |
| tree | 6abd06e3f126866534e155e40c2f7e933b5357d3 /id/server/idserverlib/src/main/resources/moaid.configuration.beans.xml | |
| parent | ec62813f4c0e8b3002d46f7bc315e7a27d720125 (diff) | |
| parent | 41882a0c5601dda478c2749ac99c2087b864c912 (diff) | |
| download | moa-id-spss-50c500dd107d88988cbee8207c91a16b321d6136.tar.gz moa-id-spss-50c500dd107d88988cbee8207c91a16b321d6136.tar.bz2 moa-id-spss-50c500dd107d88988cbee8207c91a16b321d6136.zip | |
Merge tag 'MOA-ID-3.1.0' into development_preview
JoinUp Release
Diffstat (limited to 'id/server/idserverlib/src/main/resources/moaid.configuration.beans.xml')
| -rw-r--r-- | id/server/idserverlib/src/main/resources/moaid.configuration.beans.xml | 10 |
1 files changed, 6 insertions, 4 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 7e319e235..9c27ba581 100644 --- a/id/server/idserverlib/src/main/resources/moaid.configuration.beans.xml +++ b/id/server/idserverlib/src/main/resources/moaid.configuration.beans.xml @@ -11,9 +11,11 @@ <context:property-placeholder location="${moa.id.configuration}"/> - <bean id="moaidauthconfig" class="at.gv.egovernment.moa.id.config.auth.PropertyBasedAuthConfigurationProvider"/> + <bean id="moaidauthconfig" class="at.gv.egovernment.moa.id.config.auth.PropertyBasedAuthConfigurationProvider"> + <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}"/> @@ -22,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}" /> |