# HG changeset patch
# User Sascha L. Teichmann <sascha.teichmann@intevation.de>
# Date 1340099147 0
# Node ID c041944a7f74a56b1c9b86d3bf627a7fc3b34088
# Parent  d7b0f52d6d04bc8edac4e0fc6168f5d91762faee
conf.xml: Configure rest server and floodmap with external system entities.

flys-artifacts/trunk@4696 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r d7b0f52d6d04 -r c041944a7f74 flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Mon Jun 18 16:00:19 2012 +0000
+++ b/flys-artifacts/ChangeLog	Tue Jun 19 09:45:47 2012 +0000
@@ -1,3 +1,11 @@
+2012-06-19	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
+
+	* doc/conf/conf.xml: Load config of rest server and floodmap over
+	  external entities, too.
+
+	* doc/conf/floodmap.xml, doc/conf/rest-server.xml: New.
+	  External config.
+
 2012-06-18	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
 
 	* src/main/java/de/intevation/flys/artifacts/model/fixings/Fitting.java:
diff -r d7b0f52d6d04 -r c041944a7f74 flys-artifacts/doc/conf/conf.xml
--- a/flys-artifacts/doc/conf/conf.xml	Mon Jun 18 16:00:19 2012 +0000
+++ b/flys-artifacts/doc/conf/conf.xml	Tue Jun 19 09:45:47 2012 +0000
@@ -4,6 +4,8 @@
     <!ENTITY datacage-db SYSTEM "datacage-db.xml">
     <!ENTITY backend-db  SYSTEM "backend-db.xml">
     <!ENTITY seddb-db    SYSTEM "seddb-db.xml">
+    <!ENTITY rest-server SYSTEM "rest-server.xml">
+    <!ENTITY floodmap    SYSTEM "floodmap.xml">
 ]>
 <artifact-database>
     <export-secret>YOUR_SECRET</export-secret>
@@ -281,44 +283,10 @@
         <template>${artifacts.config.dir}/meta-data.xml</template>
     </metadata>
 
-    <!-- The floodmap configuration for each supported river. Each element
-         requires a srid, wms and background-wms. Those information are used for
-         creating a Map view.-->
-    <floodmap>
-        <shapefile-path value="${artifacts.config.dir}/../shapefiles"/>
-        <mapserver>
-            <server path="http://flys-devel.intevation.de/cgi-bin/"/>
-            <mapfile path="${artifacts.config.dir}/../flys.map"/>
-            <templates path="${artifacts.config.dir}/mapserver/"/>
-            <map-template path="mapfile.vm"/>
-        </mapserver>
-
-        <velocity>
-            <logfile path="${artifacts.config.dir}/../velocity_log.log"/>
-        </velocity>
+    &floodmap;
 
-        <river name="Saar">
-            <srid value="31466"/>
-            <river-wms url="http://flys-devel.intevation.de/cgi-bin/saar-wms"/>
-            <background-wms url="http://vmap0.tiles.osgeo.org/wms/vmap0" layers="basic"/>
-        </river>
-        <river name="Mosel">
-            <srid value="31466"/>
-            <river-wms url="http://flys-devel.intevation.de/cgi-bin/mosel-wms"/>
-            <background-wms url="http://vmap0.tiles.osgeo.org/wms/vmap0" layers="basic"/>
-        </river>
-        <river name="Elbe">
-            <srid value="31466"/>
-            <river-wms url="http://flys-devel.intevation.de/cgi-bin/elbe-wms"/>
-            <background-wms url="http://vmap0.tiles.osgeo.org/wms/vmap0" layers="basic"/>
-        </river>
-    </floodmap>
+    &rest-server;
 
-    <rest-server>
-        <!--  The port which the ArtifactDatabase (ArtifactServer) will bind to. -->
-        <port>8181</port>
-        <listen>localhost</listen>
-    </rest-server>
     <!-- Garbage collection of outdated artifacts. -->
     <cleaner>
         <sleep-time>60000</sleep-time>
diff -r d7b0f52d6d04 -r c041944a7f74 flys-artifacts/doc/conf/floodmap.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/flys-artifacts/doc/conf/floodmap.xml	Tue Jun 19 09:45:47 2012 +0000
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<floodmap>
+    <shapefile-path value="${artifacts.config.dir}/../shapefiles"/>
+    <mapserver>
+        <server path="http://flys-devel.intevation.de/cgi-bin/"/>
+        <mapfile path="${artifacts.config.dir}/../flys.map"/>
+        <templates path="${artifacts.config.dir}/mapserver/"/>
+        <map-template path="mapfile.vm"/>
+    </mapserver>
+
+    <velocity>
+        <logfile path="${artifacts.config.dir}/../velocity_log.log"/>
+    </velocity>
+
+    <river name="Saar">
+        <srid value="31466"/>
+        <river-wms url="http://flys-devel.intevation.de/cgi-bin/saar-wms"/>
+        <background-wms url="http://vmap0.tiles.osgeo.org/wms/vmap0" layers="basic"/>
+    </river>
+    <river name="Mosel">
+        <srid value="31466"/>
+        <river-wms url="http://flys-devel.intevation.de/cgi-bin/mosel-wms"/>
+        <background-wms url="http://vmap0.tiles.osgeo.org/wms/vmap0" layers="basic"/>
+    </river>
+    <river name="Elbe">
+        <srid value="31466"/>
+        <river-wms url="http://flys-devel.intevation.de/cgi-bin/elbe-wms"/>
+        <background-wms url="http://vmap0.tiles.osgeo.org/wms/vmap0" layers="basic"/>
+    </river>
+</floodmap>
diff -r d7b0f52d6d04 -r c041944a7f74 flys-artifacts/doc/conf/rest-server.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/flys-artifacts/doc/conf/rest-server.xml	Tue Jun 19 09:45:47 2012 +0000
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<rest-server>
+    <!--  The port which the ArtifactDatabase (ArtifactServer) will bind to. -->
+    <port>8181</port>
+    <listen>localhost</listen>
+</rest-server>