Merge branch 'master' of git@dbis-git.uibk.ac.at:krismer/isochrone-vm.git

bootstrap/prepareEnvironment.sh

@@ -135,7 +135,7 @@ TEMPLATE_PSIPROBE_VERSION="2.3.3"
 TEMPLATE_PSIPROBE_FILE="probe-$TEMPLATE_PSIPROBE_VERSION.zip"
 TEMPLATE_PSIPROBE_DOWNLOAD_URL="https://psi-probe.googlecode.com/files/$TEMPLATE_PSIPROBE_FILE"
 TEMPLATE_DIR_ISOCHRONE="/vagrant"
-TOMCAT_VERSION="8.0.20"
+TOMCAT_VERSION="8.0.23"
 TOMCAT_FILE="apache-tomcat-$TOMCAT_VERSION.tar.gz"
 TOMCAT_DOWNLOAD_URL="http://tweedo.com/mirror/apache/tomcat/tomcat-8/v$TOMCAT_VERSION/bin/$TOMCAT_FILE"
 TOMCAT_MEMORY_OPTS="-Xmx2048m -Xms512m"

conf/tomcat_startscript.sh

 #!/bin/bash
 
-# Tomcat7: Start/Stop Tomcat 7
+# Tomcat: Start/Stop Tomcat
 #
 # chkconfig: - 90 10
 # description: Tomcat is a Java application Server.
@@ -18,7 +18,7 @@ LOCKFILE=/var/lock/subsys/tomcat
 
 RETVAL=0
 start(){
-   echo "Starting Tomcat7: "
+   echo "Starting Tomcat: "
    su - $TOMCAT_USER -c "$CATALINA_HOME/bin/startup.sh"
    RETVAL=$?
    echo
@@ -27,7 +27,7 @@ start(){
 }
 
 stop(){
-   echo "Shutting down Tomcat7: "
+   echo "Shutting down Tomcat: "
    $CATALINA_HOME/bin/shutdown.sh
    RETVAL=$?
    echo