[PATCH] Remove not publicly available WMS services and enable custom configuration through release script

[Wald Commits]

# HG changeset patch
# User Tom Gottfried <tom at intevation.de>
# Date 1394123459 -3600
# Node ID 1431d1af84d7bfcffa21269b467349559cdb172a
# Parent  8ae8b919d75f40b4380e3fc1ccff7af9e7e62886
Remove not publicly available WMS services and enable custom configuration through release script.

diff -r 8ae8b919d75f -r 1431d1af84d7 artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml	Thu Mar 06 16:43:49 2014 +0100
+++ b/artifacts/doc/conf/meta-data.xml	Thu Mar 06 17:30:59 2014 +0100
@@ -2730,14 +2730,6 @@
       </dc:context>
     </dc:macro>
 
-    <dc:macro name="catchments">
-      <catchments>
-        <catchment_wms factory="externalwmsfactory" target_out="{$out}"
-                       ids="http://geoportal.bafg.de/wmsproxy/INSPIRE/DrainageBasin;HY.PHYSICALWATERS.CATCHMENTS;Einzugsgebiete (WMS)" />
-        <dc:call-macro name="flood-map-gaugelocations"/>
-      </catchments>
-    </dc:macro>
-
     <dc:macro name="flood-map-gaugelocations">
       <gaugelocations>
         <gauge_points factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelpunkte;Pegelpunkte (WSV)" target_out="{$out}" />
diff -r 8ae8b919d75f -r 1431d1af84d7 contrib/make_flys_release/make_release.sh
--- a/contrib/make_flys_release/make_release.sh	Thu Mar 06 16:43:49 2014 +0100
+++ b/contrib/make_flys_release/make_release.sh	Thu Mar 06 17:30:59 2014 +0100
@@ -215,6 +215,11 @@
 find $FLYS_SOURCE_DIR/river/ -name \*.properties -o -name \*.xsl |  \
     xargs sed -i "s at https://flys-intern.intevation.de@${WIKI_URL}@g";
 
+if [ -r "$WMSSERVICES_XML" ]; then
+    cp "$WMSSERVICES_XML" \
+        $FLYS_SOURCE_DIR/river/gwt-client/src/main/webapp/WEB-INF/wms-services.xml
+fi
+
 if [ -r "$CONFIG_YAML" ]; then
     cp "$CONFIG_YAML" $FLYS_SOURCE_DIR/river/gwt-client/src/main/webapp/WEB-INF/config.yaml
 fi
@@ -230,6 +235,10 @@
     cp "$FLOODMAP_XML" $FLYS_SOURCE_DIR/river/artifacts/doc/conf/floodmap.xml
 fi
 
+if [ -r "$METADATA_XML" ]; then
+    cp "$METADATA_XML" $FLYS_SOURCE_DIR/river/artifacts/doc/conf/meta-data.xml
+fi
+
 if [ ! -f $FLYS_SOURCE_DIR/OpenLayers-2.11.tar.gz ]; then
     echo "INFO: download OpenLayers-2.11 for client"
     cd $FLYS_SOURCE_DIR
diff -r 8ae8b919d75f -r 1431d1af84d7 gwt-client/src/main/webapp/WEB-INF/wms-services.xml
--- a/gwt-client/src/main/webapp/WEB-INF/wms-services.xml	Thu Mar 06 16:43:49 2014 +0100
+++ b/gwt-client/src/main/webapp/WEB-INF/wms-services.xml	Thu Mar 06 17:30:59 2014 +0100
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <wms-services>
   <wms name="OSM Hintergrundkarte" url="http://osm.intevation.de/mapcache/?"/>
-  <wms name="Luftbilder RLP" url="http://geo4.service24.rlp.de/wms/dop40_geo4.fcgi"/>
-  <wms name="TOP-Karten der WSV" url="http://wsvmapserv.ilmenau.baw.de/cgi-bin/wmstkappl?"/>
-  <wms name="Bundeswasserstraßenkarte 1:1 Mio" url="http://wsvmapserv.ilmenau.baw.de/cgi-bin/wmsdbwk1000?"/>
-  <wms name="DBWK2" url="http://wsvmapserv.wsv.bvbs.bund.de/cgi-bin/wms_dbwk2?"/>
-  <wms name="Infos zu Bundeswasserstraßen" url="http://wsvmapserv.wsv.bund.de/wms_bwastr?Version=1.1.0"/>
-  <wms name="Orthophotos BKG" url="http://gdz.bkg.bund.de"/>
-  <wms name="Orthophotos der WSV" url="http://wsvmapserv.ilmenau.baw.de/cgi-bin/wmsluft?"/>
   <wms name="Pegelonline" url="http://www.pegelonline.wsv.de/webservices/gis/wms/aktuell?"/>
 </wms-services>