--- a/flys-artifacts/doc/conf/rivermap.xml	Thu Apr 11 09:24:05 2013 +0200
+++ b/flys-artifacts/doc/conf/rivermap.xml	Thu Apr 11 10:14:18 2013 +0200
@@ -2,7 +2,7 @@
 <!--// configuration fragment for static river WMS //-->
 <rivermap>
     <mapserver>
-        <server path="http://example.com/cgi-bin/"/>
+        <server path="https://flys3-devel.bafg.de/cgi-bin/"/>
         <mapfile path="${artifacts.config.dir}/../rivers.map"/>
         <templates path="${artifacts.config.dir}/mapserver/"/>
         <map-template path="river-mapfile.vm"/>
@@ -14,117 +14,117 @@
     
     <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="OSM-WMS-Dienst"/>
+        <river-wms url="https://flys3-devel.bafg.de/cgi-bin/river-wms" layers="Saar"/>
+        <background-wms url="https://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </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="OSM-WMS-Dienst"/>
+        <river-wms url="https://flys3-devel.bafg.de/cgi-bin/river-wms" layers="Mosel"/>
+        <background-wms url="https://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </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="OSM-WMS-Dienst"/>
+        <river-wms url="https://flys3-devel.bafg.de/cgi-bin/river-wms" layers="Elbe"/>
+        <background-wms url="https://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
     <river name="Donau">
         <srid value="31467"/>
-        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Donau"/>
-        <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
+        <river-wms url="https://flys3-devel.bafg.de/cgi-bin/river-wms" layers="Donau"/>
+        <background-wms url="https://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
-    <river name="Donaurna">
-        <srid value="31467"/>
-        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Donaurna"/>
-        <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
-    </river>
-    <river name="DonauSK">
+    <river name="Donau (Regensburg Nordarm)">
         <srid value="31467"/>
-        <river-wms url="http://example.com/cgi-bin/river-wms" layers="DonauSK"/>
-        <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
+        <river-wms url="https://flys3-devel.bafg.de/cgi-bin/river-wms" layers="Donau (Regensburg Nordarm)"/>
+        <background-wms url="https://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
-    <river name="Fulda">
+    <river name="Donau (Schleusenkane)">
         <srid value="31467"/>
-        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Fulda"/>
-        <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
+        <river-wms url="https://flys3-devel.bafg.de/cgi-bin/river-wms" layers="Donau (Schleusenkane)"/>
+        <background-wms url="https://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
-    <river name="Fulda-Sommer">
+    <river name="Fulda (Winter)">
         <srid value="31467"/>
-        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Fulda-Sommer"/>
-        <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
+        <river-wms url="https://flys3-devel.bafg.de/cgi-bin/river-wms" layers="Fulda (Winter)"/>
+        <background-wms url="https://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
+    </river>
+    <river name="Fulda (Sommer)">
+        <srid value="31467"/>
+        <river-wms url="https://flys3-devel.bafg.de/cgi-bin/river-wms" layers="Fulda (Sommer)"/>
+        <background-wms url="https://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
     <river name="Lahn">
         <srid value="31467"/>
-        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Lahn"/>
-        <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
+        <river-wms url="https://flys3-devel.bafg.de/cgi-bin/river-wms" layers="Lahn"/>
+        <background-wms url="https://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
     <river name="Main">
         <srid value="31467"/>
-        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Main"/>
-        <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
+        <river-wms url="https://flys3-devel.bafg.de/cgi-bin/river-wms" layers="Main"/>
+        <background-wms url="https://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
-    <river name="Main-Wehrarm-Limbach">
+    <river name="Main (Wehrarm-Limbach)">
         <srid value="31467"/>
-        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Main-Wehrarm-Limbach"/>
-        <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
+        <river-wms url="https://flys3-devel.bafg.de/cgi-bin/river-wms" layers="Main (Wehrarm-Limbach)"/>
+        <background-wms url="https://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
-    <river name="Main-Wehrarm-Volkach">
+    <river name="Main (Wehrarm-Volkach)">
         <srid value="31467"/>
-        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Main-Wehrarm-Volkach"/>
-        <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
+        <river-wms url="https://flys3-devel.bafg.de/cgi-bin/river-wms" layers="Main (Wehrarm-Volkach)"/>
+        <background-wms url="https://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
     <river name="Neckar">
         <srid value="31467"/>
-        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Neckar"/>
-        <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
+        <river-wms url="https://flys3-devel.bafg.de/cgi-bin/river-wms" layers="Neckar"/>
+        <background-wms url="https://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
-    <river name="Neckar-über-Wehrarme">
+    <river name="Neckar (über-Wehrarme")>
         <srid value="31467"/>
-        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Neckar-über-Wehrarme"/>
-        <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
+        <river-wms url="https://flys3-devel.bafg.de/cgi-bin/river-wms" layers="Neckar (über-Wehrarme)"/>
+        <background-wms url="https://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
     <river name="Rhein">
         <srid value="31467"/>
-        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Rhein"/>
-        <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
+        <river-wms url="https://flys3-devel.bafg.de/cgi-bin/river-wms" layers="Rhein"/>
+        <background-wms url="https://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
     <river name="Saale">
         <srid value="31467"/>
-        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Saale"/>
-        <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
+        <river-wms url="https://flys3-devel.bafg.de/cgi-bin/river-wms" layers="Saale"/>
+        <background-wms url="https://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
     <river name="Saale-Thüringen">
         <srid value="31467"/>
-        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Saale-Thüringen"/>
-        <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
-    </river>
-    <river name="Saar-Wilt-Bogen">
-        <srid value="31467"/>
-        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Saar-Wilt-Bogen"/>
-        <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
+        <river-wms url="https://flys3-devel.bafg.de/cgi-bin/river-wms" layers="Saale-Thüringen"/>
+        <background-wms url="https://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
-    <river name="Werra">
+    <river name="Saar (Wiltinger Bogen)">
         <srid value="31467"/>
-        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Werra"/>
-        <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
+        <river-wms url="https://flys3-devel.bafg.de/cgi-bin/river-wms" layers="Saar (Wiltinger Bogen)"/>
+        <background-wms url="https://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
-    <river name="Werra-Sommer">
+    <river name="Werra (Winter)">
         <srid value="31467"/>
-        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Werra-Sommer"/>
-        <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
+        <river-wms url="https://flys3-devel.bafg.de/cgi-bin/river-wms" layers="Werra (Winter)"/>
+        <background-wms url="https://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
+    </river>
+    <river name="Werra (Sommer)">
+        <srid value="31467"/>
+        <river-wms url="https://flys3-devel.bafg.de/cgi-bin/river-wms" layers="Werra (Sommer)"/>
+        <background-wms url="https://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
     <river name="Weser">
         <srid value="31467"/>
-        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Weser"/>
-        <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
+        <river-wms url="https://flys3-devel.bafg.de/cgi-bin/river-wms" layers="Weser"/>
+        <background-wms url="https://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
     <river name="Oder">
         <srid value="31467"/>
-        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Oder"/>
-        <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
+        <river-wms url="https://flys3-devel.bafg.de/cgi-bin/river-wms" layers="Oder"/>
+        <background-wms url="https://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
     <river name="Havel">
         <srid value="31467"/>
-        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Havel"/>
-        <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
+        <river-wms url="https://flys3-devel.bafg.de/cgi-bin/river-wms" layers="Havel"/>
+        <background-wms url="https://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
 </rivermap>