fix MOA-ID-Auth problems

2 files changed, 11 insertions, 36 deletions

diff --git a/id/server/moa-id-commons/src/main/resources/configuration.beans.xml b/id/server/moa-id-commons/src/main/resources/configuration.beans.xml
index 775d02d05..4d3caea8c 100644
--- a/id/server/moa-id-commons/src/main/resources/configuration.beans.xml
+++ b/id/server/moa-id-commons/src/main/resources/configuration.beans.xml
@@ -11,44 +11,10 @@
 
 	<context:annotation-config />
 	
-	<!-- context:property-placeholder location="${location}"/-->  
-	
-<!-- 	<bean class="at.gv.egovernment.moa.id.commons.config.persistence.JPAPropertiesWithJavaConfig">
-	</bean> -->
-
 	<bean id="configPropertyDao" 
 				class="at.gv.egovernment.moa.id.commons.db.dao.config.DatabaseConfigPropertyImpl"/>
 		
 	<bean id="moaidconfig" class="at.gv.egovernment.moa.id.commons.config.persistence.MOAIDConfigurationImpl" />
-<!-- 		<property name="configPropertyDao" ref="configPropertyDao" />
-	</bean> -->
-	
-
-<!--  	<bean id="configRead" class="at.gv.egovernment.moa.id.commons.db.NewConfigurationDBRead"/> -->
-<!-- <bean id="configWrite" class="at.gv.egovernment.moa.id.commons.db.NewConfigurationDBWrite"/> -->
-
-<!-- 	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" lazy-init="true" destroy-method="close">
-		<aop:scoped-proxy/>
-		<property name="driverClassName" value="${hibernate.connection.driver_class}" />
-		<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="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="generateDdl">
-			<bean class="java.lang.Boolean">
-				<constructor-arg value="${jpaVendorAdapter.generateDdl}"/>
-			</bean>
-		</property> 
-		<property name="databasePlatform" value="${hibernate.dialect}" />
-	</bean> -->
-
 
 	<bean name="config" id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
 		<property name="dataSource" ref="dataSource" />
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>