Mercurial > dive4elements > river
changeset 9649:295b3cb5ebc8
Reverted bad commit
| author | Gernot Belger <g.belger@bjoernsen.de> |
|---|---|
| date | Wed, 04 Dec 2019 16:59:25 +0100 |
| parents | c5a496bf1b0b |
| children | a2a42a6bac6b |
| files | artifacts/doc/conf/backend-db.xml artifacts/doc/conf/floodmap.xml artifacts/doc/conf/log4j.properties artifacts/doc/conf/seddb-db.xml gwt-client/src/main/java/org/dive4elements/river/client/server/auth/was/Authenticator.java |
| diffstat | 5 files changed, 4 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/backend-db.xml Wed Dec 04 16:10:28 2019 +0100 +++ b/artifacts/doc/conf/backend-db.xml Wed Dec 04 16:59:25 2019 +0100 @@ -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:5432/d4e</url> <validation-query>select 1 from rivers</validation-query> <max-wait>30000</max-wait> </backend-database>
--- a/artifacts/doc/conf/floodmap.xml Wed Dec 04 16:10:28 2019 +0100 +++ b/artifacts/doc/conf/floodmap.xml Wed Dec 04 16:59:25 2019 +0100 @@ -16,16 +16,6 @@ <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/log4j.properties Wed Dec 04 16:10:28 2019 +0100 +++ b/artifacts/doc/conf/log4j.properties Wed Dec 04 16:59:25 2019 +0100 @@ -1,4 +1,4 @@ -log4j.rootLogger=FLYS +log4j.rootLogger=DEBUG, FLYS ########## EXTERNAL PACKAGES log4j.category.org.hibernate=WARN
--- a/artifacts/doc/conf/seddb-db.xml Wed Dec 04 16:10:28 2019 +0100 +++ b/artifacts/doc/conf/seddb-db.xml Wed Dec 04 16:59:25 2019 +0100 @@ -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:5432/seddb</url> <validation-query>select 1 from gewaesser</validation-query> <max-wait>30000</max-wait> <!--
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/auth/was/Authenticator.java Wed Dec 04 16:10:28 2019 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/auth/was/Authenticator.java Wed Dec 04 16:59:25 2019 +0100 @@ -49,9 +49,6 @@ httpclient.getConnectionManager().getSchemeRegistry().register( https); - HttpHost proxy = new HttpHost("proxy.bce01.de",8080); - httpclient.getParams().setParameter(ConnRoutePNames.DEFAULT_PROXY,proxy); - Request httpget = new Request("https://geoportal.bafg.de/" + "administration/WAS", username, password, encoding); HttpResponse response = httpclient.execute(httpget);