From 43e57a42832ea8b4ceb0317f3c9028a4174ffa7b Mon Sep 17 00:00:00 2001 From: mcentner Date: Wed, 8 Aug 2007 07:25:32 +0000 Subject: Adapted project directory structure to suit the new maven based build process. git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@909 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 0 -> 178544 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 insertions(+) create mode 100644 id/server/data/deploy/tomcat/server.mod_jk.xml create mode 100644 id/server/data/deploy/tomcat/server.xml create mode 100644 id/server/data/deploy/tomcat/tomcat-util-4.1.27-patched/tomcat-util.jar create mode 100644 id/server/data/deploy/tomcat/unix/tomcat-start.sh create mode 100644 id/server/data/deploy/tomcat/unix/tomcat-stop.sh create mode 100644 id/server/data/deploy/tomcat/uriworkermap.properties create mode 100644 id/server/data/deploy/tomcat/win32/startTomcat.bat create mode 100644 id/server/data/deploy/tomcat/win32/stopTomcat.bat create 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 new file mode 100644 index 000000000..b32cf7844 --- /dev/null +++ b/id/server/data/deploy/tomcat/server.mod_jk.xml @@ -0,0 +1,162 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/id/server/data/deploy/tomcat/server.xml b/id/server/data/deploy/tomcat/server.xml new file mode 100644 index 000000000..2fd7b6439 --- /dev/null +++ b/id/server/data/deploy/tomcat/server.xml @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 new file mode 100644 index 000000000..62c7645b9 Binary files /dev/null and b/id/server/data/deploy/tomcat/tomcat-util-4.1.27-patched/tomcat-util.jar differ diff --git a/id/server/data/deploy/tomcat/unix/tomcat-start.sh b/id/server/data/deploy/tomcat/unix/tomcat-start.sh new file mode 100644 index 000000000..6dc0289d5 --- /dev/null +++ b/id/server/data/deploy/tomcat/unix/tomcat-start.sh @@ -0,0 +1,28 @@ +#! /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 new file mode 100644 index 000000000..82e4ffcfe --- /dev/null +++ b/id/server/data/deploy/tomcat/unix/tomcat-stop.sh @@ -0,0 +1,7 @@ +#! /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 new file mode 100644 index 000000000..32b4c1f50 --- /dev/null +++ b/id/server/data/deploy/tomcat/uriworkermap.properties @@ -0,0 +1,9 @@ +# 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 new file mode 100644 index 000000000..f6ebc3613 --- /dev/null +++ b/id/server/data/deploy/tomcat/win32/startTomcat.bat @@ -0,0 +1,26 @@ +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 new file mode 100644 index 000000000..09dd83f2d --- /dev/null +++ b/id/server/data/deploy/tomcat/win32/stopTomcat.bat @@ -0,0 +1,13 @@ +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 new file mode 100644 index 000000000..9350ddc77 --- /dev/null +++ b/id/server/data/deploy/tomcat/workers.properties @@ -0,0 +1,6 @@ +# 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