From fa7f69cffc2c9b8d89ecc63f2dce72fffe1b671a Mon Sep 17 00:00:00 2001
From: Christian Maierhofer <cmaierhofer@iaik.tugraz.at>
Date: Thu, 21 Apr 2016 08:30:09 +0200
Subject: Added RedisTransaction storage

---
 .../main/resources/moaid.authentication.beans.xml  | 28 +++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

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

diff --git a/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml b/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml
index 11d92cea3..42192d6a0 100644
--- a/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml
+++ b/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml
@@ -4,6 +4,7 @@
 	xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:tx="http://www.springframework.org/schema/tx"
 	xmlns:aop="http://www.springframework.org/schema/aop"
+	xmlns:p="http://www.springframework.org/schema/p"
 	xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
@@ -35,8 +36,7 @@
 	<bean id="MOAID_SSOManager" 
 				class="at.gv.egovernment.moa.id.moduls.SSOManager"/>
 
-	<bean id="TransactionStorage" 
-				class="at.gv.egovernment.moa.id.storage.DBTransactionStorage"/>
+	
 
 	<bean id="AuthenticationSessionStoreage" 
 				class="at.gv.egovernment.moa.id.storage.DBAuthenticationSessionStoreage"/>
@@ -79,6 +79,28 @@
 				
 	<bean id="EvaluateSSOConsentsTaskImpl" 
 				class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.EvaluateSSOConsentsTaskImpl"
-				scope="prototype"/>								
+				scope="prototype"/>		
+	
+	<!-- bean id="TransactionStorage" 
+				class="at.gv.egovernment.moa.id.storage.DBTransactionStorage"/ -->
 				
+	<bean id="TransactionStorage" 
+				class="at.gv.egovernment.moa.id.storage.RedisTransactionStorage"/>
+	
+	<!-- Redis Beans -->			
+	<bean id="jedisConnFactory" 
+    	class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory" 
+    	p:use-pool="true"/>
+    	
+    <bean id="RedisStringSerializer" class="org.springframework.data.redis.serializer.StringRedisSerializer" />
+    <bean id="assertionStoreSerializer" class="org.springframework.data.redis.serializer.JacksonJsonRedisSerializer">
+			<constructor-arg type="java.lang.Class" value="at.gv.egovernment.moa.id.commons.db.dao.session.AssertionStore"/>	
+	</bean>
+
+	<bean id="redisTemplate" 
+   	 	class="org.springframework.data.redis.core.RedisTemplate" 
+    	p:connection-factory-ref="jedisConnFactory"
+    	p:value-serializer-ref="RedisStringSerializer"
+    	p:key-serializer-ref="RedisStringSerializer"/>	
+	
 </beans>
\ No newline at end of file
-- 
cgit v1.2.3


From 129285d2c6fcd82a3cba7fc5345e87699129c005 Mon Sep 17 00:00:00 2001
From: Christian Maierhofer <cmaierhofer@iaik.tugraz.at>
Date: Tue, 26 Apr 2016 15:35:46 +0200
Subject: modified RedisTransactionStorage, modified beans definition

---
 .../main/resources/moaid.authentication.beans.xml  | 20 --------
 .../src/main/resources/session.db.beans.xml        | 58 ++++++++++++++++++++++
 .../src/main/resources/session.redis.beans.xml     | 34 +++++++++++++
 3 files changed, 92 insertions(+), 20 deletions(-)
 create mode 100644 id/server/idserverlib/src/main/resources/session.db.beans.xml
 create mode 100644 id/server/idserverlib/src/main/resources/session.redis.beans.xml

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

diff --git a/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml b/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml
index 42192d6a0..cd5fe6acf 100644
--- a/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml
+++ b/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml
@@ -81,26 +81,6 @@
 				class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.EvaluateSSOConsentsTaskImpl"
 				scope="prototype"/>		
 	
-	<!-- bean id="TransactionStorage" 
-				class="at.gv.egovernment.moa.id.storage.DBTransactionStorage"/ -->
-				
-	<bean id="TransactionStorage" 
-				class="at.gv.egovernment.moa.id.storage.RedisTransactionStorage"/>
 	
-	<!-- Redis Beans -->			
-	<bean id="jedisConnFactory" 
-    	class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory" 
-    	p:use-pool="true"/>
-    	
-    <bean id="RedisStringSerializer" class="org.springframework.data.redis.serializer.StringRedisSerializer" />
-    <bean id="assertionStoreSerializer" class="org.springframework.data.redis.serializer.JacksonJsonRedisSerializer">
-			<constructor-arg type="java.lang.Class" value="at.gv.egovernment.moa.id.commons.db.dao.session.AssertionStore"/>	
-	</bean>
-
-	<bean id="redisTemplate" 
-   	 	class="org.springframework.data.redis.core.RedisTemplate" 
-    	p:connection-factory-ref="jedisConnFactory"
-    	p:value-serializer-ref="RedisStringSerializer"
-    	p:key-serializer-ref="RedisStringSerializer"/>	
 	
 </beans>
