update template configuration

5 files changed, 47 insertions, 31 deletions

diff --git a/id/server/data/deploy/conf/moa-id-configuration/moa-id-configtool.properties b/id/server/data/deploy/conf/moa-id-configuration/moa-id-configtool.properties
index 162aa3cda..192f03598 100644
--- a/id/server/data/deploy/conf/moa-id-configuration/moa-id-configtool.properties
+++ b/id/server/data/deploy/conf/moa-id-configuration/moa-id-configtool.properties
@@ -21,18 +21,18 @@ hibernate.connection.driver_class=com.mysql.jdbc.Driver
 hibernate.connection.username=
 hibernate.connection.password=
 
-hibernate.hbm2ddl.auto=update
-hibernate.current_session_context_class=thread
-hibernate.transaction.flush_before_completion=true
-hibernate.transaction.auto_close_session=true
+jpaVendorAdapter.generateDdl=true
 hibernate.show_sql=false
-hibernate.format_sql=true
-hibernate.c3p0.acquire_increment=3
-hibernate.c3p0.idle_test_period=300
-hibernate.c3p0.timeout=300
-hibernate.c3p0.max_size=20
-hibernate.c3p0.max_statements=0
-hibernate.c3p0.min_size=3
+dbcp.connectionProperties=
+dbcp.initialSize=0
+dbcp.maxActive=8
+dbcp.maxIdle=8
+dbcp.minIdle=0
+dbcp.maxWaitMillis=-1
+dbcp.testOnBorrow=true
+dbcp.testOnReturn=false
+dbcp.testWhileIdle=false
+
 
 
 ############################################################################
diff --git a/id/server/data/deploy/conf/moa-id/log4j.properties b/id/server/data/deploy/conf/moa-id/log4j.properties
index 7ad5aefde..1ba51720a 100644
--- a/id/server/data/deploy/conf/moa-id/log4j.properties
+++ b/id/server/data/deploy/conf/moa-id/log4j.properties
@@ -11,6 +11,10 @@ log4j.logger.at.gv.egovernment.moa.id.proxy=info
 log4j.logger.eu.stork=info
 log4j.logger.org.hibernate=warn
 
+log4j.logger.at.gv.egiz.components.configuration=info,CONFIGTOOL
+log4j.logger.at.gv.egovernment.moa.id.commons=info,CONFIGTOOL R
+log4j.logger.at.gv.egovernment.moa.id.config.webgui=info,CONFIGTOOL
+
 # configure the stdout appender
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
@@ -25,3 +29,10 @@ log4j.appender.R.MaxBackupIndex=1
 log4j.appender.R.layout=org.apache.log4j.PatternLayout
 log4j.appender.R.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %X{transactionId} | %t | %m%n
 
+# configure the rolling file appender (R)
+log4j.appender.CONFIGTOOL=org.apache.log4j.RollingFileAppender
+log4j.appender.CONFIGTOOL.File=${catalina.base}/logs/moa-id-webgui.log
+log4j.appender.CONFIGTOOL.MaxFileSize=10000KB
+log4j.appender.CONFIGTOOL.MaxBackupIndex=1
+log4j.appender.CONFIGTOOL.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONFIGTOOL.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %X{transactionId} | %t | %m%n
\ No newline at end of file
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 b01236506..66f9afac6 100644
--- a/id/server/data/deploy/conf/moa-id/moa-id.properties
+++ b/id/server/data/deploy/conf/moa-id/moa-id.properties
@@ -89,24 +89,24 @@ moasession.hibernate.c3p0.min_size=3
 
 #Hibnerate configuration for MOA-ID 2.0 configuration
 configuration.hibernate.dialect=org.hibernate.dialect.MySQLDialect
+configuration.jpaVendorAdapter.generateDdl=true
+configuration.hibernate.show_sql=false
+
 configuration.hibernate.connection.url=jdbc:mysql://localhost/moa-id-config?charSet=utf-8&autoReconnect=true
 configuration.hibernate.connection.charSet=utf-8
 configuration.hibernate.connection.driver_class=com.mysql.jdbc.Driver
 configuration.hibernate.connection.username=
 configuration.hibernate.connection.password=
