using isochrone-datamodel now

 - by now only for creation of tables used in isochrone-datamodel tests

bootstrap/config.sh

@@ -16,7 +16,9 @@ INSTALL_ISOCHRONE_LOCAL=false
 INSTALL_ISOCHRONE_RELEASE=true
 # install latest isochrone snapshot from nexus repository
 INSTALL_ISOCHRONE_SNAPSHOT=true
-# install latest isochrone tools from nexus repository
+# install latest isochrone-datamodel from nexus repository
+INSTALL_ISOCHRONE_DATAMODEL=true
+# install latest isochrone-tools from nexus repository
 INSTALL_ISOCHRONE_TOOLS=true
 INSTALL_NEO4J=false
 INSTALL_NEO4J_SPATIAL=false
@@ -57,12 +59,14 @@ if [ ! -d ${POSTGRES_SHARE} ]; then
 fi
 
 AVAILABLE_GEOSERVER=$([ -d "${DEPLOY_DIR}/geoserver" ] && echo true || echo false)
+AVAILABLE_ISOCHRONE_DATAMODEL=$([ -f "${DEPLOY_DIR}/isochrone-datamodel.jar" ] && echo true || echo false)
+AVAILABLE_ISOCHRONE_TOOLS=$([ -f "${DEPLOY_DIR}/isochrone-tools.jar" ] && echo true || echo false)
 AVAILABLE_NEO4J=$([ -d "${DEPLOY_DIR}/neo4j" ] && echo true || echo false)
 AVAILABLE_NEO4J_SPATIAL=$([ -d "${DEPLOY_DIR}/neo4j-spatial" ] && echo true || echo false)
 AVAILABLE_POSTGRES=$(type ${EXEC_POSTGRES} >/dev/null 2>&1 && echo true || echo false)
 AVAILABLE_POSTGIS=$([ -f "${POSTGRES_SHARE}/extension/postgis.control" ] && echo true || echo false)
 AVAILABLE_PGROUTING=$([ -f "${POSTGRES_SHARE}/extension/pgrouting.control" ] && echo true || echo false)
-AVAILABLE_SPATIALITE_ADMIN=$([ -f "$DEPLOY_DIR/phpliteadmin/phpliteadmin.config.php" ] && echo true || echo false)
+AVAILABLE_SPATIALITE_ADMIN=$([ -f "${DEPLOY_DIR}/phpliteadmin/phpliteadmin.config.php" ] && echo true || echo false)
 
 DOWNLOAD_DIR="${CACHE_DIR_LOCAL}/wget"
 if [ ! -f "${SETUP_DIR}" ]; then

bootstrap/createDatabase.sh

@@ -62,6 +62,11 @@ if $AVAILABLE_POSTGRES; then
 		echo "Registering pgRouting extension for database \"$PG_DB_NAME\""
 		PGPASSWORD="$PG_DB_PASSWORD" ${EXEC_POSTGRES} -U "$PG_DB_USER" -h localhost -d "$PG_DB_NAME" -c "CREATE EXTENSION pgRouting;" >> $WORKING_DIR/setup_database.log 2>&1
 	fi
+
+	if $AVAILABLE_ISOCHRONE_DATAMODEL; then
+		echo "Initializing database schema for isochrone-datamodel (used for testing, ...)"
+		DB_USERNAME="$PG_DB_USER" DB_PASSWORD="$PG_DB_PASSWORD" java -jar "${DEPLOY_DIR}/isochrone-datamodel.jar" -d
+	fi
 fi
 
 END=$(date +%s)

bootstrap/prepareEnvironment.sh

@@ -74,15 +74,17 @@ NEO4J_SERVICE_NAME="neo4j-service"
 NEO4J_SPATIAL_GIT_URL="https://github.com/neo4j/spatial.git"
 NEO4J_SPATIAL_VERSION="0.13-neo4j-2.1"
 NEO4J_SPATIAL_PLUGIN_DOWNLOAD_URL="http://dist.neo4j.org.s3.amazonaws.com/spatial/neo4j-spatial-$NEO4J_SPATIAL_VERSION-server-plugin.zip"
-NEXUS_ARTIFACT_NAME="isochrone-web"
+NEXUS_ARTIFACT_NAME_WEB="isochrone-web"
 NEXUS_ARTIFACT_NAME_TOOLS="isochrone-tools"
+NEXUS_ARTIFACT_NAME_DATAMODEL="isochrone-datamodel"
 NEXUS_BASE_URL="http://dbis-nexus.uibk.ac.at"
 NEXUS_PUBLIC_REPO="isochrone"
 #NEXUS_PUBLIC_REPO="public"
