Minor updates for TSL integration (documentation, default tsl working directory, tomcat startscript, example configuration with TSL support)tags/tsl-integration-snapshot-svn

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1303 d688527b-c9ab-4aba-bd8d-4036d912da1d

5 files changed, 30 insertions, 26 deletions

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

diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java
index d9e20fda9..c9b76dd7e 100644
--- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java
@@ -135,7 +135,7 @@ public class SystemInitializer {
       
       //start TSL Update
       TSLUpdaterTimerTask.tslconnector_ = tslconnector;
-      //TSLUpdaterTimerTask.update();
+      TSLUpdaterTimerTask.update();
     	
       //initialize TSL Update Task
       initTSLUpdateTask(tslconfig);
@@ -147,20 +147,20 @@ public class SystemInitializer {
     catch (TSLEngineDiedException e) {
     	Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e);
 	} 
-//    catch (TSLSearchException e) {
-//    	Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e);
-//    } 
-//    catch (CertStoreException e) {
-//    	Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e);
-//    } catch (TrustStoreException e) {
-//    	Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e);
-//    } catch (CertificateException e) {
-//    	Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e);
-//    } catch (FileNotFoundException e) {
-//    	Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e);
-//    } catch (IOException e) {
-//    	Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e);
-//    }
+    catch (TSLSearchException e) {
+    	Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e);
+    } 
+    catch (CertStoreException e) {
+    	Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e);
+    } catch (TrustStoreException e) {
+    	Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e);
+    } catch (CertificateException e) {
+    	Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e);
+    } catch (FileNotFoundException e) {
+    	Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e);
+    } catch (IOException e) {
+    	Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e);
+    }
 
     // set IXSIL debug output
     IXSILInit.setPrintDebugLog(
diff --git a/spss/server/serverws/.classpath b/spss/server/serverws/.classpath
index bd0d802c7..a734c5415 100644
--- a/spss/server/serverws/.classpath
+++ b/spss/server/serverws/.classpath
@@ -3,7 +3,6 @@
   <classpathentry kind="output" path="target/classes"/>

   <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>

   <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar"/>

-  <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.2.6/jaxb-api-2.2.6.jar"/>

   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

   <classpathentry kind="src" path="/moa-spss-lib"/>

   <classpathentry kind="var" path="M2_REPO/axis/axis/1.0_IAIK/axis-1.0_IAIK.jar"/>

@@ -28,11 +27,4 @@
   <classpathentry kind="src" path="/moa-common"/>

   <classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.0-FCS/jaxen-1.0-FCS.jar"/>

   <classpathentry kind="var" path="M2_REPO/saxpath/saxpath/1.0-FCS/saxpath-1.0-FCS.jar"/>

-  <classpathentry kind="var" path="M2_REPO/joda-time/joda-time/1.6.2/joda-time-1.6.2.jar"/>

-  <classpathentry kind="var" path="M2_REPO/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.jar"/>

-  <classpathentry kind="var" path="M2_REPO/iaik/prod/iaik_util/0.23/iaik_util-0.23.jar"/>

-  <classpathentry kind="var" path="M2_REPO/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.jar"/>

-  <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.2.5/jaxb-impl-2.2.5.jar"/>

-  <classpathentry kind="var" path="M2_REPO/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.jar"/>

-  <classpathentry kind="var" path="M2_REPO/iaik/prod/iaik_jsse/4.4/iaik_jsse-4.4.jar"/>

 </classpath>
\ No newline at end of file
diff --git a/spss/server/serverws/data/deploy/tomcat/win32/startTomcat.bat b/spss/server/serverws/data/deploy/tomcat/win32/startTomcat.bat
index b7d740d12..729bddbf3 100644
--- a/spss/server/serverws/data/deploy/tomcat/win32/startTomcat.bat
+++ b/spss/server/serverws/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