[PATCH] REVERT - Aus Versehen DB-Settings committed

[Wald Commits]

# HG changeset patch
# User gernotbelger
# Date 1529486327 -7200
# Node ID 0cc241ddc2a02eb9f0426cb47fe3dcd7141921c2
# Parent  8c0d1542c1d865cc2cfa37b8fda4aeead42395b3
REVERT - Aus Versehen DB-Settings committed

diff -r 8c0d1542c1d8 -r 0cc241ddc2a0 artifacts/doc/conf/backend-db.xml
--- a/artifacts/doc/conf/backend-db.xml	Wed Jun 20 11:13:40 2018 +0200
+++ b/artifacts/doc/conf/backend-db.xml	Wed Jun 20 11:18:47 2018 +0200
@@ -5,7 +5,7 @@
     <password>d4e</password>
     <dialect>org.hibernate.dialect.PostgreSQLDialect</dialect>
     <driver>org.postgresql.Driver</driver>
-    <url>jdbc:postgresql://localhost:63333/d4e2</url>
+    <url>jdbc:postgresql://localhost:63333/d4e</url>
     <validation-query>select 1 from rivers</validation-query>
     <max-wait>30000</max-wait>
 </backend-database>
diff -r 8c0d1542c1d8 -r 0cc241ddc2a0 artifacts/doc/conf/floodmap.xml
--- a/artifacts/doc/conf/floodmap.xml	Wed Jun 20 11:13:40 2018 +0200
+++ b/artifacts/doc/conf/floodmap.xml	Wed Jun 20 11:18:47 2018 +0200
@@ -16,16 +16,5 @@
         <srid value="31467"/>
         <river-wms url="http://localhost:8081/cgi-bin/river-wms" layers="Beispielfluss"/>
         <background-wms url="http://osm.intevation.de/bfg/service?" layers="OSM-WMS-Dienst"/>
-    </river>
-	<river name="Elbe">
-		<srid value="31467"/>
-		<river-wms url="http://localhost:8081/cgi-bin/flys-default/river-wms" layers="Elbe"/>
-		<background-wms url="http://ows.terrestris.de/osm/service?" layers="OSM-WMS"/>
-	</river>
-	<river name="Rhein">
-		<srid value="31467"/>
-		<river-wms url="http://localhost:8081/cgi-bin/flys-default/river-wms" layers="Rhein"/>
-		<background-wms url="http://ows.terrestris.de/osm/service?" layers="OSM-WMS"/>
-	</river>
-    
+    </river> 
 </floodmap>
diff -r 8c0d1542c1d8 -r 0cc241ddc2a0 artifacts/doc/conf/modules.xml
--- a/artifacts/doc/conf/modules.xml	Wed Jun 20 11:13:40 2018 +0200
+++ b/artifacts/doc/conf/modules.xml	Wed Jun 20 11:18:47 2018 +0200
@@ -2,42 +2,26 @@
 <modules>
   <module name="winfo" selected="true">
     <river name="Beispielfluss" />
-    <river name="Elbe"/>
-    <river name="Rhein"/>
   </module>
-  <module name="sinfo" group="module.group.ingwerds">
+  <module name="sinfo" group="module.group.ingwerds">^
     <river name="Beispielfluss" />
-    <river name="Elbe"/>
-    <river name="Rhein"/>
   </module>
   <module name="minfo" group="module.group.ingwerds">
     <river name="Beispielfluss" />
-    <river name="Elbe"/>
-    <river name="Rhein"/>
   </module>
   <module name="uinfo" group="module.group.ingwerds">
     <river name="Beispielfluss" />
-    <river name="Elbe"/>
-    <river name="Rhein"/>
   </module>
   <module name="bundu" group="module.group.ingwerds">
     <river name="Beispielfluss" />
-    <river name="Elbe"/>
-    <river name="Rhein"/>
   </module>
   <module name="new_map" group="module.group.bottom">
     <river name="Beispielfluss" />
-    <river name="Elbe"/>
-    <river name="Rhein"/>
   </module>
   <module name="new_chart" group="module.group.bottom">
     <river name="Beispielfluss" />
-    <river name="Elbe"/>
-    <river name="Rhein"/>
   </module>
   <module name="fixanalysis" group="module.group.bottom">
     <river name="Beispielfluss" />
-    <river name="Elbe"/>
-    <river name="Rhein"/>
   </module>
 </modules>
\ No newline at end of file
diff -r 8c0d1542c1d8 -r 0cc241ddc2a0 artifacts/doc/conf/seddb-db.xml
--- a/artifacts/doc/conf/seddb-db.xml	Wed Jun 20 11:13:40 2018 +0200
+++ b/artifacts/doc/conf/seddb-db.xml	Wed Jun 20 11:18:47 2018 +0200
@@ -5,7 +5,7 @@
     <password>seddb</password>
     <dialect>org.hibernate.dialect.PostgreSQLDialect</dialect>
     <driver>org.postgresql.Driver</driver>
-    <url>jdbc:postgresql://localhost:63333/seddb2</url>
+    <url>jdbc:postgresql://localhost:63333/seddb</url>
     <validation-query>select 1 from gewaesser</validation-query>
     <max-wait>30000</max-wait>
     <!--
diff -r 8c0d1542c1d8 -r 0cc241ddc2a0 gwt-client/src/main/webapp/WEB-INF/features.xml
--- a/gwt-client/src/main/webapp/WEB-INF/features.xml	Wed Jun 20 11:13:40 2018 +0200
+++ b/gwt-client/src/main/webapp/WEB-INF/features.xml	Wed Jun 20 11:18:47 2018 +0200
@@ -9,15 +9,11 @@
     <ftr:feature>module:new_map</ftr:feature>
     <ftr:feature>module:new_chart</ftr:feature>
     <ftr:feature>module:fixanalysis</ftr:feature>
-    <ftr:feature>river:Beispielfluss</ftr:feature>
-    <ftr:feature>river:Elbe</ftr:feature>
-    <ftr:feature>river:Rhein</ftr:feature>
+    <ftr:feature>river:Beispielfluss</ftr:feature> 
   </ftr:role>
   <ftr:role name="d4e_demo_extern">
     <ftr:feature>module:winfo</ftr:feature>
     <ftr:feature>module:minfo</ftr:feature>
     <ftr:feature>river:Beispielfluss</ftr:feature>
-    <ftr:feature>river:Elbe</ftr:feature>
-    <ftr:feature>river:Rhein</ftr:feature>
   </ftr:role>
 </ftr:features>