-
-configuration.hibernate.hbm2ddl.auto=update
-configuration.hibernate.current_session_context_class=thread
-configuration.hibernate.transaction.auto_close_session=true
-configuration.hibernate.show_sql=false
-configuration.hibernate.format_sql=true
-configuration.hibernate.connection.provider_class=org.hibernate.service.jdbc.connections.internal.C3P0ConnectionProvider
-configuration.hibernate.c3p0.acquire_increment=3
-configuration.hibernate.c3p0.idle_test_period=60
-configuration.hibernate.c3p0.timeout=300
-configuration.hibernate.c3p0.max_size=20
-configuration.hibernate.c3p0.max_statements=0
-configuration.hibernate.c3p0.min_size=3
+configuration.dbcp.connectionProperties=
+
+configuration.dbcp.initialSize=0
+configuration.dbcp.maxActive=8
+configuration.dbcp.maxIdle=8
+configuration.dbcp.minIdle=0
+configuration.dbcp.maxWaitMillis=-1
+configuration.dbcp.testOnBorrow=true
+configuration.dbcp.testOnReturn=false
+configuration.dbcp.testWhileIdle=false
 
 #
 #Hibnerate configuration for MOA-ID 2.0 advanced statistic logging
diff --git a/id/server/data/deploy/tomcat/unix/tomcat-start.sh b/id/server/data/deploy/tomcat/unix/tomcat-start.sh
index 59cf2d0a9..e0aaae973 100644
--- a/id/server/data/deploy/tomcat/unix/tomcat-start.sh
+++ b/id/server/data/deploy/tomcat/unix/tomcat-start.sh
@@ -1,14 +1,17 @@
 #! /bin/bash

 

 export JAVA_HOME= <insert java home directory (no trailing path separator)>

-export CATALINA_HOME= <insert Tomcat 4.1.x home directory (no trailing path separator)>

+export CATALINA_HOME= <insert Tomcat home directory (no trailing path separator)>

 export CATALINA_BASE=$CATALINA_HOME

 

 LOGGING_OPT=-Dlog4j.configuration=file:$CATALINA_BASE/conf/moa-id/log4j.properties

+LOGGING_LOGBACK_OPT=-Dlogback.configurationFile=$CATALINA_BASE/conf/moa-id/logback_config.xml

 

 CONFIG_OPT=-Dmoa.id.configuration=$CATALINA_BASE/conf/moa-id/moa-id.properties

-SPSS_OPT=-Dmoa.spss.server.configuration=$CATALINA_BASE/conf/moa-spss/SampleMOASPSSConfiguration.xml

-CONFIGTOOL_OPT=-Dmoa.id.webconfig=$CATALINA_BASE/conf/moa-id-configuration/moa-id-configtool.properties

+SPSS_OPT=-Dmoa.spss.server.configuration=file:$CATALINA_BASE/conf/moa-spss/SampleMOASPSSConfiguration.xml

+CONFIGTOOL_OPT=-Dmoa.id.webconfig=file:$CATALINA_BASE/conf/moa-id-configuration/moa-id-configtool.properties

+CONFIGTOOL_USER_OPT=-Duser.properties=":$CATALINA_BASE/conf/moa-id-configuration/userdatabase.properties"

+

 DEMOOA_OPT=-Dmoa.id.demoOA=$CATALINA_BASE/conf/moa-id-oa/oa.properties

 STORK_OPT=-Deu.stork.samlengine.config.location=$CATALINA_BASE/conf/moa-id/stork/

 

@@ -18,7 +21,7 @@ PROXY_OPT=-Dmoa.id.proxy.configuration=$CATALINA_BASE/conf/moa-id-proxy/MOAIDCon
 #TRUST_STORE_PASS_OPT=-Djavax.net.ssl.trustStorePassword=changeit

 #TRUST_STORE_TYPE_OPT=-Djavax.net.ssl.trustStoreType=jks

 

