modified RedisTransactionStorage, modified beans definition

11 files changed, 163 insertions, 97 deletions

diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml
index c672d32a6..28c0a9fe4 100644
--- a/id/ConfigWebTool/pom.xml
+++ b/id/ConfigWebTool/pom.xml
@@ -64,12 +64,6 @@
         <dependency>
             <groupId>MOA.id.server</groupId>
             <artifactId>moa-id-commons</artifactId>
-            <exclusions>
-            	<exclusion>
-            		<artifactId>hibernate-c3p0</artifactId>
-            		<groupId>org.hibernate</groupId>
-            	</exclusion>
-            </exclusions>
         </dependency>
         
         <dependency>
diff --git a/id/moa-id-webgui/pom.xml b/id/moa-id-webgui/pom.xml
index 8d35abd20..31247efc1 100644
--- a/id/moa-id-webgui/pom.xml
+++ b/id/moa-id-webgui/pom.xml
@@ -58,10 +58,6 @@
       		<artifactId>hyperjaxb3-ejb-runtime</artifactId>
       		<groupId>org.jvnet.hyperjaxb3</groupId>
       	</exclusion>
-      	<exclusion>
-      		<artifactId>hibernate-c3p0</artifactId>
-      		<groupId>org.hibernate</groupId>
-      	</exclusion>
       </exclusions>
     </dependency>
     
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 127e7deec..dabce982c 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -85,11 +85,11 @@
             	</exclusion>

             </exclusions>

         </dependency>

-        <dependency>

+        <!--  dependency>

             <groupId>org.hibernate</groupId>

             <artifactId>hibernate-c3p0</artifactId>

             <version>${hibernate.version}</version>

-        </dependency>

+        </dependency-->

         <dependency>

             <groupId>org.hibernate</groupId>

             <artifactId>hibernate-entitymanager</artifactId>

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/DBTransactionStorage.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/DBTransactionStorage.java
index 4699ad09c..89df47615 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/DBTransactionStorage.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/DBTransactionStorage.java
@@ -27,24 +27,31 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceException;
+import javax.persistence.Query;
+
 import org.apache.commons.lang.SerializationUtils;
 import org.hibernate.HibernateException;
-import org.hibernate.Query;
-import org.hibernate.Session;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
 
 import at.gv.egovernment.moa.id.auth.exception.AuthenticationException;
-import at.gv.egovernment.moa.id.commons.db.MOASessionDBUtils;
 import at.gv.egovernment.moa.id.commons.db.dao.session.AssertionStore;
 import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.MiscUtil;
 
