aboutsummaryrefslogtreecommitdiff
path: root/id/server/data/deploy
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2016-06-07 15:01:11 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2016-06-07 15:01:11 +0200
commitf66d793ba9562ffa96103ff69cee441754c3bb7c (patch)
tree7d905c5c34e3671cd7896ef48e796c98d4e1380c /id/server/data/deploy
parentf660735c26170c05396e0feeac53e7dcf3c5b5df (diff)
parent0d4863abf480dd35d5ffa87f09604096aae905bc (diff)
downloadmoa-id-spss-f66d793ba9562ffa96103ff69cee441754c3bb7c.tar.gz
moa-id-spss-f66d793ba9562ffa96103ff69cee441754c3bb7c.tar.bz2
moa-id-spss-f66d793ba9562ffa96103ff69cee441754c3bb7c.zip
Merge remote-tracking branch 'remotes/origin/moapid-3.2-opb-redis' into eIDAS_node_implementation
Diffstat (limited to 'id/server/data/deploy')
-rw-r--r--id/server/data/deploy/conf/moa-id/moa-id.properties31
1 files changed, 18 insertions, 13 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