Merge remote-tracking branch 'remotes/origin/moapid-3.2-opb-redis' into eIDAS_node_implementation

4 files changed, 39 insertions, 31 deletions

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 4201d31b1..ba8c47304 100644
--- a/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml
+++ b/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml
@@ -53,9 +53,6 @@
 	<bean id="ProcessInstanceStoreage" 
 				class="at.gv.egovernment.moa.id.process.dao.ProcessInstanceStoreDAOImpl"/>
 
-	<bean id="StatisticLogger" 
-				class="at.gv.egovernment.moa.id.advancedlogging.StatisticLogger"/>
-
 	<bean id="MOAReversionLogger" 
 				class="at.gv.egovernment.moa.id.advancedlogging.MOAReversionLogger"/>
 				
@@ -95,7 +92,17 @@
 	<bean id="EvaluateSSOConsentsTaskImpl" 
 				class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.EvaluateSSOConsentsTaskImpl"
 				scope="prototype"/>		
+				
+	<beans profile="advancedLogOn">
+		<bean id="StatisticLogger" 
+				class="at.gv.egovernment.moa.id.advancedlogging.StatisticLogger"/>
+	</beans>
 	
+	<beans profile="advancedLogOff">
+		<bean id="StatisticLogger" 
+				class="at.gv.egovernment.moa.id.advancedlogging.DummyStatisticLogger"/>
+	</beans>
 	
-	
-</beans>
\ No newline at end of file
+</beans>
+
+
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 10c1320cc..defa47ec0 100644
--- a/id/server/idserverlib/src/main/resources/session.common.beans.xml
+++ b/id/server/idserverlib/src/main/resources/session.common.beans.xml
@@ -10,7 +10,8 @@
 		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:property-placeholder location="${moa.id.configuration}"/> 
 	<context:annotation-config/>
     	
     <bean id="sessionDataSource" class="org.apache.commons.dbcp2.BasicDataSource" lazy-init="true" destroy-method="close">
@@ -32,9 +33,9 @@
 		<property name="validationQuery" value="${moasession.dbcp.validationQuery}" />
 	</bean>
 	
-	<bean id="sessionFactory" class="org.springframework.orm.hibernate4.LocalSessionFactoryBean">
+	<bean id="sessionSessionFactory" class="org.springframework.orm.hibernate4.LocalSessionFactoryBean">
     	<property name="dataSource"  ref="sessionDataSource"/>
-    	<property name="packagesToScan" value="at.gv.egovernment.moa.id.commons.db" />
+    	<property name="packagesToScan" value="at.gv.egovernment.moa.id.commons.db.dao.session" />
     	<property name="hibernateProperties">
         	<props>
             	<prop key="hibernate.dialect">${moasession.hibernate.dialect}</prop>
@@ -47,9 +48,27 @@
     	</property>
 	</bean>
 
+	<!-- MYSQL Conector -->
+	<tx:annotation-driven transaction-manager="sessionTransactionManager"/>
+	
+	<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="packagesToScan" value="at.gv.egovernment.moa.id.commons.db.dao.session" />
+		<property name="persistenceUnitName" value="session" />
+	</bean>
+	
+	 <bean name="sessionTransactionManager" id="sessionTransactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
+		<property name="entityManagerFactory" ref="session" />
+	</bean>  
 
     <bean id="moaSessionDBUtils" class="at.gv.egovernment.moa.id.commons.db.MOASessionDBUtils">
     </bean>
-
 	
 </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
index 18849c3f1..5ed390ffe 100644
--- a/id/server/idserverlib/src/main/resources/session.db.beans.xml
+++ b/id/server/idserverlib/src/main/resources/session.db.beans.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans profile="default"
+<beans profile="dbBackend"
     xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:context="http://www.springframework.org/schema/context"
@@ -11,29 +11,10 @@
 		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:property-placeholder location="${moa.id.configuration}"/> 
  	
 	<bean id="TransactionStorage" 
 			class="at.gv.egovernment.moa.id.storage.DBTransactionStorage"
 				/>
 
-	<!-- MYSQL Conector -->
-	<tx:annotation-driven transaction-manager="sessionTransactionManager"/>
-	
-	<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
index 9caf5fc6a..feda9b273 100644
--- a/id/server/idserverlib/src/main/resources/session.redis.beans.xml
+++ b/id/server/idserverlib/src/main/resources/session.redis.beans.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans profile="redis"
+<beans profile="redisBackend"
     xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:context="http://www.springframework.org/schema/context"
@@ -11,6 +11,7 @@
 		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:property-placeholder location="${moa.id.configuration}"/> 
 				
 	<bean id="TransactionStorage" 
 				class="at.gv.egovernment.moa.id.storage.RedisTransactionStorage"/>