From d828ffa51c6915560094ebf70c6fc9d2dc8fbeff Mon Sep 17 00:00:00 2001
From: kstranacher_eGovL
 <kstranacher_eGovL@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Fri, 28 Dec 2012 11:11:55 +0000
Subject: Minor updates for TSL integration (documentation, default tsl working
 directory, tomcat startscript, example configuration with TSL support)

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1303 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 spss/server/serverlib/resources/data/deploy/tomcat/unix/moa-env.sh  | 6 +++++-
 .../serverlib/resources/data/deploy/tomcat/win32/startTomcat.bat    | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'spss/server/serverlib/resources')

diff --git a/spss/server/serverlib/resources/data/deploy/tomcat/unix/moa-env.sh b/spss/server/serverlib/resources/data/deploy/tomcat/unix/moa-env.sh
index 49d6723a3..6d5be35c0 100644
--- a/spss/server/serverlib/resources/data/deploy/tomcat/unix/moa-env.sh
+++ b/spss/server/serverlib/resources/data/deploy/tomcat/unix/moa-env.sh
@@ -2,11 +2,15 @@ MOA_START=`pwd`
 
 CONFIG_OPT=-Dmoa.spss.server.configuration=$MOA_START/conf/moa-spss/spss.config.xml
 LOGGING_OPT=-Dlog4j.configuration=file:$MOA_START/conf/moa-spss/log4j.properties
+
+# Hashcache Parameter für TSL Unterstuetzung bei MOA-SP
+#PARAM_HASHCACHE=-Diaik.xml.crypto.tsl.BinaryHashCache.DIR=$MOA_START/conf/moa-spss/hashcache/
+
 # NODE_ID_OPT=-Dmoa.node-id=node1
 # TRUST_STORE_OPT=-Djavax.net.ssl.trustStore=truststore.jks
 # 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 $NODE_ID_OPT $TRUST_STORE_OPT $TRUST_STORE_PASS_OPT $TRUST_STORE_TYPE_OPT"
+export CATALINA_OPTS="$CONFIG_OPT $LOGGING_OPT $NODE_ID_OPT $PARAM_HASHCACHE $TRUST_STORE_OPT $TRUST_STORE_PASS_OPT $TRUST_STORE_TYPE_OPT"
 
 echo CATALINA_OPTS=$CATALINA_OPTS
diff --git a/spss/server/serverlib/resources/data/deploy/tomcat/win32/startTomcat.bat b/spss/server/serverlib/resources/data/deploy/tomcat/win32/startTomcat.bat
index b7d740d12..729bddbf3 100644
--- a/spss/server/serverlib/resources/data/deploy/tomcat/win32/startTomcat.bat
+++ b/spss/server/serverlib/resources/data/deploy/tomcat/win32/startTomcat.bat
@@ -14,7 +14,11 @@ set MOA_SPSS_CFG_HOME=%CATALINA_HOME%\conf\moa-spss
 set PARAM_SPSSCONFIG=-Dmoa.spss.server.configuration=%MOA_SPSS_CFG_HOME%\spss.config.xml
 set PARAM_LOGGING=-Dlog4j.configuration=file:%MOA_SPSS_CFG_HOME%\log4j.properties
 set PARAM_NODEID=-Dmoa.node-id=Node1
-set PARAMS_MOA=%PARAM_SPSSCONFIG% %PARAM_LOGGING% %PARAM_NODEID% 
+
+rem Hashcache Parameter für TSL Unterstuetzung bei MOA-SP
+rem set PARAM_HASHCACHE=-Diaik.xml.crypto.tsl.BinaryHashCache.DIR=%MOA_SPSS_CFG_HOME%\hashcache\
+
+set PARAMS_MOA=%PARAM_SPSSCONFIG% %PARAM_LOGGING% %PARAM_NODEID% %PARAM_HASHCACHE%
 
 rem set PARAM_TRUST_STORE=-Djavax.net.ssl.trustStore=truststore.jks
 rem set PARAM_TRUST_STORE_PASS=-Djavax.net.ssl.trustStorePassword=changeit
-- 
cgit v1.2.3