\ No newline at end of file
diff --git a/id/server/idserverlib/src/main/resources/session.db.beans.xml b/id/server/idserverlib/src/main/resources/session.db.beans.xml
new file mode 100644
index 000000000..0aeb24bac
--- /dev/null
+++ b/id/server/idserverlib/src/main/resources/session.db.beans.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans profile="default"
+    xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:tx="http://www.springframework.org/schema/tx"
+	xmlns:aop="http://www.springframework.org/schema/aop"
+	xmlns:p="http://www.springframework.org/schema/p"
+	xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
+		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
+
+ 	
+ 	
+	<bean id="TransactionStorage" 
+			class="at.gv.egovernment.moa.id.storage.DBTransactionStorage"
+				/>
+
+	<!-- 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}" />
+		<property name="databasePlatform" value="${moasession.hibernate.dialect}" />
+	</bean>
+	
+		<bean name="session" id="session" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean" depends-on="sessionDataSource">
+		<property name="dataSource" ref="sessionDataSource" />
+		<property name="jpaVendorAdapter" ref="sessionJpaVendorAdapter" />
+		<property name="persistenceUnitName" value="session" />
+	</bean>
+	
+	 <bean name="sessionTransactionManager" id="sessionTransactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
+		<property name="entityManagerFactory" ref="session" />
+	</bean>  
+	
+</beans>
\ No newline at end of file
diff --git a/id/server/idserverlib/src/main/resources/session.redis.beans.xml b/id/server/idserverlib/src/main/resources/session.redis.beans.xml
new file mode 100644
index 000000000..421159d08
--- /dev/null
+++ b/id/server/idserverlib/src/main/resources/session.redis.beans.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans profile="redis"
+    xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:tx="http://www.springframework.org/schema/tx"
+	xmlns:aop="http://www.springframework.org/schema/aop"
+	xmlns:p="http://www.springframework.org/schema/p"
+	xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
+		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
+
+				
+	<bean id="TransactionStorage" 
+				class="at.gv.egovernment.moa.id.storage.RedisTransactionStorage"/>
+	
+	<!-- Redis Beans -->			
+	<bean id="jedisConnFactory" 
+    	class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory" 
+    	p:use-pool="true"/>
+    	
+    <bean id="RedisStringSerializer" class="org.springframework.data.redis.serializer.StringRedisSerializer" />
+    <bean id="assertionStoreSerializer" class="org.springframework.data.redis.serializer.JacksonJsonRedisSerializer">
+			<constructor-arg type="java.lang.Class" value="at.gv.egovernment.moa.id.commons.db.dao.session.AssertionStore"/>	
+	</bean>
+
+	<bean id="redisTemplate" 
+   	 	class="org.springframework.data.redis.core.RedisTemplate" 
+    	p:connection-factory-ref="jedisConnFactory"
+    	p:value-serializer-ref="RedisStringSerializer"
+    	p:key-serializer-ref="RedisStringSerializer"/>	
+	
+</beans>
\ No newline at end of file
-- 
cgit v1.2.3


From 61661f2ea4978d56691f7a672469c6d43e9dba41 Mon Sep 17 00:00:00 2001
From: Christian Maierhofer <cmaierhofer@iaik.tugraz.at>
Date: Thu, 28 Apr 2016 13:35:55 +0200
Subject: Modifiing MOASessionDBUtils

---
 .../src/main/resources/session.common.beans.xml    | 54 ++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 id/server/idserverlib/src/main/resources/session.common.beans.xml

(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
new file mode 100644
index 000000000..abc3c3200
--- /dev/null
+++ b/id/server/idserverlib/src/main/resources/session.common.beans.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans profile="redis"
+    xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:tx="http://www.springframework.org/schema/tx"
+	xmlns:aop="http://www.springframework.org/schema/aop"
+	xmlns:p="http://www.springframework.org/schema/p"
+	xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
+		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
+
+	<context:annotation-config/>
+    	
+    <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="sessionFactory" class="org.springframework.orm.hibernate4.LocalSessionFactoryBean">
+    	<property name="dataSource"  ref="sessionDataSource"/>
+    	<property name="packagesToScan" value="at.gv.egovernment.moa.id.commons.db" />
+    	<property name="hibernateProperties">
+        	<props>
+            	<prop key="hibernate.dialect">org.hibernate.dialect.MySQLDialect</prop>
+            	<prop key="hibernate.show_sql">${moasession.hibernate.show_sql}</prop>
+            	<prop key="hibernate.hbm2ddl.auto">update</prop>
+            	<prop key="current_session_context_class">thread</prop>
+            	<prop key="hibernate.transaction.flush_before_completion">true</prop>
+                <prop key="hibernate.transaction.auto_close_session">true</prop>
+        	</props>
+    	</property>
+	</bean>
+
+    <bean id="moaSessionDBUtils" class="at.gv.egovernment.moa.id.commons.db.MOASessionDBUtils">
+    </bean>
+
+	
+</beans>
\ No newline at end of file
-- 
cgit v1.2.3


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


From 33da825e528c4b04bba9de09ed386bcf606aec39 Mon Sep 17 00:00:00 2001
From: Christian Maierhofer <cmaierhofer@iaik.tugraz.at>
Date: Tue, 3 May 2016 13:39:09 +0200
Subject: added redis config parameters

---
 id/server/idserverlib/src/main/resources/session.redis.beans.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/id/server/idserverlib/src/main/resources/session.redis.beans.xml b/id/server/idserverlib/src/main/resources/session.redis.beans.xml
index 421159d08..9caf5fc6a 100644
--- a/id/server/idserverlib/src/main/resources/session.redis.beans.xml
+++ b/id/server/idserverlib/src/main/resources/session.redis.beans.xml
@@ -18,7 +18,9 @@
 	<!-- Redis Beans -->			
 	<bean id="jedisConnFactory" 
     	class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory" 
-    	p:use-pool="true"/>
+    	p:use-pool="${redis.use-pool}"
+    	p:host-name="${redis.host-name}"
+    	p:port="${redis.port}"/>
     	
     <bean id="RedisStringSerializer" class="org.springframework.data.redis.serializer.StringRedisSerializer" />
     <bean id="assertionStoreSerializer" class="org.springframework.data.redis.serializer.JacksonJsonRedisSerializer">
-- 
cgit v1.2.3