[Dive4elements-commits] [PATCH 7 of 7] Merged

[Wald Commits]

# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller at intevation.de>
# Date 1352897302 -3600
# Node ID 1983f5706578deceb6619e36bcb47b402fce14fd
# Parent  3f08855e68bc5903837fa8ae8fec1d8ec39c109a
# Parent  d7e1aee9d51edf69eb62e7cb5100d4033bb35733
Merged.

diff -r 3f08855e68bc -r 1983f5706578 contrib/make_flys_release/make_release.sh
--- a/contrib/make_flys_release/make_release.sh	Wed Nov 14 13:47:55 2012 +0100
+++ b/contrib/make_flys_release/make_release.sh	Wed Nov 14 13:48:22 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 at http://localhost:8181 at http://localhost:$ARTEFACT_PORT at g" \
+sed -i -e "s at http://localhost:8181 at http://localhost:$ARTIFACT_PORT at g" \
        -e "s at http://localhost:8888 at http://localhost:$TOMCAT_PORT at 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