From 30db55cc7a7a9bfa67b321e66bb8d1b1abf7afc9 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Thu, 2 Mar 2017 10:43:59 +0100 Subject: remove MOA-SPSS source code from MOA-ID repository. The MOA-SPSS source is already moved to a new repository. --- .../serverws/data/deploy/tomcat/server.mod_jk.xml | 166 -------------------- spss/server/serverws/data/deploy/tomcat/server.xml | 169 --------------------- .../serverws/data/deploy/tomcat/unix/moa-env.sh | 12 -- .../data/deploy/tomcat/uriworkermap.properties | 4 - .../data/deploy/tomcat/win32/startTomcat.bat | 31 ---- .../data/deploy/tomcat/win32/stopTomcat.bat | 13 -- .../serverws/data/deploy/tomcat/workers.properties | 6 - 7 files changed, 401 deletions(-) delete mode 100644 spss/server/serverws/data/deploy/tomcat/server.mod_jk.xml delete mode 100644 spss/server/serverws/data/deploy/tomcat/server.xml delete mode 100644 spss/server/serverws/data/deploy/tomcat/unix/moa-env.sh delete mode 100644 spss/server/serverws/data/deploy/tomcat/uriworkermap.properties delete mode 100644 spss/server/serverws/data/deploy/tomcat/win32/startTomcat.bat delete mode 100644 spss/server/serverws/data/deploy/tomcat/win32/stopTomcat.bat delete mode 100644 spss/server/serverws/data/deploy/tomcat/workers.properties (limited to 'spss/server/serverws/data/deploy/tomcat') diff --git a/spss/server/serverws/data/deploy/tomcat/server.mod_jk.xml b/spss/server/serverws/data/deploy/tomcat/server.mod_jk.xml deleted file mode 100644 index e6035b8be..000000000 --- a/spss/server/serverws/data/deploy/tomcat/server.mod_jk.xml +++ /dev/null @@ -1,166 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spss/server/serverws/data/deploy/tomcat/server.xml b/spss/server/serverws/data/deploy/tomcat/server.xml deleted file mode 100644 index 3e5966ca9..000000000 --- a/spss/server/serverws/data/deploy/tomcat/server.xml +++ /dev/null @@ -1,169 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spss/server/serverws/data/deploy/tomcat/unix/moa-env.sh b/spss/server/serverws/data/deploy/tomcat/unix/moa-env.sh deleted file mode 100644 index 49d6723a3..000000000 --- a/spss/server/serverws/data/deploy/tomcat/unix/moa-env.sh +++ /dev/null @@ -1,12 +0,0 @@ -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 -# 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" - -echo CATALINA_OPTS=$CATALINA_OPTS diff --git a/spss/server/serverws/data/deploy/tomcat/uriworkermap.properties b/spss/server/serverws/data/deploy/tomcat/uriworkermap.properties deleted file mode 100644 index 673acf65d..000000000 --- a/spss/server/serverws/data/deploy/tomcat/uriworkermap.properties +++ /dev/null @@ -1,4 +0,0 @@ -# a sample mod_jk uriworkermap.properties file for mapping -# MOA SP/SS web service requests to workers - -/moa-spss/*=moaworker \ 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 deleted file mode 100644 index 729bddbf3..000000000 --- a/spss/server/serverws/data/deploy/tomcat/win32/startTomcat.bat +++ /dev/null @@ -1,31 +0,0 @@ -rem ---------------------------------------------------------------------------------------------- -rem Modify these entries according to your needs - -rem JDK home directory (no trailing path separator) -set JAVA_HOME= - -rem Tomcat 4.1.x home directory (no trailing path separator) -set CATALINA_HOME= - -rem ---------------------------------------------------------------------------------------------- - -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 - -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 -rem set PARAM_TRUST_STORE_TYPE=-Djavax.net.ssl.trustStoreType=jks -rem set PARAMS_SSL=%PARAM_TRUST_STORE% %PARAM_TRUST_STORE_PASS% %PARAM_TRUST_STORE_TYPE% - -set CATALINA_OPTS=%PARAMS_MOA% %PARAMS_SSL% - -cd %CATALINA_HOME% -bin\catalina.bat start \ No newline at end of file diff --git a/spss/server/serverws/data/deploy/tomcat/win32/stopTomcat.bat b/spss/server/serverws/data/deploy/tomcat/win32/stopTomcat.bat deleted file mode 100644 index 09dd83f2d..000000000 --- a/spss/server/serverws/data/deploy/tomcat/win32/stopTomcat.bat +++ /dev/null @@ -1,13 +0,0 @@ -rem ---------------------------------------------------------------------------------------------- -rem Modify these entries according to your needs - -rem JDK home directory (no trailing path separator) -set JAVA_HOME= - -rem Tomcat 4.1.x home directory (no trailing path separator) -set CATALINA_HOME= - -rem ---------------------------------------------------------------------------------------------- - -cd %CATALINA_HOME% -bin\catalina.bat stop \ No newline at end of file diff --git a/spss/server/serverws/data/deploy/tomcat/workers.properties b/spss/server/serverws/data/deploy/tomcat/workers.properties deleted file mode 100644 index 9350ddc77..000000000 --- a/spss/server/serverws/data/deploy/tomcat/workers.properties +++ /dev/null @@ -1,6 +0,0 @@ -# a sample workers.properties file defining a single mod_jk worker - -worker.list=moaworker -worker.moaworker.type=ajp13 -worker.moaworker.host=localhost -worker.moaworker.port=8009 -- cgit v1.2.3