From ece7d18cf35374bf4e26d041799cda8f791c89f8 Mon Sep 17 00:00:00 2001 From: gregor Date: Mon, 7 Jul 2003 10:58:37 +0000 Subject: Initial commit git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@2 d688527b-c9ab-4aba-bd8d-4036d912da1d --- .../deploy/conf/moa-spss/MOA-SPSSConfiguration.xml | 68 +++++++++ .../data/deploy/conf/moa-spss/MinimalSPConfig.xml | 4 + .../data/deploy/conf/moa-spss/MinimalSSConfig.xml | 17 +++ .../74BE7D543A41B2E8DC9E0776D3BCF4A213E5D7F5 | Bin 0 -> 987 bytes .../797AB396782981343C312F9A0F5CD87FCE159C37 | Bin 0 -> 883 bytes .../data/deploy/conf/moa-spss/keys/ecc(ego).p12 | Bin 0 -> 1234 bytes .../keys/test-ee2003_normal(buergerkarte).p12 | Bin 0 -> 3077 bytes .../data/deploy/conf/moa-spss/log4j.properties | 40 +++++ .../trustProfiles/trustProfile1/IAIKRoot.cer | Bin 0 -> 883 bytes spss.server/data/deploy/tomcat/moa-env.bat | 14 ++ spss.server/data/deploy/tomcat/moa-env.sh | 12 ++ spss.server/data/deploy/tomcat/server.mod_jk.xml | 166 ++++++++++++++++++++ spss.server/data/deploy/tomcat/server.xml | 169 +++++++++++++++++++++ .../data/deploy/tomcat/uriworkermap.properties | 4 + spss.server/data/deploy/tomcat/workers.properties | 6 + spss.server/data/deploy/tools/certtool.bat | 25 +++ spss.server/data/deploy/tools/certtool.sh | 20 +++ 17 files changed, 545 insertions(+) create mode 100644 spss.server/data/deploy/conf/moa-spss/MOA-SPSSConfiguration.xml create mode 100644 spss.server/data/deploy/conf/moa-spss/MinimalSPConfig.xml create mode 100644 spss.server/data/deploy/conf/moa-spss/MinimalSSConfig.xml create mode 100644 spss.server/data/deploy/conf/moa-spss/certstore/8898446AC34D7351B811EDF66CDA12A43D8DE5D8/74BE7D543A41B2E8DC9E0776D3BCF4A213E5D7F5 create mode 100644 spss.server/data/deploy/conf/moa-spss/certstore/8A667FFE2B4C60585C2F8296E670ADE0D904E073/797AB396782981343C312F9A0F5CD87FCE159C37 create mode 100644 spss.server/data/deploy/conf/moa-spss/keys/ecc(ego).p12 create mode 100644 spss.server/data/deploy/conf/moa-spss/keys/test-ee2003_normal(buergerkarte).p12 create mode 100644 spss.server/data/deploy/conf/moa-spss/log4j.properties create mode 100644 spss.server/data/deploy/conf/moa-spss/trustProfiles/trustProfile1/IAIKRoot.cer create mode 100644 spss.server/data/deploy/tomcat/moa-env.bat create mode 100644 spss.server/data/deploy/tomcat/moa-env.sh create mode 100644 spss.server/data/deploy/tomcat/server.mod_jk.xml create mode 100644 spss.server/data/deploy/tomcat/server.xml create mode 100644 spss.server/data/deploy/tomcat/uriworkermap.properties create mode 100644 spss.server/data/deploy/tomcat/workers.properties create mode 100644 spss.server/data/deploy/tools/certtool.bat create mode 100644 spss.server/data/deploy/tools/certtool.sh (limited to 'spss.server/data/deploy') diff --git a/spss.server/data/deploy/conf/moa-spss/MOA-SPSSConfiguration.xml b/spss.server/data/deploy/conf/moa-spss/MOA-SPSSConfiguration.xml new file mode 100644 index 000000000..23bacc354 --- /dev/null +++ b/spss.server/data/deploy/conf/moa-spss/MOA-SPSSConfiguration.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + SWKeyModule1 + + CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT + 1044289238331 + + + + + + SWKeyModule2 + + CN=IAIK ECDSA Test,OU=JavaSecurity,O=IAIK,C=AT + 68172 + + + + + + + + + + CN=Patrick Peck, OU=MOA Team, O=BRZ, L=Vienna, ST=Vienna, C=AT + 1046888262 + + + + + + CN=A-Trust-nQual-0,OU=A-Trust-nQual-0,O=A-Trust,C=AT + 536 + + + + + CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT + + + + CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT + + + + + + + + + diff --git a/spss.server/data/deploy/conf/moa-spss/MinimalSPConfig.xml b/spss.server/data/deploy/conf/moa-spss/MinimalSPConfig.xml new file mode 100644 index 000000000..d52391843 --- /dev/null +++ b/spss.server/data/deploy/conf/moa-spss/MinimalSPConfig.xml @@ -0,0 +1,4 @@ + + + + diff --git a/spss.server/data/deploy/conf/moa-spss/MinimalSSConfig.xml b/spss.server/data/deploy/conf/moa-spss/MinimalSSConfig.xml new file mode 100644 index 000000000..a55f5eabc --- /dev/null +++ b/spss.server/data/deploy/conf/moa-spss/MinimalSSConfig.xml @@ -0,0 +1,17 @@ + + + + + + SWKeyModule1 + + CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT + 1044289238331 + + + + + + + diff --git a/spss.server/data/deploy/conf/moa-spss/certstore/8898446AC34D7351B811EDF66CDA12A43D8DE5D8/74BE7D543A41B2E8DC9E0776D3BCF4A213E5D7F5 b/spss.server/data/deploy/conf/moa-spss/certstore/8898446AC34D7351B811EDF66CDA12A43D8DE5D8/74BE7D543A41B2E8DC9E0776D3BCF4A213E5D7F5 new file mode 100644 index 000000000..1cdc15c6e Binary files /dev/null and b/spss.server/data/deploy/conf/moa-spss/certstore/8898446AC34D7351B811EDF66CDA12A43D8DE5D8/74BE7D543A41B2E8DC9E0776D3BCF4A213E5D7F5 differ diff --git a/spss.server/data/deploy/conf/moa-spss/certstore/8A667FFE2B4C60585C2F8296E670ADE0D904E073/797AB396782981343C312F9A0F5CD87FCE159C37 b/spss.server/data/deploy/conf/moa-spss/certstore/8A667FFE2B4C60585C2F8296E670ADE0D904E073/797AB396782981343C312F9A0F5CD87FCE159C37 new file mode 100644 index 000000000..c0c60558a Binary files /dev/null and b/spss.server/data/deploy/conf/moa-spss/certstore/8A667FFE2B4C60585C2F8296E670ADE0D904E073/797AB396782981343C312F9A0F5CD87FCE159C37 differ diff --git a/spss.server/data/deploy/conf/moa-spss/keys/ecc(ego).p12 b/spss.server/data/deploy/conf/moa-spss/keys/ecc(ego).p12 new file mode 100644 index 000000000..f84e793c5 Binary files /dev/null and b/spss.server/data/deploy/conf/moa-spss/keys/ecc(ego).p12 differ diff --git a/spss.server/data/deploy/conf/moa-spss/keys/test-ee2003_normal(buergerkarte).p12 b/spss.server/data/deploy/conf/moa-spss/keys/test-ee2003_normal(buergerkarte).p12 new file mode 100644 index 000000000..efaeb9b98 Binary files /dev/null and b/spss.server/data/deploy/conf/moa-spss/keys/test-ee2003_normal(buergerkarte).p12 differ diff --git a/spss.server/data/deploy/conf/moa-spss/log4j.properties b/spss.server/data/deploy/conf/moa-spss/log4j.properties new file mode 100644 index 000000000..31096ff73 --- /dev/null +++ b/spss.server/data/deploy/conf/moa-spss/log4j.properties @@ -0,0 +1,40 @@ +# +# Sample log4j configuration for the MOA-SPSS web service +# + +# commons-logging setup +org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.Log4jFactory + +# Define log4j root loggers for the 'moa.spss.server' and 'iaik.server' +# logging hierarchies. +# All logging output is written to the 'stdout' and 'R' appenders. +# Add JDBC if you also want to write it to the database +log4j.rootLogger=info, stdout, R +log4j.logger.moa.spss.server=info +log4j.logger.iaik.server=info + +# Configure the 'stdout appender' to write logging output to the console +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %t | %m%n + +# Configure the rolling file appender 'R' to write logging output +# to the file 'moa-spss.log'. The file is rolled over every 1000KB, +# and a maximum history of 4 log files is being kept. +log4j.appender.R=org.apache.log4j.RollingFileAppender +log4j.appender.R.File=moa-spss.log +log4j.appender.R.MaxFileSize=1000KB +log4j.appender.R.MaxBackupIndex=4 +log4j.appender.R.layout=org.apache.log4j.PatternLayout +log4j.appender.R.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %t | %m%n + +# Configure the jdbc appender 'JDBC' to write logging output +# to the given PostgreSQL database +# a suitable table called 'spss_log' must have been created in the +# database using the command: +# create table spss_log (log_time timestamp, log_level char(5), log_msg text) +log4j.appender.JDBC=org.apache.log4j.jdbc.JDBCAppender +log4j.appender.JDBC.driver=org.postgresql.Driver +log4j.appender.JDBC.URL=jdbc:postgresql://10.16.46.108/moa?user=moa&password=moatest +log4j.appender.JDBC.layout=org.apache.log4j.PatternLayout +log4j.appender.JDBC.sql=INSERT INTO spss_log (log_time, log_level, log_msg) VALUES ('%d{ yyyy-MM-dd HH:mm:ss.SSS}', '%5p', '%m') \ No newline at end of file diff --git a/spss.server/data/deploy/conf/moa-spss/trustProfiles/trustProfile1/IAIKRoot.cer b/spss.server/data/deploy/conf/moa-spss/trustProfiles/trustProfile1/IAIKRoot.cer new file mode 100644 index 000000000..c0c60558a Binary files /dev/null and b/spss.server/data/deploy/conf/moa-spss/trustProfiles/trustProfile1/IAIKRoot.cer differ diff --git a/spss.server/data/deploy/tomcat/moa-env.bat b/spss.server/data/deploy/tomcat/moa-env.bat new file mode 100644 index 000000000..aa1ad9432 --- /dev/null +++ b/spss.server/data/deploy/tomcat/moa-env.bat @@ -0,0 +1,14 @@ +@echo off + +set MOA_START=%~dp0 + +set CONFIG_OPT=-Dmoa.spss.server.configuration=%MOA_START%conf\moa-spss\MOA-SPSSConfiguration.xml +set LOGGING_OPT=-Dlog4j.configuration=file:/%MOA_START%conf\moa-spss\log4j.properties +rem set NODE_ID_OPT=-Dmoa.node-id=node1 +rem set TRUST_STORE_OPT=-Djavax.net.ssl.trustStore=truststore.jks +rem set TRUST_STORE_PASS_OPT=-Djavax.net.ssl.trustStorePassword=changeit +rem set TRUST_STORE_TYPE_OPT=-Djavax.net.ssl.trustStoreType=jks + +set 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% \ No newline at end of file diff --git a/spss.server/data/deploy/tomcat/moa-env.sh b/spss.server/data/deploy/tomcat/moa-env.sh new file mode 100644 index 000000000..01d2605c2 --- /dev/null +++ b/spss.server/data/deploy/tomcat/moa-env.sh @@ -0,0 +1,12 @@ +MOA_START=`pwd` + +CONFIG_OPT=-Dmoa.spss.server.configuration=$MOA_START/conf/moa-spss/MOA-SPSSConfiguration.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/server.mod_jk.xml b/spss.server/data/deploy/tomcat/server.mod_jk.xml new file mode 100644 index 000000000..e6035b8be --- /dev/null +++ b/spss.server/data/deploy/tomcat/server.mod_jk.xml @@ -0,0 +1,166 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spss.server/data/deploy/tomcat/server.xml b/spss.server/data/deploy/tomcat/server.xml new file mode 100644 index 000000000..3e5966ca9 --- /dev/null +++ b/spss.server/data/deploy/tomcat/server.xml @@ -0,0 +1,169 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spss.server/data/deploy/tomcat/uriworkermap.properties b/spss.server/data/deploy/tomcat/uriworkermap.properties new file mode 100644 index 000000000..673acf65d --- /dev/null +++ b/spss.server/data/deploy/tomcat/uriworkermap.properties @@ -0,0 +1,4 @@ +# 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/workers.properties b/spss.server/data/deploy/tomcat/workers.properties new file mode 100644 index 000000000..9350ddc77 --- /dev/null +++ b/spss.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 diff --git a/spss.server/data/deploy/tools/certtool.bat b/spss.server/data/deploy/tools/certtool.bat new file mode 100644 index 000000000..4d0fb39e1 --- /dev/null +++ b/spss.server/data/deploy/tools/certtool.bat @@ -0,0 +1,25 @@ +@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 new file mode 100644 index 000000000..b97b2ed53 --- /dev/null +++ b/spss.server/data/deploy/tools/certtool.sh @@ -0,0 +1,20 @@ +#!/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 $* -- cgit v1.2.3