--- a/tomcat/setenv.sh	Sun Sep 13 18:26:30 2015 -0400
+++ b/tomcat/setenv.sh	Mon Sep 14 13:06:10 2015 +0100
@@ -1,23 +1,14 @@
-#! /bin/sh
-echo "_______________________________________________"
-
-export CATALINA_OPTS="$CATALINA_OPTS -Xss256k"
-
-export CATALINA_OPTS="$CATALINA_OPTS -XX:+UseCompressedOops"
-
-export CATALINA_OPTS="$CATALINA_OPTS -Djava.security.egd=file:/dev/./urandom"
-
-echo "Using CATALINA_OPTS:"
-for arg in $CATALINA_OPTS
-do
-    echo ">> " $arg
-done
-echo ""
-
-echo "Using JAVA_OPTS:"
-for arg in $JAVA_OPTS
-do
-    echo ">> " $arg
-done
-echo "_______________________________________________"
-echo ""
\ No newline at end of file
+#! /bin/sh
+#
+. "$CATALINA_HOME/bin/createTomcatAdmin.sh"
+#
+echo "__________________________________________"
+
+export CATALINA_OPTS="$CATALINA_OPTS -XX:+UseCompressedOops"
+
+export CATALINA_OPTS="$CATALINA_OPTS -Djava.security.egd=file:/dev/./urandom"
+
+echo "Using CATALINA_OPTS $CATALINA_OPTS"
+echo "Using     JAVA_OPTS $JAVA_OPTS"
+echo "_________________________________________"
+echo ""