fixed some deployment issues (invalid username after changes in

bootstrap; added missing httputils dependency)

build.gradle

@@ -11,7 +11,7 @@ apply plugin: 'wrapper'
 import org.apache.tools.ant.filters.FixCrLfFilter
 import org.apache.tools.ant.filters.ReplaceTokens
 
-group = 'it.unibz.inf.isochrones'
+group = 'it.unibz.inf.isochrone'
 version = '1.1-SNAPSHOT'
 
 description = 'PhD project of Nikolaus Krismer'
@@ -23,7 +23,7 @@ def getDate() {
 }
 
 ext {
-	defaultVersion = '0.3-SNAPSHOT'
+	defaultVersion = '0.1-SNAPSHOT'
 	isRelease = false
 //	vagrantDirString = System.properties['user.home'] + '/vagrantboxes/' + project.name.toLowerCase()
 //	vagrantDirString = '/media/data/VMs/vagrantboxes/' + project.name.toLowerCase()
@@ -65,16 +65,23 @@ buildscript {
 }
 
 dependencies {
-	providedCompile group: 'javax.servlet', name: 'javax.servlet-api', version:'3.0.1'
+	providedCompile group: 'javax.servlet', name: 'javax.servlet-api', version:'3.1.0'
 	providedCompile group: 'javax.websocket', name: 'javax.websocket-api', version:'1.0'
 
-	compile group: 'org.postgresql', name: 'postgresql', version:'9.3-1100-jdbc41'
 	compile group: 'commons-dbutils', name: 'commons-dbutils', version:'1.2'
-	compile group: 'it.geosolutions', name: 'geoserver-manager', version:'1.5.2'
+	compile group: 'commons-httpclient', name: 'commons-httpclient', version:'3.1'
+	compile(group: 'it.geosolutions', name: 'geoserver-manager', version:'1.5.2') {
+		exclude(module: 'jcl-over-slf4j')
+	}
 	compile group: 'org.json', name: 'json', version:'20131018'
 	compile(group: 'org.postgis', name: 'postgis-jdbc', version:'1.3+') {
 		exclude(module: 'postgis-stubs')
 	}
+	compile group: 'org.postgresql', name: 'postgresql', version:'9.3-1100-jdbc41'
+	compile group: 'org.tinylog', name: 'tinylog', version: '0.8.1'
+
+	runtime 'org.slf4j:jcl-over-slf4j:1.7.5'
+	runtime 'ch.qos.logback:logback-classic:1.0.13'
 
 	testCompile 'org.testng:testng:6+'
 }
@@ -106,11 +113,12 @@ eclipse {
 
 	wtp {
 		component {
-			contextPath = '/isochrones'
+			contextPath = '/isochrone'
+			deployName = 'isochrone'
 		}
 
 		facet {
-			facet name: 'jst.web', version: '3.0.1'
+			facet name: 'jst.web', version: '3.0'
 			facet name: 'jst.java', version: '1.7'
 		}
 	}

etc/vagrant/bootstrap.sh

@@ -623,7 +623,12 @@ if $IMPORT_OSMDATA || $IMPORT_OSMDATA_CACHED; then
 			sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft.gs >> setup_geoserver_neo4j.log 2>&1
 		fi
 		if $INSTALL_POSTGIS; then
-			sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ds.gs > setup_geoserver_postgis.log 2>&1
+			// copy geoserver_setup_postgis_ds and replace username/password
+			cp $SHARED_CONF_DIR/geoserver_setup_postgis_ds.gs $WORKING_DIR/geoserver_setup_postgis_ds.gs
+			sed -i "s/@db_username@/$PG_DB_USER/" $WORKING_DIR/geoserver_setup_postgis_ds.gs
+			sed -i "s/@db_password@/$PG_DB_PASSWORD/" $WORKING_DIR/geoserver_setup_postgis_ds.gs
+
+			sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $WORKING_DIR/geoserver_setup_postgis_ds.gs > setup_geoserver_postgis.log 2>&1
 			sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft_bz.gs >> setup_geoserver_postgis.log 2>&1
 			sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft_ibk.gs >> setup_geoserver_postgis.log 2>&1
 			sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft.gs >> setup_geoserver_postgis.log 2>&1