version updates

CHANGELOG.md

 Upcoming version:
 -----------------
+  - version updates (Nikolaus Krismer)
   - deactivating invalid datasets (Nikolaus Krismer)
   - added some more logging output to dataset generation (Nikolaus Krismer)
   - improved error handling in bash script (Nikolaus Krismer)

bootstrap/prepareEnvironment.sh

@@ -71,9 +71,6 @@ fn_arg2boolean IS_JENKINS_DEPLOY "${3}" "${IS_JENKINS_DEPLOY}"
 # Configuration (tool versions, ...) #
 ######################################
 
-#Armadillo from epel is too new for postgis (version 4 instead of 3), so use hard-coded file here
-ARMADILLO_FILE="armadillo-3.800.2-1.el6.x86_64.rpm"
-ARMADILLO_URL="${CACHE_DIR_REMOTE_ISO}${ARMADILLO_FILE}"
 GDAL_VERSION="2.0.0"
 GDAL_FILE="gdal-$GDAL_VERSION.tar.gz"
 GDAL_DOWNLOAD_URL="http://download.osgeo.org/gdal/$GDAL_VERSION/$GDAL_FILE"
@@ -84,15 +81,15 @@ GEOSERVER_SHELL_VERSION="0.2.1"
 GEOSERVER_SHELL_FILE="geoserver-shell-$GEOSERVER_SHELL_VERSION-app.zip"
 #GEOSERVER_SHELL_URL="${CACHE_DIR_REMOTE_ISO}${GEOSERVER_SHELL_FILE}"
 GEOSERVER_SHELL_URL="https://github.com/jericks/geoserver-shell/releases/download/0.2/$GEOSERVER_SHELL_FILE"
-JAVA_VERSION="8u60"
+JAVA_VERSION="8u72"
 JAVA_FILE_32="jdk-$JAVA_VERSION-linux-i586.rpm"
 JAVA_FILE_64="jdk-$JAVA_VERSION-linux-x64.rpm"
 JAVA_CRYPTO_FILE="jce_policy-8.zip"
-MAVEN_VERSION="3.3.3"
+MAVEN_VERSION="3.3.9"
 MAVEN_FILE="apache-maven-$MAVEN_VERSION-bin.zip"
 MAVEN_DOWNLOAD_URL="http://www.eu.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/$MAVEN_FILE"
 NEO4J_DB_USER="neo4j"
-NEO4J_VERSION="2.3.1"
+NEO4J_VERSION="2.3.2"
 NEO4J_FILE="neo4j-community-$NEO4J_VERSION-unix.tar.gz"
 NEO4J_DOWNLOAD_URL="http://neo4j.com/artifact.php?name=$NEO4J_FILE"
 NEO4J_SERVICE_NAME="neo4j"
@@ -138,18 +135,17 @@ SELINUX_CONFIG="/etc/selinux/config"
 SPATIALITE_VERSION="4.3.0"
 SPATIALITE_FILE="libspatialite-$SPATIALITE_VERSION.tar.gz"
 SPATIALITE_URL="http://www.gaia-gis.it/gaia-sins/libspatialite-sources/$SPATIALITE_FILE"
-TEMPLATE_PSIPROBE_VERSION="2.3.3"
+TEMPLATE_PSIPROBE_VERSION="2.4.0"
 TEMPLATE_PSIPROBE_FILE="probe-$TEMPLATE_PSIPROBE_VERSION.zip"
-TEMPLATE_PSIPROBE_DOWNLOAD_URL="https://psi-probe.googlecode.com/files/$TEMPLATE_PSIPROBE_FILE"
+TEMPLATE_PSIPROBE_DOWNLOAD_URL="https://github.com/psi-probe/psi-probe/releases/download/$TEMPLATE_PSIPROBE_VERSION/$TEMPLATE_PSIPROBE_FILE"
 TEMPLATE_DIR_ISOCHRONE="/vagrant"