-NEXUS_RELEASE_ISOCHRONE="$NEXUS_BASE_URL/service/local/artifact/maven/content?r=$NEXUS_PUBLIC_REPO&g=at.uibk.dbis&a=$NEXUS_ARTIFACT_NAME&v=RELEASE&p=war"
-#NEXUS_RELEASE_ISOCHRONE="$NEXUS_BASE_URL/service/local/artifact/maven/content?r=$NEXUS_PUBLIC_REPO&g=at.uibk.dbis&a=$NEXUS_ARTIFACT_NAME&v=0.2.2&p=war"
-NEXUS_SNAPSHOT_ISOCHRONE="$NEXUS_BASE_URL/service/local/artifact/maven/content?r=$NEXUS_PUBLIC_REPO&g=at.uibk.dbis&a=$NEXUS_ARTIFACT_NAME&v=LATEST&p=war"
+NEXUS_RELEASE_ISOCHRONE_WEB="$NEXUS_BASE_URL/service/local/artifact/maven/content?r=$NEXUS_PUBLIC_REPO&g=at.uibk.dbis&a=$NEXUS_ARTIFACT_NAME_WEB&v=RELEASE&p=war"
+#NEXUS_RELEASE_ISOCHRONE_WEB="$NEXUS_BASE_URL/service/local/artifact/maven/content?r=$NEXUS_PUBLIC_REPO&g=at.uibk.dbis&a=$NEXUS_ARTIFACT_NAME_WEB&v=0.5.1&p=war"
+NEXUS_SNAPSHOT_ISOCHRONE_WEB="$NEXUS_BASE_URL/service/local/artifact/maven/content?r=$NEXUS_PUBLIC_REPO&g=at.uibk.dbis&a=$NEXUS_ARTIFACT_NAME_WEB&v=LATEST&p=war"
 NEXUS_SNAPSHOT_ISOCHRONE_TOOLS="$NEXUS_BASE_URL/service/local/artifact/maven/content?r=$NEXUS_PUBLIC_REPO&g=at.uibk.dbis&a=$NEXUS_ARTIFACT_NAME_TOOLS&v=LATEST&c=all&p=jar"
+NEXUS_SNAPSHOT_ISOCHRONE_DATAMODEL="$NEXUS_BASE_URL/service/local/artifact/maven/content?r=$NEXUS_PUBLIC_REPO&g=at.uibk.dbis&a=$NEXUS_ARTIFACT_NAME_DATAMODEL&v=LATEST&c=all&p=jar"
 OSM2PGROUTING_GIT_URL="https://github.com/pgRouting/osm2pgrouting.git"
 OSM2PGROUTING_VERSION="v2.0.0"
 OSM2PGROUTING_MAPPING_CONF="$DEPLOY_DIR/osm2pgrouting/mapconfig.xml"
@@ -196,7 +198,7 @@ fi
 if $INSTALL_NEO4J_SPATIAL; then
 	INSTALL_MAVEN=$IMPORT_DATA_OSM || $IMPORT_DATA_OSM_CACHED
 fi
-if $INSTALL_ISOCHRONE_TOOLS || $INSTALL_TOMCAT || $INSTALL_GEOSERVER || $INSTALL_NEO4J || $INSTALL_NEO4J_SPATIAL || $IMPORT_DATA_OSM; then
+if $INSTALL_ISOCHRONE_TOOLS || $INSTALL_ISOCHRONE_DATAMODEL || $INSTALL_TOMCAT || $INSTALL_GEOSERVER || $INSTALL_NEO4J || $INSTALL_NEO4J_SPATIAL || $IMPORT_DATA_OSM; then
 	INSTALL_JAVA=true
 fi
 if $INSTALL_PGROUTING; then
@@ -546,9 +548,9 @@ fi
 
 if $INSTALL_ISOCHRONE_RELEASE; then
 	echo "Installing template project \"isochrone (release)\""
-	echo "  - artifact: $NEXUS_RELEASE_ISOCHRONE"
+	echo "  - artifact: $NEXUS_RELEASE_ISOCHRONE_WEB"
 
-	fn_download $DOWNLOAD_DIR/isochrone.war $NEXUS_RELEASE_ISOCHRONE
+	fn_download $DOWNLOAD_DIR/isochrone.war $NEXUS_RELEASE_ISOCHRONE_WEB
 	cp $DOWNLOAD_DIR/isochrone.war $TOMCAT_WEBAPP_DIR/isochrone.war
 	unzip -o -d $TOMCAT_WEBAPP_DIR/isochrone $TOMCAT_WEBAPP_DIR/isochrone.war >> $WORKING_DIR/install_isochrone_release.log 2>&1
 	rm -f $TOMCAT_WEBAPP_DIR/isochrone.war >> $WORKING_DIR/install_isochrone_release.log 2>&1
@@ -556,14 +558,21 @@ fi
 
 if $INSTALL_ISOCHRONE_SNAPSHOT; then
 	echo "Installing template project \"isochrone (testing)\""
-	echo "  - artifact: $NEXUS_SNAPSHOT_ISOCHRONE"
+	echo "  - artifact: $NEXUS_SNAPSHOT_ISOCHRONE_WEB"
 
-	fn_download $DOWNLOAD_DIR/testing.war $NEXUS_SNAPSHOT_ISOCHRONE
+	fn_download $DOWNLOAD_DIR/testing.war $NEXUS_SNAPSHOT_ISOCHRONE_WEB
 	cp $DOWNLOAD_DIR/testing.war $TOMCAT_WEBAPP_DIR/testing.war
 	unzip -o -d $TOMCAT_WEBAPP_DIR/testing $TOMCAT_WEBAPP_DIR/testing.war >> $WORKING_DIR/install_isochrone_snapshot.log 2>&1
 	rm -f $TOMCAT_WEBAPP_DIR/testing.war >> $WORKING_DIR/install_isochrone_snapshot.log 2>&1
 fi
 
+if $INSTALL_ISOCHRONE_DATAMODEL; then
+	echo "Installing \"isochrone-datamodel\""
+	echo "  - artifact: $NEXUS_SNAPSHOT_ISOCHRONE_DATAMODEL"
+
+	fn_download $DOWNLOAD_DIR/isochrone-datamodel.jar $NEXUS_SNAPSHOT_ISOCHRONE_DATAMODEL
+fi
+
 if $INSTALL_ISOCHRONE_TOOLS; then
 	echo "Installing \"isochrone-tools\""
 	echo "  - artifact: $NEXUS_SNAPSHOT_ISOCHRONE_TOOLS"