From 4795b273bb734f04056babe963d8588ffbf50fb0 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Tue, 21 Jul 2015 15:30:40 +0200
Subject: fix MOA-ID-Auth problems

---
 .../src/main/resources/moaid.migration.beans.xml            | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'id/server/moa-id-commons/src/main/resources/moaid.migration.beans.xml')

diff --git a/id/server/moa-id-commons/src/main/resources/moaid.migration.beans.xml b/id/server/moa-id-commons/src/main/resources/moaid.migration.beans.xml
index a0923c03f..3bd122254 100644
--- a/id/server/moa-id-commons/src/main/resources/moaid.migration.beans.xml
+++ b/id/server/moa-id-commons/src/main/resources/moaid.migration.beans.xml
@@ -21,13 +21,22 @@
 		<property name="url" value="${hibernate.connection.url}"/>
 		<property name="username" value="${hibernate.connection.username}" />
 		<property name="password" value="${hibernate.connection.password}" />
-		<property name="testOnBorrow" value="true" />
+		
+		<property name="connectionProperties" value="${dbcp.connectionProperties}" />
+		<property name="initialSize" value="${dbcp.initialSize}" />		
+		<property name="maxActive" value="${dbcp.maxActive}" />
+		<property name="maxIdle" value="${dbcp.maxIdle}" />
+		<property name="minIdle" value="${dbcp.minIdle}" />
+		<property name="maxWait" value="${dbcp.maxWaitMillis}" />
+		<property name="testOnBorrow" value="${dbcp.testOnBorrow}" />
+		<property name="testOnReturn" value="${dbcp.testOnReturn}" />
+		<property name="testWhileIdle" value="${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="showSql" value="${hibernate.show_sql}" />
 		<property name="generateDdl" value="${jpaVendorAdapter.generateDdl}" />
 		<property name="databasePlatform" value="${hibernate.dialect}" />
 	</bean>
-- 
cgit v1.2.3