--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/RiverService.java	Thu Mar 17 11:46:43 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/RiverService.java	Thu Mar 17 12:17:37 2011 +0000
@@ -1,5 +1,7 @@
 package de.intevation.flys.artifacts.services;
 
+import java.util.List;
+
 import org.apache.log4j.Logger;
 
 import org.w3c.dom.Document;
@@ -12,6 +14,10 @@
 
 import de.intevation.artifactdatabase.DefaultService;
 
+import de.intevation.flys.model.River;
+
+import de.intevation.flys.artifacts.model.RiverFactory;
+
 
 /**
  * This service provides information about the supported rivers by this
@@ -46,17 +52,17 @@
             ArtifactNamespaceContext.NAMESPACE_URI,
             ArtifactNamespaceContext.NAMESPACE_PREFIX);
 
-        // TODO fetch the rivers from database
+        List<River> allRivers = RiverFactory.getRivers();
+
         Element rivers = ec.create("rivers");
 
-        Element saar = ec.create("river");
-        ec.addAttr(saar, "name", "Saar", true);
+        for (River river: allRivers) {
+            Element r = ec.create("river");
+            ec.addAttr(r, "name", river.getName(), true);
 
-        Element mosel = ec.create("river");
-        ec.addAttr(mosel, "name", "Mosel", true);
+            rivers.appendChild(r);
+        }
 
-        rivers.appendChild(saar);
-        rivers.appendChild(mosel);
         result.appendChild(rivers);
 
         return result;