changeset 4504:d7e1aee9d51e

Merged.
author Raimund Renkert <rrenkert@intevation.de>
date Wed, 14 Nov 2012 12:37:57 +0100
parents f91260ccef03 (diff) 5b0a545fceef (current diff)
children 1983f5706578
files
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/make_flys_release/make_release.sh	Wed Nov 14 11:52:43 2012 +0100
+++ b/contrib/make_flys_release/make_release.sh	Wed Nov 14 12:37:57 2012 +0100
@@ -14,7 +14,7 @@
 RELEASE_DATE=`date +'%Y-%m-%d'`
 DIRECTORY=$PREFIX$RELEASE-$RELEASE_DATE
 
-ARTEFACT_PORT=${ARTEFACT_PORT:-9002}
+ARTIFACT_PORT=${ARTIFACT_PORT:-9002}
 TOMCAT_PORT=${TOMCAT_PORT:-8005}
 
 MAPSERVER_URL=${MAPSERVER_URL:-czech-republic.intevation.de}
@@ -44,7 +44,7 @@
 # adapt client configuration
 echo "INFO: prepare configuration of web client"
 
-sed -i -e "s@http://localhost:8181@http://localhost:$ARTEFACT_PORT@g" \
+sed -i -e "s@http://localhost:8181@http://localhost:$ARTIFACT_PORT@g" \
        -e "s@http://localhost:8888@http://localhost:$TOMCAT_PORT@g" \
     $FLYS_HG/flys-client/src/main/webapp/WEB-INF/web.xml
 
@@ -64,7 +64,7 @@
 echo "INFO: compile and build sources"
 mvn -f $ARTIFACTS_HG/pom.xml clean compile package install
 mvn -f $FLYS_HG/flys-backend/pom.xml clean compile package install
-mvn -f $FLYS_HG/flys-artifacts/pom.xml clean compile package dependency:copy-dependencies
+mvn -f $FLYS_HG/flys-artifacts/pom.xml clean compile package dependency:copy-dependencies install
 mvn -f $HTTPCLIENT_HG/pom.xml clean compile package install
 mvn -f $FLYS_HG/flys-client/pom.xml clean compile package
 
@@ -98,7 +98,7 @@
 #cp confs/* $DIRECTORY/server/conf/
 mkdir -o $DIRECTORY/server/conf
 
-sed "s/8999/$ARTEFACT_PORT/g" \
+sed "s/8999/$ARTIFACT_PORT/g" \
     confs/rest-server.xml \
     > $DIRECTORY/server/conf/rest-server.xml
 

http://dive4elements.wald.intevation.org