From 42e40bb58ec9b4c6b7a474e058e79d366548a520 Mon Sep 17 00:00:00 2001
From: Christian Maierhofer <cmaierhofer@iaik.tugraz.at>
Date: Tue, 3 May 2016 11:38:51 +0200
Subject: Added Transactional Support to MOASessionDBUtils

---
 .../src/main/resources/session.common.beans.xml       |  2 +-
 .../src/main/resources/session.db.beans.xml           | 19 -------------------
 2 files changed, 1 insertion(+), 20 deletions(-)

(limited to 'id/server/idserverlib/src/main/resources')

diff --git a/id/server/idserverlib/src/main/resources/session.common.beans.xml b/id/server/idserverlib/src/main/resources/session.common.beans.xml
index abc3c3200..300bbd463 100644
--- a/id/server/idserverlib/src/main/resources/session.common.beans.xml
+++ b/id/server/idserverlib/src/main/resources/session.common.beans.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans profile="redis"
+<beans 
     xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:context="http://www.springframework.org/schema/context"
diff --git a/id/server/idserverlib/src/main/resources/session.db.beans.xml b/id/server/idserverlib/src/main/resources/session.db.beans.xml
index 0aeb24bac..18849c3f1 100644
--- a/id/server/idserverlib/src/main/resources/session.db.beans.xml
+++ b/id/server/idserverlib/src/main/resources/session.db.beans.xml
@@ -20,25 +20,6 @@
 	<!-- MYSQL Conector -->
 	<tx:annotation-driven transaction-manager="sessionTransactionManager"/>
 	
-	<bean id="sessionDataSource" class="org.apache.commons.dbcp2.BasicDataSource" lazy-init="true" destroy-method="close">
-		<aop:scoped-proxy/>
-		<property name="driverClassName" value="${moasession.hibernate.connection.driver_class}" />
-		<property name="url" value="${moasession.hibernate.connection.url}"/>
-		<property name="username" value="${moasession.hibernate.connection.username}" />
-		<property name="password" value="${moasession.hibernate.connection.password}" />
-				
-		<property name="connectionProperties" value="${moasession.dbcp.connectionProperties}" />
-		<property name="initialSize" value="${moasession.dbcp.initialSize}" />		
-		<property name="maxTotal" value="${moasession.dbcp.maxActive}" />
-		<property name="maxIdle" value="${moasession.dbcp.maxIdle}" />
-		<property name="minIdle" value="${moasession.dbcp.minIdle}" />
-		<!-- property name="maxWait" value="${moasession.dbcp.maxWaitMillis}" / -->
-		<property name="testOnBorrow" value="${moasession.dbcp.testOnBorrow}" />
-		<property name="testOnReturn" value="${moasession.dbcp.testOnReturn}" />
-		<property name="testWhileIdle" value="${moasession.dbcp.testWhileIdle}" />
-		<property name="validationQuery" value="${moasession.dbcp.validationQuery}" />
-	</bean>
-	
 	<bean id="sessionJpaVendorAdapter" class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
 		<property name="showSql" value="${moasession.hibernate.show_sql}" />
 		<property name="generateDdl" value="${moasession.jpaVendorAdapter.generateDdl}" />
-- 
cgit v1.2.3