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

2 files changed, 24 insertions, 18 deletions

diff --git a/id/server/data/deploy/conf/moa-id/moa-id.properties b/id/server/data/deploy/conf/moa-id/moa-id.properties
index 784f66602..5e8bfa567 100644
--- a/id/server/data/deploy/conf/moa-id/moa-id.properties
+++ b/id/server/data/deploy/conf/moa-id/moa-id.properties
@@ -79,12 +79,19 @@ moasession.hibernate.transaction.flush_before_completion=true
 moasession.hibernate.transaction.auto_close_session=true
 moasession.hibernate.show_sql=false
 moasession.hibernate.format_sql=true
-moasession.hibernate.c3p0.acquire_increment=3
-moasession.hibernate.c3p0.idle_test_period=60
-moasession.hibernate.c3p0.timeout=60
-moasession.hibernate.c3p0.max_size=20
-moasession.hibernate.c3p0.max_statements=0
-moasession.hibernate.c3p0.min_size=3
+
+moasession.dbcp.connectionProperties=
+moasession.dbcp.initialSize=5
+moasession.dbcp.maxActive=20
+moasession.dbcp.maxIdle=8
+moasession.dbcp.minIdle=5
+moasession.dbcp.maxWaitMillis=-1
+moasession.dbcp.testOnBorrow=true
+moasession.dbcp.testOnReturn=false
+moasession.dbcp.testWhileIdle=false
+moasession.dbcp.validationQuery=select 1
+moasession.jpaVendorAdapter.generateDdl=true
+
 
 #Hibnerate configuration for MOA-ID 3.x configuration
 configuration.hibernate.dialect=org.hibernate.dialect.MySQLDialect
@@ -122,13 +129,6 @@ advancedlogging.hibernate.current_session_context_class=thread
 advancedlogging.hibernate.transaction.auto_close_session=true
 advancedlogging.hibernate.show_sql=false
 advancedlogging.hibernate.format_sql=true
-advancedlogging.hibernate.connection.provider_class=org.hibernate.service.jdbc.connections.internal.C3P0ConnectionProvider
-advancedlogging.hibernate.c3p0.acquire_increment=3
-advancedlogging.hibernate.c3p0.idle_test_period=60
-advancedlogging.hibernate.c3p0.timeout=300
-advancedlogging.hibernate.c3p0.max_size=20
-advancedlogging.hibernate.c3p0.max_statements=0
-advancedlogging.hibernate.c3p0.min_size=3
 
 
 ################ Additonal eID-modul configuration ####################################
@@ -165,6 +165,11 @@ modules.federatedAuth.request.sign.password=password
 modules.federatedAuth.response.encryption.alias=pvp_assertion
 modules.federatedAuth.response.encryption.password=password
 
+#Redis Settings, if Redis is used as a backend for session data.
+#has to be enabled with a start parameter for tomcat -Dspring.profiles.active=redis
+redis.use-pool=true
+redis.host-name=localhost
+redis.port=6379
 
 ################SZR Client configuration####################################
 ##  The SZR client is only required if MOA-ID-Auth should be 
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 300bbd463..10c1320cc 100644
--- a/id/server/idserverlib/src/main/resources/session.common.beans.xml
+++ b/id/server/idserverlib/src/main/resources/session.common.beans.xml
@@ -37,16 +37,17 @@
     	<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.dialect">${moasession.hibernate.dialect}</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>
+            	<prop key="hibernate.hbm2ddl.auto">${moasession.hibernate.hbm2ddl.auto}</prop>
+            	<prop key="current_session_context_class">${moasession.hibernate.current_session_context_class}</prop>
+            	<prop key="hibernate.transaction.flush_before_completion">${moasession.hibernate.transaction.flush_before_completion}</prop>
+                <prop key="hibernate.transaction.auto_close_session">${moasession.hibernate.transaction.auto_close_session}</prop>
         	</props>
     	</property>
 	</bean>
 
+
     <bean id="moaSessionDBUtils" class="at.gv.egovernment.moa.id.commons.db.MOASessionDBUtils">
     </bean>