diff --git a/etc/vagrant/bootstrap.sh b/etc/vagrant/bootstrap.sh
index 2d5dce0a370b8bb92f19043515f9e6cd4c36abb8..e9a69c8546b84d7fa1df7582c73d7520f70d5b78 100644
--- a/etc/vagrant/bootstrap.sh
+++ b/etc/vagrant/bootstrap.sh
@@ -29,8 +29,18 @@ INSTALL_PGROUTING=true
INSTALL_POSTGIS=true
INSTALL_POSTGRES=true
INSTALL_POSTGRES_ADMIN=true
+
+# IS_LOCAL_TEST_DEPLOY will prevent install of projects (can be set using command-line argument)
+# PsiProbe will always be installed if INSTALL_PROJECT_PSIPROBE is true (even when this is set to true)
+IS_LOCAL_TEST_DEPLOY=false
+# will install caniget2 sample project
INSTALL_PROJECT_CANIGET2=false
-INSTALL_PROJECT_ISOCHRONE=true
+# will install isochrone from vagrant start directory (eclipse project)
+INSTALL_PROJECT_ISOCHRONE_LOCAL=true
+# will install latest isochrone release from nexus repository
+INSTALL_PROJECT_ISOCHRONE_RELEASE=true
+# will install latest isochrone snapshot from nexus repository
+INSTALL_PROJECT_ISOCHRONE_SNAPSHOT=false
INSTALL_PROJECT_PSIPROBE=true
PG_DB_NAME="isochrone"
@@ -44,13 +54,15 @@ if [ ${PG_DB_PASSWORD:0:1} == "@" ]; then
PG_DB_PASSWORD=$2
fi
-IS_LOCAL_TEST_DEPLOY=false
if [ -n "$3" ]; then
if [ "$3" = "true" ]; then
IS_LOCAL_TEST_DEPLOY=true
fi
if $IS_LOCAL_TEST_DEPLOY; then
- INSTALL_PROJECT_ISOCHRONE=false
+ INSTALL_PROJECT_CANIGET2=false
+ INSTALL_PROJECT_ISOCHRONE_LOCAL=false
+ INSTALL_PROJECT_ISOCHRONE_RELEASE=false
+ INSTALL_PROJECT_ISOCHRONE_SNAPSHOT=false
fi
fi
@@ -83,8 +95,12 @@ NEO4J_VERSION=2.0.1
NEO4J_FILE=neo4j-community-$NEO4J_VERSION-unix.tar.gz
NEO4J_SERVICE_NAME=neo4j-service
NEO4J_SPATIAL_VERSION=0.12-neo4j-2.0.1
-NEXUS_PATH=https://server.krismer.de/nexus/content/repositories/releases
-NEXUS_REPO=http://www.krismer.de/files/krismer.repo
+NEXUS_BASE_URL=https://server.krismer.de/nexus
+NEXUS_PATH=$NEXUS_BASE_URL/content/repositories/releases
+#NEXUS_RELEASE_ISOCHRONE=$NEXUS_BASE_URL/service/local/artifact/maven/content?r=public&g=it.unibz.inf.isochrone&a=isochrone&v=0.2.2&p=war
+NEXUS_RELEASE_ISOCHRONE=$NEXUS_BASE_URL/service/local/artifact/maven/content?r=public&g=it.unibz.inf.isochrone&a=isochrone&v=RELEASE&p=war
+NEXUS_SNAPSHOT_ISOCHRONE=$NEXUS_BASE_URL/service/local/artifact/maven/content?r=public&g=it.unibz.inf.isochrone&a=isochrone&v=LATEST&p=war
+NEXUS_YUM_REPO=http://www.krismer.de/files/krismer.repo
#OSM_BBOX_BZ="top=46.5200 left=11.3000 bottom=46.4500 right=11.3873"
#OSM_BBOX_IBK="top=47.3592 left=11.3020 bottom=47.2108 right=11.4554"
OSM_BBOX_BZ="${SHARED_CONF_DIR}/poly_bz.poly"
@@ -139,7 +155,7 @@ INSTALL_JAVA=false
INSTALL_MAVEN=false
INSTALL_TOMCAT=false
-if $INSTALL_GEOSERVER || $INSTALL_PROJECT_CANIGET2 || $INSTALL_PROJECT_ISOCHRONE || $INSTALL_PROJECT_PSIPROBE; then
+if $INSTALL_GEOSERVER || $INSTALL_PROJECT_CANIGET2 || $INSTALL_PROJECT_ISOCHRONE_LOCAL || $INSTALL_PROJECT_ISOCHRONE_RELEASE || $INSTALL_PROJECT_ISOCHRONE_SNAPSHOT || $INSTALL_PROJECT_PSIPROBE; then
INSTALL_TOMCAT=true
fi
if $INSTALL_NEO4J_SPATIAL; then
@@ -289,7 +305,9 @@ if $IMPORT_OSMDATA; then echo " - osmosis $OSMOSIS_VERSION"; fi
if $IMPORT_OSMDATA_CACHED; then echo "Importing cached data from OSM (if possible)"; elif $IMPORT_OSMDATA; then echo "Importing data from OSM"; fi
if $IMPORT_SCHEDULES; then echo "Importing schedules"; fi
if $INSTALL_PROJECT_CANIGET2; then echo "Importing project \"CanIGet2\""; fi
-if $INSTALL_PROJECT_ISOCHRONE; then echo "Importing project \"isochrone (testing)\""; fi
+if $INSTALL_PROJECT_ISOCHRONE_LOCAL; then echo "Importing project \"isochrone (local testing)\""; fi
+if $INSTALL_PROJECT_ISOCHRONE_RELEASE; then echo "Importing project \"isochrone (release)\""; fi
+if $INSTALL_PROJECT_ISOCHRONE_SNAPSHOT; then echo "Importing project \"isochrone (testing)\""; fi
if $INSTALL_PROJECT_PSIPROBE; then echo "Importing project \"psi-probe\""; fi
echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
echo " Performing installations:"
@@ -311,7 +329,7 @@ echo "Installing utils (gcc, git, ...) with yum repository version"
yum -y install gcc gcc-c++ git iptables-services nano nmap sed tar unzip wget > insall_utils.log 2>&1
#echo "Installing krismer repository"
-#fn_download_newer $DOWNLOAD_DIR/krismer.repo $NEXUS_REPO
+#fn_download_newer $DOWNLOAD_DIR/krismer.repo $NEXUS_YUM_REPO
#cp $DOWNLOAD_DIR/krismer.repo /etc/yum.repos.d > install_krismer_repo.log 2>&1
if $INSTALL_POSTGRES; then
@@ -483,10 +501,26 @@ if $INSTALL_PROJECT_CANIGET2; then
rm -f $TOMCAT_WEBAPP_DIR/caniget2.war >> install_caniget2.log 2>&1
fi
-if $INSTALL_PROJECT_ISOCHRONE; then
+if $INSTALL_PROJECT_ISOCHRONE_LOCAL; then
+ echo "Installing template project \"isochrone (local testing)\""
+ $TEMPLATE_DIR_ISOCHRONE/gradlew -b $TEMPLATE_DIR_ISOCHRONE/build.gradle -c $TEMPLATE_DIR_ISOCHRONE/settings.gradle clean war > install_isochrone_local.log 2>&1
+ unzip -o -d $TOMCAT_WEBAPP_DIR/localTesting $TEMPLATE_DIR_ISOCHRONE/build/libs/isochrone-*.war >> install_isochrone_local.log 2>&1
+fi
+
+if $INSTALL_PROJECT_ISOCHRONE_RELEASE; then
+ echo "Installing template project \"isochrone (release)\""
+ # we do not save this file in download dir (we do not want caching for isochrone.war)
+ fn_download_newer $TOMCAT_WEBAPP_DIR/isochrone.war $NEXUS_RELEASE_ISOCHRONE
+ unzip -o -d $TOMCAT_WEBAPP_DIR/isochrone $TEMPLATE_DIR_ISOCHRONE/isochrone.war > install_isochrone_release.log 2>&1
+ rm -f $TOMCAT_WEBAPP_DIR/isochrone.war >> install_isochrone_release.log 2>&1
+fi
+
+if $INSTALL_PROJECT_ISOCHRONE_SNAPSHOT; then
echo "Installing template project \"isochrone (testing)\""
- $TEMPLATE_DIR_ISOCHRONE/gradlew -b $TEMPLATE_DIR_ISOCHRONE/build.gradle -c $TEMPLATE_DIR_ISOCHRONE/settings.gradle clean war > install_isochrone.log 2>&1
- unzip -o -d $TOMCAT_WEBAPP_DIR/testing $TEMPLATE_DIR_ISOCHRONE/build/libs/isochrone-*.war >> install_isochrone.log 2>&1
+ # we do not save this file in download dir (we do not want caching for testing.war)
+ fn_download_newer $TOMCAT_WEBAPP_DIR/testing.war $NEXUS_SNAPSHOT_ISOCHRONE
+ unzip -o -d $TOMCAT_WEBAPP_DIR/testing $TEMPLATE_DIR_ISOCHRONE/testing.war > install_isochrone_snapshot.log 2>&1
+ rm -f $TOMCAT_WEBAPP_DIR/testing.war >> install_isochrone_snapshot.log 2>&1
fi
if $INSTALL_PROJECT_PSIPROBE; then