3 files changed, 35 insertions, 15 deletions
diff --git a/id.server/data/deploy/tomcat/unix/moa-id-env.sh b/id.server/data/deploy/tomcat/unix/moa-id-env.sh
deleted file mode 100644
index a187806de..000000000
--- a/id.server/data/deploy/tomcat/unix/moa-id-env.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-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/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= <insert java home directory (no trailing path separator)>
+export CATALINA_HOME= <insert Tomcat 4.1.x home directory (no trailing path separator)>
+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= <insert java home directory (no trailing path separator)>
+export CATALINA_HOME= <insert Tomcat 4.1.x home directory (no trailing path separator)>
+
+cd $CATALINA_HOME
+./bin/shutdown.sh
+\ No newline at end of file