[Dive4elements-commits] [PATCH 2 of 2] Fixed config files

[Wald Commits]

# HG changeset patch
# User Raimund Renkert <rrenkert at intevation.de>
# Date 1359387185 -3600
# Node ID 8118f9b0ee7b811b9c48435b4374d1f876d3edbd
# Parent  3f0c8ef42b7a2ecf03cd6b4e7f188fffeb82529d
Fixed config files.

* backend-db: fixed connection string.
* make-release: Fixed mapserver url and added sed command to replace mapserver
  url in rivermap.xml

diff -r 3f0c8ef42b7a -r 8118f9b0ee7b contrib/make_flys_release/confs/backend-db.xml
--- a/contrib/make_flys_release/confs/backend-db.xml	Mon Jan 28 16:30:46 2013 +0100
+++ b/contrib/make_flys_release/confs/backend-db.xml	Mon Jan 28 16:33:05 2013 +0100
@@ -5,7 +5,7 @@
     	<password>flys293</password>
     	<dialect>org.hibernate.dialect.PostgreSQLDialect</dialect>
     	<driver>org.postgresql.Driver</driver>
-    <url>jdbc:postgresql://czech-republic.atlas.intevation.de:5432/flys29</url>
+    <url>jdbc:postgresql://czech-republic.atlas.intevation.de:5432/flys293</url>
 
     <!--
 	<user>flys27</user>
diff -r 3f0c8ef42b7a -r 8118f9b0ee7b contrib/make_flys_release/confs/rivermap.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/make_flys_release/confs/rivermap.xml	Mon Jan 28 16:33:05 2013 +0100
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--// configuration fragment for static river WMS //-->
+<rivermap>
+    <mapserver>
+        <server path="http://example.com/cgi-bin/"/>
+        <mapfile path="${artifacts.config.dir}/../rivers.map"/>
+        <templates path="${artifacts.config.dir}/mapserver/"/>
+        <map-template path="river-mapfile.vm"/>
+    </mapserver>
+
+    <velocity>
+        <logfile path="${artifacts.config.dir}/../rivermap_velocity.log"/>
+    </velocity>
+    
+    <river name="Saar">
+        <srid value="31467"/>
+        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Saar"/>
+        <background-wms url="http://osm.intevation.de/mapcache/?" layers="flys-wms"/>
+    </river>
+    <river name="Mosel">
+        <srid value="31467"/>
+        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Mosel"/>
+        <background-wms url="http://osm.intevation.de/mapcache/?" layers="flys-wms"/>
+    </river>
+    <river name="Elbe">
+        <srid value="31467"/>
+        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Elbe"/>
+        <background-wms url="http://osm.intevation.de/mapcache/?" layers="flys-wms"/>
+    </river>
+</rivermap>
diff -r 3f0c8ef42b7a -r 8118f9b0ee7b contrib/make_flys_release/make_release.sh
--- a/contrib/make_flys_release/make_release.sh	Mon Jan 28 16:30:46 2013 +0100
+++ b/contrib/make_flys_release/make_release.sh	Mon Jan 28 16:33:05 2013 +0100
@@ -17,7 +17,7 @@
 ARTIFACT_PORT=${ARTIFACT_PORT:-9002}
 TOMCAT_PORT=${TOMCAT_PORT:-8005}
 
-MAPSERVER_URL=${MAPSERVER_URL:-czech-republic.intevation.de}
+MAPSERVER_URL=${MAPSERVER_URL:-czech-republic.atlas.intevation.de}
 
 echo "INFO: create server directories"
 mkdir -p $DIRECTORY/server/bin/lib/own
@@ -102,11 +102,15 @@
     confs/rest-server.xml \
     > $DIRECTORY/server/conf/rest-server.xml
 
-sed -e "s at http://czech-republic.intevation.de/@http://${MAPSERVER_URL}/@g" \
-    -e "s at flys-default@flys-${RELEASE}@g" \
+sed -e "s at http://example.com/@http://${MAPSERVER_URL}/@g" \
     confs/floodmap.xml \
     > $DIRECTORY/server/conf/floodmap.xml
 
+sed -e "s at http://example.com/@http://${MAPSERVER_URL}/@g" \
+    confs/rivermap.xml \
+    > $DIRECTORY/server/conf/rivermap.xml
+
+
 sed "s@/tmp/flys-server-default.log@/tmp/flys-server-${RELEASE}.log" \
     confs/log4j.properties \
     > $DIRECTORY/server/conf/log4j.properties