Mercurial > dive4elements > river
changeset 9165:0cc241ddc2a0
REVERT - Aus Versehen DB-Settings committed
| author | gernotbelger |
|---|---|
| date | Wed, 20 Jun 2018 11:18:47 +0200 |
| parents | 8c0d1542c1d8 |
| children | 3ead6937ae7c |
| files | artifacts/doc/conf/backend-db.xml artifacts/doc/conf/floodmap.xml artifacts/doc/conf/modules.xml artifacts/doc/conf/seddb-db.xml gwt-client/src/main/webapp/WEB-INF/features.xml |
| diffstat | 5 files changed, 5 insertions(+), 36 deletions(-) [+] |
line wrap: on
line diff
--- 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>
--- 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>
--- 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
--- 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> <!--
--- 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>