--- 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>