diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-07-21 15:30:40 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-07-21 15:30:40 +0200 |
| commit | 4795b273bb734f04056babe963d8588ffbf50fb0 (patch) | |
| tree | 4c38c2a7b957608ad21034ec40b96466d3f3f98e /id/server/idserverlib/src/main/resources/moaid.configuration.beans.xml | |
| parent | a10034425b325acaf9796183d1206979664e483d (diff) | |
| download | moa-id-spss-4795b273bb734f04056babe963d8588ffbf50fb0.tar.gz moa-id-spss-4795b273bb734f04056babe963d8588ffbf50fb0.tar.bz2 moa-id-spss-4795b273bb734f04056babe963d8588ffbf50fb0.zip | |
fix MOA-ID-Auth problems
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 | 15 |
1 files changed, 12 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 f2b2f5adf..206fde87d 100644 --- a/id/server/idserverlib/src/main/resources/moaid.configuration.beans.xml +++ b/id/server/idserverlib/src/main/resources/moaid.configuration.beans.xml @@ -19,13 +19,22 @@ <property name="url" value="${configuration.hibernate.connection.url}"/> <property name="username" value="${configuration.hibernate.connection.username}" /> <property name="password" value="${configuration.hibernate.connection.password}" /> - <property name="testOnBorrow" value="true" /> + + <property name="connectionProperties" value="${configuration.dbcp.connectionProperties}" /> + <property name="initialSize" value="${configuration.dbcp.initialSize}" /> + <property name="maxActive" 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="testOnBorrow" value="${configuration.dbcp.testOnBorrow}" /> + <property name="testOnReturn" value="${configuration.dbcp.testOnReturn}" /> + <property name="testWhileIdle" value="${configuration.dbcp.testWhileIdle}" /> <property name="validationQuery" value="SELECT 1" /> </bean> <bean id="jpaVendorAdapter" class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter"> - <property name="showSql" value="true" /> - <property name="generateDdl" value="${jpaVendorAdapter.generateDdl}" /> + <property name="showSql" value="${configuration.hibernate.show_sql}" /> + <property name="generateDdl" value="${configuration.jpaVendorAdapter.generateDdl}" /> <property name="databasePlatform" value="${configuration.hibernate.dialect}" /> </bean> |