Initial commit

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@2 d688527b-c9ab-4aba-bd8d-4036d912da1d

17 files changed, 545 insertions, 0 deletions

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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- edited with XMLSPY v5 rel. 3 U (http://www.xmlspy.com) by Stephan G (Comp) -->
+<MOAConfiguration xmlns="http://reference.e-government.gv.at/namespace/moaconfig/20021122#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
+	<!--werde unten angeführte Elemente nicht explizit verwendet, werden die angeführten Werte als Default-Wert verwendet-->
+	<CanonicalizationAlgorithm name="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>
+	<DigestMethodAlgorithm name="http://www.w3.org/2000/09/xmldsig#sha1"/>
+	<GenericConfiguration name="autoAddCertificates" value="true"/>
+	<GenericConfiguration name="useAuthorityInfoAccess" value="true"/>
+	<GenericConfiguration name="checkRevocation" value="false"/>
+	<GenericConfiguration name="maxRevocationAge" value="0"/>
+	<GenericConfiguration name="archiveRevocationInfo" value="false"/>
+	<!--wenn DataBaseArchiveParameter.JDBCUrl nicht gesetzt ist dann ist archiveRevocationInfo immer "false"-->
+	<GenericConfiguration name="DataBaseArchiveParameter.JDBCUrl" value="jdbc:postgresql://host/moa?user=moa&amp;password=moatest"/>
+	<GenericConfiguration name="DirectoryCertStoreParameters.RootDir" value="certstore"/>
+	<!-- <HardwareKeyModule id="HWKeyModule1" name="cryptoki.dll" slotID="0" userPIN="PIN"/> -->
+	<SoftwareKeyModule id="SWKeyModule1" filename="keys/test-ee2003_normal(buergerkarte).p12" password="buergerkarte"/>
+	<SoftwareKeyModule id="SWKeyModule2" filename="keys/ecc(ego).p12" password="ego"/>
+	<KeyGroup id="PKCS12RSAKey1">
+		<Key>
+			<KeyModuleID>SWKeyModule1</KeyModuleID>
+			<KeyCertIssuerSerial>
+				<dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
+				<dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
+			</KeyCertIssuerSerial>
+		</Key>
+	</KeyGroup>
+	<KeyGroup id="PKCS12ECDSAKey1">
+		<Key>
+			<KeyModuleID>SWKeyModule2</KeyModuleID>
+			<KeyCertIssuerSerial>
+				<dsig:X509IssuerName>CN=IAIK ECDSA Test,OU=JavaSecurity,O=IAIK,C=AT</dsig:X509IssuerName>
+				<dsig:X509SerialNumber>68172</dsig:X509SerialNumber>
+			</KeyCertIssuerSerial>
+		</Key>
+	</KeyGroup>
+	<KeyGroupMapping>
+		<KeyGroup id="PKCS12RSAKey1"/>
+		<KeyGroup id="PKCS12ECDSAKey1"/>
+	</KeyGroupMapping>
+	<KeyGroupMapping>
+		<X509IssuerSerial>
+			<dsig:X509IssuerName>CN=Patrick Peck, OU=MOA Team, O=BRZ, L=Vienna, ST=Vienna, C=AT</dsig:X509IssuerName>
+			<dsig:X509SerialNumber>1046888262</dsig:X509SerialNumber>
+		</X509IssuerSerial>
+		<KeyGroup id="PKCS12RSAKey1"/>
+	</KeyGroupMapping>
+	<ChainingModes systemDefaultMode="pkix">
+		<TrustAnchor mode="chaining">
+			<dsig:X509IssuerName>CN=A-Trust-nQual-0,OU=A-Trust-nQual-0,O=A-Trust,C=AT</dsig:X509IssuerName>
+			<dsig:X509SerialNumber>536</dsig:X509SerialNumber>
+		</TrustAnchor>
+	</ChainingModes>
+	<CRLArchive duration="365"/>
+	<CRLDistributionPoint>
+		<CAIssuerDN>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</CAIssuerDN>
+		<DistributionPoint uri="http://www.iaik.at/testCA/iaik_test_sig.crl"/>
+	</CRLDistributionPoint>
+	<CRLDistributionPoint>
+		<CAIssuerDN>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</CAIssuerDN>
+		<DistributionPoint reasonCodes="keyCompromise affiliationChanged" uri="http://www.iaik.at/testCA/iaik_test_sig.crl"/>
+		<DistributionPoint reasonCodes="certificateHold" uri="http://www.iaik.at/testCA/iaik_test_sig.crl"/>
+	</CRLDistributionPoint>
+	<!-- <CreateTransformsInfoProfile id="CreateTransformsInfoProfile1" filename="createTransformInfoProfiles/einGueltigesProfil.xml"/> -->
+	<!-- <CreateSignatureEnvironmentProfile id="CreateSignatureEnvironmentProfile1" filename="createSignatureEnvironmentProfiles/einGueltigesProfil.xml"/> -->
+	<!-- <VerifyTransformsInfoProfile id="TransformsInfoProfile1" filename="verifyTransformsInfoProfiles/einGueltigesProfil.xml"/> -->
+	<!-- <SupplementProfile id="SupplementProfile1" filename="supplementProfiles/einGueltigesProfil.xml"/> -->
+	<TrustProfile id="TrustProfile1" uri="trustProfiles/trustProfile1"/>
+</MOAConfiguration>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MOAConfiguration xmlns="http://reference.e-government.gv.at/namespace/moaconfig/20021122#">
+	<TrustProfile id="TrustProfile1" uri="file:/SERVERDIR/resources/TrustProfile1"/>
+</MOAConfiguration>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MOAConfiguration xmlns="http://reference.e-government.gv.at/namespace/moaconfig/20021122#"
+					 xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
+	<SoftwareKeyModule id="SWKeyModule1" filename="test-ee2003_normal.p12" password="buergerkarte"/>
+	<KeyGroup id="PKCS12RSAKey1">
+		<Key>
+			<KeyModuleID>SWKeyModule1</KeyModuleID>
+			<KeyCertIssuerSerial>
+				<dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
+				<dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
+			</KeyCertIssuerSerial>
+		</Key>
+	</KeyGroup>
+	<KeyGroupMapping>
+		<KeyGroup id="PKCS12RSAKey1"/>
+	</KeyGroupMapping>
+</MOAConfiguration>
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
--- /dev/null
+++ b/spss.server/data/deploy/conf/moa-spss/certstore/8898446AC34D7351B811EDF66CDA12A43D8DE5D8/74BE7D543A41B2E8DC9E0776D3BCF4A213E5D7F5
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
--- /dev/null
+++ b/spss.server/data/deploy/conf/moa-spss/certstore/8A667FFE2B4C60585C2F8296E670ADE0D904E073/797AB396782981343C312F9A0F5CD87FCE159C37
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
--- /dev/null
+++ b/spss.server/data/deploy/conf/moa-spss/keys/ecc(ego).p12
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
--- /dev/null
+++ b/spss.server/data/deploy/conf/moa-spss/keys/test-ee2003_normal(buergerkarte).p12
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
--- /dev/null
+++ b/spss.server/data/deploy/conf/moa-spss/trustProfiles/trustProfile1/IAIKRoot.cer
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 @@
+<!-- Alternate Example-less Configuration File -->
+<!-- Note that component elements are nested corresponding to their
+     parent-child relationships with each other -->
+
+<!-- A "Server" is a singleton element that represents the entire JVM,
+     which may contain one or more "Service" instances.  The Server
+     listens for a shutdown command on the indicated port.
+
+     Note:  A "Server" is not itself a "Container", so you may not
+     define subcomponents such as "Valves" or "Loggers" at this level.
+ -->
+
+<Server port="8005" shutdown="SHUTDOWN" debug="0">
+
+
+  <!-- Uncomment this entry to enable JMX MBeans support -->
+<!--
+  <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener"
+                debug="0" port="-1" login="admin" password="admin"/>
+-->
+
+
+  <!-- A "Service" is a collection of one or more "Connectors" that share
+       a single "Container" (and therefore the web applications visible
+       within that Container).  Normally, that Container is an "Engine",
+       but this is not required.
+
+       Note:  A "Service" is not itself a "Container", so you may not
+       define subcomponents such as "Valves" or "Loggers" at this level.
+   -->
+
+  <!-- Define the Tomcat Stand-Alone Service -->
+  <Service name="Tomcat-Standalone">
+
+    <!-- A "Connector" represents an endpoint by which requests are received
+         and responses are returned.  Each Connector passes requests on to the
+         associated "Container" (normally an Engine) for processing.
+
+         By default, a non-SSL HTTP/1.1 Connector is established on port 8080.
+         You can also enable an SSL HTTP/1.1 Connector on port 8443 by
+         following the instructions below and uncommenting the second Connector
+         entry.  SSL support requires the following steps (see the SSL Config
+         HOWTO in the Tomcat 4.0 documentation bundle for more detailed
+         instructions):
+         * Download and install JSSE 1.0.2 or later, and put the JAR files
+           into "$JAVA_HOME/jre/lib/ext".
+         * Execute:
+             %JAVA_HOME%\bin\keytool -genkey -alias tomcat -keyalg RSA (Windows)
+             $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA  (Unix)
+           with a password value of "changeit" for both the certificate and
+           the keystore itself.
+
+         By default, DNS lookups are enabled when a web application calls
+         request.getRemoteHost().  This can have an adverse impact on
+         performance, so you can disable it by setting the
+         "enableLookups" attribute to "false".  When DNS lookups are disabled,
+         request.getRemoteHost() will return the String version of the
+         IP address of the remote client.
+    -->
+
+    <!-- Define a Coyote/JK2 AJP 1.3 Connector on port 8009 -->
+    <!--
+    <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
+               port="8009" minProcessors="5" maxProcessors="75"
+               enableLookups="true" redirectPort="8443"
+               acceptCount="10" debug="0" connectionTimeout="0"
+               useURIValidationHack="false"
+               protocolHandlerClassName="org.apache.jk.server.JkCoyoteHandler"/>
+    -->
+    
+    <!-- Define an AJP 1.3 Connector on port 8009 -->
+    <Connector className="org.apache.ajp.tomcat4.Ajp13Connector"
+               port="8009" minProcessors="5" maxProcessors="75"
+               acceptCount="10" debug="0"/>
+
+    <!-- An Engine represents the entry point (within Catalina) that processes
+         every request.  The Engine implementation for Tomcat stand alone
+         analyzes the HTTP headers included with the request, and passes them
+         on to the appropriate Host (virtual host). -->
+
+    <!-- Define the top level container in our container hierarchy -->
+    <Engine name="Standalone" defaultHost="localhost" debug="0">
+
+      <!-- The request dumper valve dumps useful debugging information about
+           the request headers and cookies that were received, and the response
+           headers and cookies that were sent, for all requests received by
+           this instance of Tomcat.  If you care only about requests to a
+           particular virtual host, or a particular application, nest this
+           element inside the corresponding <Host> or <Context> entry instead.
+
+           For a similar mechanism that is portable to all Servlet 2.3
+           containers, check out the "RequestDumperFilter" Filter in the
+           example application (the source for this filter may be found in
+           "$CATALINA_HOME/webapps/examples/WEB-INF/classes/filters").
+
+           Request dumping is disabled by default.  Uncomment the following
+           element to enable it. -->
+      <!--
+      <Valve className="org.apache.catalina.valves.RequestDumperValve"/>
+      -->
+
+      <!-- Global logger unless overridden at lower levels -->
+      <Logger className="org.apache.catalina.logger.FileLogger"
+              prefix="catalina_log." suffix=".txt"
+              timestamp="true"/>
+
+      <!-- Because this Realm is here, an instance will be shared globally -->
+
+      <Realm className="org.apache.catalina.realm.MemoryRealm" />
+
+      <!-- Replace the above Realm with one of the following to get a Realm
+           stored in a database and accessed via JDBC -->
+
+      <!-- Define the default virtual host -->
+      <Host name="localhost" debug="0" appBase="webapps" 
+       unpackWARs="true" autoDeploy="true">
+
+        <!-- Normally, users must authenticate themselves to each web app
+             individually.  Uncomment the following entry if you would like
+             a user to be authenticated the first time they encounter a
+             resource protected by a security constraint, and then have that
+             user identity maintained across *all* web applications contained
+             in this virtual host. -->
+        <!--
+        <Valve className="org.apache.catalina.authenticator.SingleSignOn"
+                   debug="0"/>
+        -->
+
+        <!-- Access log processes all requests for this virtual host.  By
+             default, log files are created in the "logs" directory relative to
+             $CATALINA_HOME.  If you wish, you can specify a different
+             directory with the "directory" attribute.  Specify either a relative
+             (to $CATALINA_HOME) or absolute path to the desired directory.
+        -->
+        <Valve className="org.apache.catalina.valves.AccessLogValve"
+                 directory="logs"  prefix="localhost_access_log." suffix=".txt"
+                 pattern="common"/>
+
+        <!-- Logger shared by all Contexts related to this virtual host.  By
+             default (when using FileLogger), log files are created in the "logs"
+             directory relative to $CATALINA_HOME.  If you wish, you can specify
+             a different directory with the "directory" attribute.  Specify either a
+             relative (to $CATALINA_HOME) or absolute path to the desired
+             directory.-->
+        <Logger className="org.apache.catalina.logger.FileLogger"
+                 directory="logs"  prefix="localhost_log." suffix=".txt"
+	        timestamp="true"/>
+
+        <!-- Define properties for each web application.  This is only needed
+             if you want to set non-default properties, or have web application
+             document roots in places other than the virtual host's appBase
+             directory.  -->
+
+        <!-- Tomcat Root Context -->
+        <!--
+          <Context path="" docBase="ROOT" debug="0"/>
+        -->
+
+      </Host>
+
+    </Engine>
+
+  </Service>
+
+</Server>
+
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 @@
+<!-- Alternate Example-less Configuration File -->
+<!-- Note that component elements are nested corresponding to their
+     parent-child relationships with each other -->
+
+<!-- A "Server" is a singleton element that represents the entire JVM,
+     which may contain one or more "Service" instances.  The Server
+     listens for a shutdown command on the indicated port.
+
+     Note:  A "Server" is not itself a "Container", so you may not
+     define subcomponents such as "Valves" or "Loggers" at this level.
+ -->
+
+<Server port="8005" shutdown="SHUTDOWN" debug="0">
+
+
+  <!-- Uncomment this entry to enable JMX MBeans support -->
+<!--
+  <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener"
+                debug="0" port="-1" login="admin" password="admin"/>
+-->
+
+
+  <!-- A "Service" is a collection of one or more "Connectors" that share
+       a single "Container" (and therefore the web applications visible
+       within that Container).  Normally, that Container is an "Engine",
+       but this is not required.
+
+       Note:  A "Service" is not itself a "Container", so you may not
+       define subcomponents such as "Valves" or "Loggers" at this level.
+   -->
+
+  <!-- Define the Tomcat Stand-Alone Service -->
+  <Service name="Tomcat-Standalone">
+
+    <!-- A "Connector" represents an endpoint by which requests are received
+         and responses are returned.  Each Connector passes requests on to the
+         associated "Container" (normally an Engine) for processing.
+
+         By default, a non-SSL HTTP/1.1 Connector is established on port 8080.
+         You can also enable an SSL HTTP/1.1 Connector on port 8443 by
+         following the instructions below and uncommenting the second Connector
+         entry.  SSL support requires the following steps (see the SSL Config
+         HOWTO in the Tomcat 4.0 documentation bundle for more detailed
+         instructions):
+         * Download and install JSSE 1.0.2 or later, and put the JAR files
+           into "$JAVA_HOME/jre/lib/ext".
+         * Execute:
+             %JAVA_HOME%\bin\keytool -genkey -alias tomcat -keyalg RSA (Windows)
+             $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA  (Unix)
+           with a password value of "changeit" for both the certificate and
+           the keystore itself.
+
+         By default, DNS lookups are enabled when a web application calls
+         request.getRemoteHost().  This can have an adverse impact on
+         performance, so you can disable it by setting the
+         "enableLookups" attribute to "false".  When DNS lookups are disabled,
+         request.getRemoteHost() will return the String version of the
+         IP address of the remote client.
+    -->
+
+    <!-- Define a non-SSL Coyote HTTP/1.1 Connector on port 8080 -->
+    <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
+               port="8080" minProcessors="5" maxProcessors="75"
+               enableLookups="true" redirectPort="8443"
+               acceptCount="100" debug="0" connectionTimeout="20000"
+               useURIValidationHack="false" disableUploadTimeout="true" />
+    <!-- Note : To disable connection timeouts, set connectionTimeout value 
+     to -1 -->
+
+    <!-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 -->
+    <!--
+    <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
+               port="8443" minProcessors="5" maxProcessors="75"
+               enableLookups="uri"
+	       acceptCount="100" debug="0" scheme="https" secure="true"
+               useURIValidationHack="false" disableUploadTimeout="true">
+      <Factory className="org.apache.coyote.tomcat4.CoyoteServerSocketFactory"
+               clientAuth="false" protocol="TLS"/>
+    </Connector>
+    -->
+
+    <!-- An Engine represents the entry point (within Catalina) that processes
+         every request.  The Engine implementation for Tomcat stand alone
+         analyzes the HTTP headers included with the request, and passes them
+         on to the appropriate Host (virtual host). -->
+
+    <!-- Define the top level container in our container hierarchy -->
+    <Engine name="Standalone" defaultHost="localhost" debug="0">
+
+      <!-- The request dumper valve dumps useful debugging information about
+           the request headers and cookies that were received, and the response
+           headers and cookies that were sent, for all requests received by
+           this instance of Tomcat.  If you care only about requests to a
+           particular virtual host, or a particular application, nest this
+           element inside the corresponding <Host> or <Context> entry instead.
+
+           For a similar mechanism that is portable to all Servlet 2.3
+           containers, check out the "RequestDumperFilter" Filter in the
+           example application (the source for this filter may be found in
+           "$CATALINA_HOME/webapps/examples/WEB-INF/classes/filters").
+
+           Request dumping is disabled by default.  Uncomment the following
+           element to enable it. -->
+      <!--
+      <Valve className="org.apache.catalina.valves.RequestDumperValve"/>
+      -->
+
+      <!-- Global logger unless overridden at lower levels -->
+      <Logger className="org.apache.catalina.logger.FileLogger"
+              prefix="catalina_log." suffix=".txt"
+              timestamp="true"/>
+
+      <!-- Because this Realm is here, an instance will be shared globally -->
+
+      <Realm className="org.apache.catalina.realm.MemoryRealm" />
+
+      <!-- Define the default virtual host -->
+      <Host name="localhost" debug="0" appBase="webapps" 
+       unpackWARs="true" autoDeploy="true">
+
+        <!-- Normally, users must authenticate themselves to each web app
+             individually.  Uncomment the following entry if you would like
+             a user to be authenticated the first time they encounter a
+             resource protected by a security constraint, and then have that
+             user identity maintained across *all* web applications contained
+             in this virtual host. -->
+        <!--
+        <Valve className="org.apache.catalina.authenticator.SingleSignOn"
+                   debug="0"/>
+        -->
+
+        <!-- Access log processes all requests for this virtual host.  By
+             default, log files are created in the "logs" directory relative to
+             $CATALINA_HOME.  If you wish, you can specify a different
+             directory with the "directory" attribute.  Specify either a relative
+             (to $CATALINA_HOME) or absolute path to the desired directory.
+        -->
+        <Valve className="org.apache.catalina.valves.AccessLogValve"
+                 directory="logs"  prefix="localhost_access_log." suffix=".txt"
+                 pattern="common"/>
+
+        <!-- Logger shared by all Contexts related to this virtual host.  By
+             default (when using FileLogger), log files are created in the "logs"
+             directory relative to $CATALINA_HOME.  If you wish, you can specify
+             a different directory with the "directory" attribute.  Specify either a
+             relative (to $CATALINA_HOME) or absolute path to the desired
+             directory.-->
+        <Logger className="org.apache.catalina.logger.FileLogger"
+                 directory="logs"  prefix="localhost_log." suffix=".txt"
+	        timestamp="true"/>
+
+        <!-- Define properties for each web application.  This is only needed
+             if you want to set non-default properties, or have web application
+             document roots in places other than the virtual host's appBase
+             directory.  -->
+
+        <!-- Tomcat Root Context -->
+        <!--
+          <Context path="" docBase="ROOT" debug="0"/>
+        -->
+
+      </Host>
+
+    </Engine>
+
+  </Service>
+
+</Server>
+
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 $*