From 11a85a176935a5525034715b84e4208aae4efaf3 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Wed, 5 Apr 2006 12:52:49 +0000
Subject: This commit was manufactured by cvs2svn to create tag
'Build_SPSS-1_3_1'.
git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/tags/Build_SPSS-1_3_1@700 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
id.server/data/deploy/tomcat/server.mod_jk.xml | 162 -------------------
id.server/data/deploy/tomcat/server.xml | 171 ---------------------
.../tomcat-util-4.1.27-patched/tomcat-util.jar | Bin 178544 -> 0 bytes
id.server/data/deploy/tomcat/unix/tomcat-start.sh | 28 ----
id.server/data/deploy/tomcat/unix/tomcat-stop.sh | 7 -
.../data/deploy/tomcat/uriworkermap.properties | 9 --
id.server/data/deploy/tomcat/win32/startTomcat.bat | 26 ----
id.server/data/deploy/tomcat/win32/stopTomcat.bat | 13 --
id.server/data/deploy/tomcat/workers.properties | 6 -
9 files changed, 422 deletions(-)
delete mode 100644 id.server/data/deploy/tomcat/server.mod_jk.xml
delete mode 100644 id.server/data/deploy/tomcat/server.xml
delete mode 100644 id.server/data/deploy/tomcat/tomcat-util-4.1.27-patched/tomcat-util.jar
delete mode 100644 id.server/data/deploy/tomcat/unix/tomcat-start.sh
delete mode 100644 id.server/data/deploy/tomcat/unix/tomcat-stop.sh
delete mode 100644 id.server/data/deploy/tomcat/uriworkermap.properties
delete mode 100644 id.server/data/deploy/tomcat/win32/startTomcat.bat
delete mode 100644 id.server/data/deploy/tomcat/win32/stopTomcat.bat
delete mode 100644 id.server/data/deploy/tomcat/workers.properties
(limited to 'id.server/data/deploy/tomcat')
diff --git a/id.server/data/deploy/tomcat/server.mod_jk.xml b/id.server/data/deploy/tomcat/server.mod_jk.xml
deleted file mode 100644
index b32cf7844..000000000
--- a/id.server/data/deploy/tomcat/server.mod_jk.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/id.server/data/deploy/tomcat/server.xml b/id.server/data/deploy/tomcat/server.xml
deleted file mode 100644
index 2fd7b6439..000000000
--- a/id.server/data/deploy/tomcat/server.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/id.server/data/deploy/tomcat/tomcat-util-4.1.27-patched/tomcat-util.jar b/id.server/data/deploy/tomcat/tomcat-util-4.1.27-patched/tomcat-util.jar
deleted file mode 100644
index 62c7645b9..000000000
Binary files a/id.server/data/deploy/tomcat/tomcat-util-4.1.27-patched/tomcat-util.jar and /dev/null differ
diff --git a/id.server/data/deploy/tomcat/unix/tomcat-start.sh b/id.server/data/deploy/tomcat/unix/tomcat-start.sh
deleted file mode 100644
index 6dc0289d5..000000000
--- a/id.server/data/deploy/tomcat/unix/tomcat-start.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/bash
-
-export JAVA_HOME=
-export CATALINA_HOME=
-export CATALINA_BASE=$CATALINA_HOME
-
-CONFIG_OPT=-Dmoa.id.configuration=$CATALINA_BASE/conf/moa-id/SampleMOAIDConfiguration.xml
-LOGGING_OPT=-Dlog4j.configuration=file:$CATALINA_BASE/conf/moa-id/log4j.properties
-SPSS_OPT=-Dmoa.spss.server.configuration=$CATALINA_BASE/conf/moa-spss/SampleMOASPSSConfiguration.xml
-
-#TRUST_STORE_OPT=-Djavax.net.ssl.trustStore=$CATALINA_BASE/conf/moa-spss/keys/clients/trustedMOAClients-password=changeit.keystore
-#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"
-
-echo CATALINA_HOME: $CATALINA_HOME
-echo CATALINA_BASE: $CATALINA_BASE
-echo CATALINA_OPTS: $CATALINA_OPTS
-
-echo
-echo Moving old log files to logs\backup
-mv logs/*.out logs/backup
-mv logs/*.txt logs/backup
-mv logs/*.log logs/backup
-
-cd $CATALINA_HOME
-./bin/startup.sh
diff --git a/id.server/data/deploy/tomcat/unix/tomcat-stop.sh b/id.server/data/deploy/tomcat/unix/tomcat-stop.sh
deleted file mode 100644
index 82e4ffcfe..000000000
--- a/id.server/data/deploy/tomcat/unix/tomcat-stop.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#! /bin/bash
-
-export JAVA_HOME=
-export CATALINA_HOME=
-
-cd $CATALINA_HOME
-./bin/shutdown.sh
\ No newline at end of file
diff --git a/id.server/data/deploy/tomcat/uriworkermap.properties b/id.server/data/deploy/tomcat/uriworkermap.properties
deleted file mode 100644
index 32b4c1f50..000000000
--- a/id.server/data/deploy/tomcat/uriworkermap.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-# a sample mod_jk uriworkermap.properties file for mapping
-# MOA-ID-AUTH and MOA-ID-PROXY web service requests to workers
-#
-# omit the mappings you don't need
-
-#/moa-id-auth/*=moaworker
-
-#forward all requests to tomcat (e.g.)
-/*=moaworker
\ No newline at end of file
diff --git a/id.server/data/deploy/tomcat/win32/startTomcat.bat b/id.server/data/deploy/tomcat/win32/startTomcat.bat
deleted file mode 100644
index f6ebc3613..000000000
--- a/id.server/data/deploy/tomcat/win32/startTomcat.bat
+++ /dev/null
@@ -1,26 +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 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/SampleMOAIDConfiguration.xml
-set LOGGING_OPT=-Dlog4j.configuration=file:%CATALINA_HOME%/conf/moa-id/log4j.properties
-
-set PARAMS_MOA=%CONFIG_OPT_SPSS% %CONFIG_OPT_ID% %LOGGING_OPT%
-
-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/id.server/data/deploy/tomcat/win32/stopTomcat.bat b/id.server/data/deploy/tomcat/win32/stopTomcat.bat
deleted file mode 100644
index 09dd83f2d..000000000
--- a/id.server/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/id.server/data/deploy/tomcat/workers.properties b/id.server/data/deploy/tomcat/workers.properties
deleted file mode 100644
index 9350ddc77..000000000
--- a/id.server/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