-@Service("TransactionStorage")
+@Repository
+@Transactional("sessionTransactionManager")
 public class DBTransactionStorage implements ITransactionStorage {
-		
+	
+	@PersistenceContext(unitName="session")
+	private EntityManager entityManager;
+	
 	public boolean containsKey(String key) {
-		try {
+		try {	
 			searchInDatabase(key);
 			return true;
 			
@@ -151,16 +158,12 @@ public class DBTransactionStorage implements ITransactionStorage {
 		
 		List<AssertionStore> results;
 		List<String> returnValues = new ArrayList<String>();;
-		Session session = MOASessionDBUtils.getCurrentSession();
 		
-		synchronized (session) {			
-			session.beginTransaction();
-			Query query = session.getNamedQuery("getAssertionWithTimeOut");
-			query.setTimestamp("timeout", expioredate);		
-			results = query.list();
-			session.getTransaction().commit();
-		}
+		Query query =  entityManager.createNamedQuery("getAssertionWithTimeOut");
+		query.setParameter("timeout", expioredate);
 		
+		results = query.getResultList();
+
 		if (results != null) {
 			for (AssertionStore el : results)
 				returnValues.add(el.getArtifact());
@@ -187,24 +190,21 @@ public class DBTransactionStorage implements ITransactionStorage {
 			Logger.info("Sessioninformation not removed! (Message:"+ e.getMessage() + ")");
 
 		} catch (HibernateException e) {
-			Logger.warn("Sessioninformation not removed! (Error during Database communication)", e);
+			Logger.warn("Sessioninformation not removed! (Erreor during Database communication)", e);
 		}
 	}
 
 	private void cleanDelete(AssertionStore element) {
-		try {
-			element.setAssertion("blank".getBytes());
-			MOASessionDBUtils.saveOrUpdate(element);
-			
-		} catch (MOADatabaseException e) {
-			Logger.warn("Blank shortTime session with artifact=" + element.getArtifact() + " FAILED.", e);
+	
 			
-		} finally {
-			if (!MOASessionDBUtils.delete(element))
+			try{
+				element.setAssertion("blank".getBytes());
+				entityManager.merge(element);
+				entityManager.remove(element);
+			}catch(PersistenceException e){
 				Logger.error("ShortTime session with artifact=" + element.getArtifact() 
 							+ " not removed! (Error during Database communication)");
-
-		}
+			}
 		
 	}
 	
@@ -212,29 +212,23 @@ public class DBTransactionStorage implements ITransactionStorage {
 	private AssertionStore searchInDatabase(String artifact) throws MOADatabaseException {
 		  MiscUtil.assertNotNull(artifact, "artifact");	  
 		  Logger.trace("Getting sessioninformation with ID " + artifact + " from database.");
-		  Session session = MOASessionDBUtils.getCurrentSession();
-		  List result;
+		  List<AssertionStore> results;
 		  
-		  synchronized (session) {
-			  session.beginTransaction();
-			  Query query = session.getNamedQuery("getAssertionWithArtifact");
-			  query.setParameter("artifact", artifact);
-			  result = query.list();
+		  Query query =  entityManager.createNamedQuery("getAssertionWithArtifact");
+		  query.setParameter("artifact", artifact);
 		  
-			  //send transaction
-			  session.getTransaction().commit();
-		  }
+		  results = query.getResultList();
 		  
-		  Logger.trace("Found entries: " + result.size());
+		  Logger.trace("Found entries: " + results.size());
 		  
 		  //Assertion requires an unique artifact
-		  if (result.size() != 1) {
+		  if (results.size() != 1) {
 			 Logger.debug("No transaction information with ID:" + artifact + " found.");
 			 return null;
 			 
 		  }
 		  
-		  return (AssertionStore) result.get(0);
+		  return results.get(0);
 	}
 	
 	private void put(AssertionStore element, String key, Object value) throws MOADatabaseException {	
@@ -253,15 +247,16 @@ public class DBTransactionStorage implements ITransactionStorage {
 		element.setAssertion(data);
 		
 		//store AssertionStore element to Database
-		try {
-			MOASessionDBUtils.saveOrUpdate(element);
+		//try {
+			entityManager.merge(element);
+			//MOASessionDBUtils.saveOrUpdate(element);
 			Logger.debug(value.getClass().getName() + " with ID: " + key + " is stored in Database");
-			
-		} catch (MOADatabaseException e) {
-			Logger.warn("Sessioninformation could not be stored.");
-			throw new MOADatabaseException(e);
-			
-		}
+//			
+//		} catch (MOADatabaseException e) {
+//			Logger.warn("Sessioninformation could not be stored.");
+//			throw new MOADatabaseException(e);
+//			
+//		}
 		
 	}
 
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/RedisTransactionStorage.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/RedisTransactionStorage.java
index a8294fe88..cae73fafd 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/RedisTransactionStorage.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/RedisTransactionStorage.java
@@ -246,19 +246,19 @@ public class RedisTransactionStorage implements ITransactionStorage {
 
 	//Not used within REDIS store
 	private void cleanDelete(AssertionStore element) {
-		try {
-			element.setAssertion("blank".getBytes());
-			MOASessionDBUtils.saveOrUpdate(element);
-			
-		} catch (MOADatabaseException e) {
-			Logger.warn("Blank shortTime session with artifact=" + element.getArtifact() + " FAILED.", e);
-			
-		} finally {
-			if (!MOASessionDBUtils.delete(element))
-				Logger.error("ShortTime session with artifact=" + element.getArtifact() 
-							+ " not removed! (Error during Database communication)");
-
-		}
+//		try {
+//			element.setAssertion("blank".getBytes());
+//			MOASessionDBUtils.saveOrUpdate(element);
+//			
+//		} catch (MOADatabaseException e) {
+//			Logger.warn("Blank shortTime session with artifact=" + element.getArtifact() + " FAILED.", e);
+//			
+//		} finally {
+//			if (!MOASessionDBUtils.delete(element))
+//				Logger.error("ShortTime session with artifact=" + element.getArtifact() 
+//							+ " not removed! (Error during Database communication)");
+//
+//		}
 		
 	}
 	
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
diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index ea9e06fd6..613698fc6 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -143,11 +143,11 @@
             <artifactId>hibernate-core</artifactId>
             <version>${hibernate.version}</version>
         </dependency>
-        <dependency>
+        <!--  dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-c3p0</artifactId>
             <version>${hibernate.version}</version>
-        </dependency>
+        </dependency-->
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
diff --git a/id/server/moa-id-commons/src/main/resources/META-INF/persistence.xml b/id/server/moa-id-commons/src/main/resources/META-INF/persistence.xml
index 9bebfa66f..5c1558507 100644
--- a/id/server/moa-id-commons/src/main/resources/META-INF/persistence.xml
+++ b/id/server/moa-id-commons/src/main/resources/META-INF/persistence.xml
@@ -12,5 +12,13 @@ http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
 		<properties>
 		</properties>
 	</persistence-unit>
+	
+	<persistence-unit name="session" transaction-type="RESOURCE_LOCAL">
+		<provider>org.hibernate.ejb.HibernatePersistence</provider>
+		<class>at.gv.egovernment.moa.id.commons.db.dao.session.AssertionStore</class>
+		<!-- <class>at.gv.egovernment.moa.id.commons.db.dao.config.UserDatabase</class> -->
+		<properties>
+		</properties>
+	</persistence-unit>
 
 </persistence>
\ No newline at end of file
diff --git a/id/server/moa-id-spring-initializer/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthSpringResourceProvider.java b/id/server/moa-id-spring-initializer/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthSpringResourceProvider.java
index def32e144..47857bcfb 100644
--- a/id/server/moa-id-spring-initializer/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthSpringResourceProvider.java
+++ b/id/server/moa-id-spring-initializer/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthSpringResourceProvider.java
@@ -40,9 +40,10 @@ public class MOAIDAuthSpringResourceProvider implements SpringResourceProvider {
 	public Resource[] getResourcesToLoad() {
 		ClassPathResource moaidauthConfig = new ClassPathResource("/moaid.configuration.beans.xml", MOAIDAuthInitializer.class);
 		ClassPathResource configurationDBConfig = new ClassPathResource("/configuration.beans.xml", MOAIDAuthInitializer.class);
-		ClassPathResource moaIdAuthBeans = new ClassPathResource("/moaid.authentication.beans.xml", MOAIDAuthInitializer.class);					
-		
-		return new Resource[] {configurationDBConfig, moaidauthConfig, moaIdAuthBeans};	
+		ClassPathResource moaIdAuthBeans = new ClassPathResource("/moaid.authentication.beans.xml", MOAIDAuthInitializer.class);	
+		ClassPathResource moaSessionDBBeans = new ClassPathResource("/session.db.beans.xml", MOAIDAuthInitializer.class);
+		ClassPathResource moaSessionRedisBeans = new ClassPathResource("/session.redis.beans.xml", MOAIDAuthInitializer.class);
+		return new Resource[] {configurationDBConfig, moaidauthConfig, moaIdAuthBeans, moaSessionDBBeans, moaSessionRedisBeans};	
 		
 	}