-TOMCAT_VERSION="8.0.26"
+TOMCAT_VERSION="8.0.30"
 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_DOWNLOAD_URL="http://www.eu.apache.org/dist/tomcat/tomcat-8/v$TOMCAT_VERSION/bin/$TOMCAT_FILE"
 TOMCAT_MEMORY_OPTS="-Xmx2048m -Xms512m"
 TOMCAT_NAME="tomcat"
 TOMCAT_USER="tomcat"
 TOMCAT_WEBAPP_DIR="$DEPLOY_DIR/$TOMCAT_NAME/webapps"
-TOPOLOGY_TOLERANCE=0.0005
 
 ############################
 # OS check & configuration #
@@ -181,7 +177,6 @@ if [ "$DISTRI" == "CentOS" ]; then
 		DISTRI_SUPPORTED=true
 	elif printf "$DISTRI_NAME" | egrep -q " 7." ; then
 		DISTRI_TYPE="CentOS 7"
-		ARMADILLO_FILE="none"
 		REPO_EPEL="https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm"
 		REPO_POSTGRESQL_64="http://yum.postgresql.org/$POSTGRESQL_VERSION/redhat/rhel-7-x86_64/pgdg-centos$POSTGRESQL_SHORT_VERSION-$POSTGRESQL_VERSION-2.noarch.rpm"
 		REPO_RPMFORGE_64="http://pkgs.repoforge.org/rpmforge-release/rpmforge-release-0.5.3-1.el7.rf.x86_64.rpm"
@@ -420,11 +415,6 @@ if $INSTALL_POSTGRES; then
 fi
 
 if $INSTALL_POSTGIS; then
-	if [ "$ARMADILLO_FILE" != "none" ]; then
-		fn_download_newer $DOWNLOAD_DIR/$ARMADILLO_FILE "$ARMADILLO_URL"
-		yum -y localinstall $DOWNLOAD_DIR/$ARMADILLO_FILE >> $WORKING_DIR/install_armadillo.log 2>&1
-	fi
-
 	if [ "$POSTGIS_VERSION" == "auto" ]; then
 		echo "Installing postgis2 (from repository)"
 		yum -y install postgis2_$POSTGRESQL_SHORT_VERSION >> $WORKING_DIR/install_postgis.log 2>&1
@@ -790,12 +780,14 @@ if $INSTALL_POSTGIS && $INSTALL_GEOSERVER; then
 fi
 
 if $INSTALL_SPATIALITE_ADMIN; then
+	# TODO: Check this (does not seem to work)
+	# TODO: What to do if there are multiple target_srid defined 
 	echo "Configuring phpLiteAdmin"
 	cp $DEPLOY_DIR/phpliteadmin/phpliteadmin.config.sample.php $DEPLOY_DIR/phpliteadmin/phpliteadmin.config.php
 	sed -i "s/password = 'admin'/password = '${TOMCAT_PASSWORD}'/" $DEPLOY_DIR/phpliteadmin/phpliteadmin.config.php
 	sed -i "s/directory = '\.'/directory = false/" $DEPLOY_DIR/phpliteadmin/phpliteadmin.config.php
 	sed -i "s/subdirectories = false/subdirectories = true/" $DEPLOY_DIR/phpliteadmin/phpliteadmin.config.php
-	sed -i "s|'path'=> 'database1.sqlite'|'path'=> '${DATA_DIR}/isochrone.spatialite'|" $DEPLOY_DIR/phpliteadmin/phpliteadmin.config.php
+	sed -i "s|'path'=> 'database1.sqlite'|'path'=> '${DATA_DIR}/isochrone_${TARGET_SRID}.spatialite'|" $DEPLOY_DIR/phpliteadmin/phpliteadmin.config.php
 	sed -i "s/'name'=> 'Database1'/'name'=> 'Isochrone'/" $DEPLOY_DIR/phpliteadmin/phpliteadmin.config.php
 	sed -i "s/language = 'en'/language = 'de'/" $DEPLOY_DIR/phpliteadmin/phpliteadmin.config.php
 	sed -i "/'path'=> 'database2.sqlite'/d" $DEPLOY_DIR/phpliteadmin/phpliteadmin.config.php