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 --- spss.server/data/deploy/tomcat/server.mod_jk.xml | 166 -------------------- spss.server/data/deploy/tomcat/server.xml | 169 --------------------- spss.server/data/deploy/tomcat/unix/moa-env.sh | 12 -- .../data/deploy/tomcat/uriworkermap.properties | 4 - .../data/deploy/tomcat/win32/startTomcat.bat | 27 ---- .../data/deploy/tomcat/win32/stopTomcat.bat | 13 -- spss.server/data/deploy/tomcat/workers.properties | 6 - spss.server/data/deploy/tools/certtool.bat | 25 --- spss.server/data/deploy/tools/certtool.sh | 20 --- spss.server/data/deploy/tools/configtool.bat | 25 --- spss.server/data/deploy/tools/configtool.sh | 20 --- 11 files changed, 487 deletions(-) delete mode 100644 spss.server/data/deploy/tomcat/server.mod_jk.xml delete mode 100644 spss.server/data/deploy/tomcat/server.xml delete mode 100644 spss.server/data/deploy/tomcat/unix/moa-env.sh delete mode 100644 spss.server/data/deploy/tomcat/uriworkermap.properties delete mode 100644 spss.server/data/deploy/tomcat/win32/startTomcat.bat delete mode 100644 spss.server/data/deploy/tomcat/win32/stopTomcat.bat delete mode 100644 spss.server/data/deploy/tomcat/workers.properties delete mode 100644 spss.server/data/deploy/tools/certtool.bat delete mode 100644 spss.server/data/deploy/tools/certtool.sh delete mode 100644 spss.server/data/deploy/tools/configtool.bat delete mode 100644 spss.server/data/deploy/tools/configtool.sh (limited to 'spss.server/data') diff --git a/spss.server/data/deploy/tomcat/server.mod_jk.xml b/spss.server/data/deploy/tomcat/server.mod_jk.xml deleted file mode 100644 index e6035b8be..000000000 --- a/spss.server/data/deploy/tomcat/server.mod_jk.xml +++ /dev/null @@ -1,166 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spss.server/data/deploy/tomcat/server.xml b/spss.server/data/deploy/tomcat/server.xml deleted file mode 100644 index 3e5966ca9..000000000 --- a/spss.server/data/deploy/tomcat/server.xml +++ /dev/null @@ -1,169 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spss.server/data/deploy/tomcat/unix/moa-env.sh b/spss.server/data/deploy/tomcat/unix/moa-env.sh deleted file mode 100644 index 49d6723a3..000000000 --- a/spss.server/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/data/deploy/tomcat/uriworkermap.properties b/spss.server/data/deploy/tomcat/uriworkermap.properties deleted file mode 100644 index 673acf65d..000000000 --- a/spss.server/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/data/deploy/tomcat/win32/startTomcat.bat b/spss.server/data/deploy/tomcat/win32/startTomcat.bat deleted file mode 100644 index b7d740d12..000000000 --- a/spss.server/data/deploy/tomcat/win32/startTomcat.bat +++ /dev/null @@ -1,27 +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 -set PARAMS_MOA=%PARAM_SPSSCONFIG% %PARAM_LOGGING% %PARAM_NODEID% - -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/data/deploy/tomcat/win32/stopTomcat.bat b/spss.server/data/deploy/tomcat/win32/stopTomcat.bat deleted file mode 100644 index 09dd83f2d..000000000 --- a/spss.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/spss.server/data/deploy/tomcat/workers.properties b/spss.server/data/deploy/tomcat/workers.properties deleted file mode 100644 index 9350ddc77..000000000 --- a/spss.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 diff --git a/spss.server/data/deploy/tools/certtool.bat b/spss.server/data/deploy/tools/certtool.bat deleted file mode 100644 index 0504211b8..000000000 --- a/spss.server/data/deploy/tools/certtool.bat +++ /dev/null @@ -1,25 +0,0 @@ -@echo off - -rem -rem Script to invoke the CertTool class -rem -rem Author: Patrick Peck -rem Version: $Id: certtool.bat,v 1.6 2003/05/08 11:46:29 peck Exp $ -rem - - -if %OS%=="Windows_NT" @setlocal - -set CERTTOOL=at.gv.egovernment.moa.spss.server.tools.CertTool -set TOOLSPATH=%~p0 -set CLASSPATH=%TOOLSPATH%tools.jar;%TOOLSPATH%iaik_moa_full.jar;%TOOLSPATH%iaik_jce_full.jar;%TOOLSPATH%iaik_ecc.jar;%TOOLSPATH%log4j-1.2.7.jar - -if "%JAVA_HOME%"=="" goto noJavaHome -%JAVA_HOME%\bin\java.exe -classpath %CLASSPATH% %CERTTOOL% %1 %2 %3 %4 %5 %6 %7 %8 %9 -goto end - -:noJavaHome -echo error: JAVA_HOME not defined - -:end -if %OS%=="Windows_NT" @endlocal \ No newline at end of file diff --git a/spss.server/data/deploy/tools/certtool.sh b/spss.server/data/deploy/tools/certtool.sh deleted file mode 100644 index c7ff374f4..000000000 --- a/spss.server/data/deploy/tools/certtool.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -# -# Script to invoke the CertTool class -# -# Author:Patrick Peck -# Version: $Id: certtool.sh,v 1.9 2003/06/23 16:01:27 peck Exp $ -# - - -if [ -z "$JAVA_HOME" ]; then - echo "error: JAVA_HOME not defined"; - exit; -fi - -CERTOOL=at.gv.egovernment.moa.spss.server.tools.CertTool -TOOLSPATH=`dirname $PWD/$0` -CLASSPATH=$TOOLSPATH/tools.jar:$TOOLSPATH/iaik_moa_full.jar:$TOOLSPATH/iaik_jce_full.jar:$TOOLSPATH/iaik_ecc.jar:$TOOLSPATH/log4j-1.2.7.jar - -$JAVA_HOME/bin/java -classpath $CLASSPATH $CERTOOL $* diff --git a/spss.server/data/deploy/tools/configtool.bat b/spss.server/data/deploy/tools/configtool.bat deleted file mode 100644 index 868df11f0..000000000 --- a/spss.server/data/deploy/tools/configtool.bat +++ /dev/null @@ -1,25 +0,0 @@ -@echo off - -rem -rem Script to invoke the ConfigTool class -rem -rem Author: Gregor Karlinger -rem Version: $Id: $ -rem - - -if %OS%=="Windows_NT" @setlocal - -set CONFIGTOOL=at.gv.egovernment.moa.spss.server.tools.ConfigTool -set TOOLSPATH=%~p0 -set CLASSPATH=%TOOLSPATH%tools.jar;%TOOLSPATH%xalan.jar; - -if "%JAVA_HOME%"=="" goto noJavaHome -%JAVA_HOME%\bin\java.exe -classpath %CLASSPATH% %CONFIGTOOL% %1 %2 %3 %4 %5 %6 %7 %8 %9 -goto end - -:noJavaHome -echo error: JAVA_HOME not defined - -:end -if %OS%=="Windows_NT" @endlocal \ No newline at end of file diff --git a/spss.server/data/deploy/tools/configtool.sh b/spss.server/data/deploy/tools/configtool.sh deleted file mode 100644 index f7f29bae1..000000000 --- a/spss.server/data/deploy/tools/configtool.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -# -# Script to invoke the ConfigTool class -# -# Author: Gregor Karlinger -# Version: $Id: $ -# - - -if [ -z "$JAVA_HOME" ]; then - echo "error: JAVA_HOME not defined"; - exit; -fi - -CONFIGTOOL=at.gv.egovernment.moa.spss.server.tools.ConfigTool -TOOLSPATH=`dirname $PWD/$0` -CLASSPATH=$TOOLSPATH/tools.jar:$TOOLSPATH/xalan.jar - -$JAVA_HOME/bin/java -classpath $CLASSPATH $CONFIGTOOL $* -- cgit v1.2.3