-export CATALINA_OPTS="$CONFIG_OPT $LOGGING_OPT $SPSS_OPT $TRUST_STORE_OPT $TRUST_STORE_PASS_OPT $TRUST_STORE_TYPE_OPT $CONFIGTOOL_OPT $DEMOOA_OPT $STORK_OPT $PROXY_OPT -Xms512m -Xmx1536m -XX:PermSize=256m"

+export CATALINA_OPTS="$CONFIG_OPT $LOGGING_OPT $LOGGING_LOGBACK_OPT $SPSS_OPT $TRUST_STORE_OPT $TRUST_STORE_PASS_OPT $TRUST_STORE_TYPE_OPT $CONFIGTOOL_OPT $CONFIGTOOL_USER_OPT $DEMOOA_OPT $STORK_OPT $PROXY_OPT -Xms512m -Xmx1536m -XX:PermSize=256m"

 

 echo CATALINA_HOME: $CATALINA_HOME

 echo CATALINA_BASE: $CATALINA_BASE

diff --git a/id/server/data/deploy/tomcat/win32/startTomcat.bat b/id/server/data/deploy/tomcat/win32/startTomcat.bat
index 8d6d670bc..b45a72ace 100644
--- a/id/server/data/deploy/tomcat/win32/startTomcat.bat
+++ b/id/server/data/deploy/tomcat/win32/startTomcat.bat
@@ -10,15 +10,17 @@ set CATALINA_HOME=<Tomcat home directory>
 rem ----------------------------------------------------------------------------------------------

 

 set LOGGING_OPT=-Dlog4j.configuration=file:%CATALINA_HOME%/conf/moa-id/log4j.properties

+set LOGGING_LOGBACK_OPT=-Dlogback.configurationFile=%CATALINA_HOME%/conf/moa-id/logback_config.xml

 

 set CONFIG_OPT_SPSS=-Dmoa.spss.server.configuration=%CATALINA_HOME%/conf/moa-spss/SampleMOASPSSConfiguration.xml

-set CONFIG_OPT_ID=-Dmoa.id.configuration=%CATALINA_HOME%/conf/moa-id/moa-id.properties

-set CONFIGTOOL_OPT=-Dmoa.id.webconfig=%CATALINA_HOME%/conf/moa-id-configuration/moa-id-configtool.properties

+set CONFIG_OPT_ID=-Dmoa.id.configuration=file:%CATALINA_HOME%/conf/moa-id/moa-id.properties

+set CONFIGTOOL_OPT=-Dmoa.id.webconfig=file:%CATALINA_HOME%/conf/moa-id-configuration/moa-id-configtool.properties

+set CONFIGTOOL_USER_OPT=-Duser.properties=":$CATALINA_BASE/conf/moa-id-configuration/userdatabase.properties"

 set DEMOOA_OPT=-Dmoa.id.demoOA=%CATALINA_HOME%/conf/moa-id-oa/oa.properties

 set STORK_OPT=-Deu.stork.samlengine.config.location=%CATALINA_HOME%/conf/moa-id/stork/

 set PROXY_OPT=-Dmoa.id.proxy.configuration=%CATALINA_HOME%/conf/moa-id-proxy/MOAIDConfiguration.xml

  

-set PARAMS_MOA=%CONFIG_OPT_SPSS% %CONFIG_OPT_ID% %LOGGING_OPT% %CONFIGTOOL_OPT% %DEMOOA_OPT% %STORK_OPT% %PROXY_OPT% -Xms512m -Xmx1536m -XX:PermSize=256m

+set PARAMS_MOA=%CONFIG_OPT_SPSS% %CONFIG_OPT_ID% %LOGGING_OPT% %LOGGING_LOGBACK_OPT% %CONFIGTOOL_OPT% %CONFIGTOOL_USER_OPT% %DEMOOA_OPT% %STORK_OPT% %PROXY_OPT% -Xms512m -Xmx1536m -XX:PermSize=256m

 

 rem set PARAM_TRUST_STORE=-Djavax.net.ssl.trustStore=truststore.jks

 rem set PARAM_TRUST_STORE_PASS=-Djavax.net.ssl.trustStorePassword=changeit