MOA-ID 1.1.1D01

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

5 files changed, 58 insertions, 2 deletions

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
--- /dev/null
+++ b/id.server/data/deploy/tomcat/tomcat-util-4.1.27-patched/tomcat-util.jar
diff --git a/id.server/data/deploy/tomcat/unix/moa-id-env.sh b/id.server/data/deploy/tomcat/unix/moa-id-env.sh
new file mode 100644
index 000000000..a187806de
--- /dev/null
+++ b/id.server/data/deploy/tomcat/unix/moa-id-env.sh
@@ -0,0 +1,15 @@
+rem insert Tomcat 4.1.x home directory (no trailing path separator)

+set CATALINA_HOME=<Tomcat 4.1.x home directory>

+

+CONFIG_OPT_SPSS=-Dmoa.spss.server.configuration=$CATALINA_HOME/conf/moa-spss/SampleMOASPSSConfiguration.xml

+CONFIG_OPT_ID=-Dmoa.id.configuration=$CATALINA_HOME/conf/moa-id/SampleMOAIDConfiguration.xml

+

+

+LOGGING_OPT=-Dlog4j.configuration=file:$CATALINA_HOME/conf/moa-id/log4j.properties

+# 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_SPSS $CONFIG_OPT_ID $LOGGING_OPT $TRUST_STORE_OPT $TRUST_STORE_PASS_OPT $TRUST_STORE_TYPE_OPT"

+echo CATALINA_OPTS=$CATALINA_OPTS

+

diff --git a/id.server/data/deploy/tomcat/uriworkermap.properties b/id.server/data/deploy/tomcat/uriworkermap.properties
index daf0dca1a..32b4c1f50 100644
--- a/id.server/data/deploy/tomcat/uriworkermap.properties
+++ b/id.server/data/deploy/tomcat/uriworkermap.properties
@@ -3,5 +3,7 @@
 #
 # omit the mappings you don't need
 
-/moa-id-auth/*=moaworker
-/moa-id-proxy/*=moaworker
\ No newline at end of file
+#/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=<jdk home directory>

+

+rem Tomcat 4.1.x home directory (no trailing path separator)

+set CATALINA_HOME=<Tomcat 4.1.x home directory>

+

+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=<jdk home directory>

+

+rem Tomcat 4.1.x home directory (no trailing path separator)

+set CATALINA_HOME=<Tomcat 4.1.x home directory>

+

+rem ----------------------------------------------------------------------------------------------

+

+cd %CATALINA_HOME%

+bin\catalina.bat stop
\ No newline at end of file