[PATCH] Fixed: Duplizieren einer Fixierungsanalyse schlägt fehl
Wald Commits
scm-commit at wald.intevation.org
Wed Dec 4 16:10:33 CET 2019
# HG changeset patch
# User Gernot Belger <g.belger at bjoernsen.de>
# Date 1575472228 -3600
# Wed Dec 04 16:10:28 2019 +0100
# Node ID c5a496bf1b0b236ce72125ad1dba373e9654a980
# Parent bcaca2433f12d440bb5ec010ec34384b600fc602
Fixed: Duplizieren einer Fixierungsanalyse schlägt fehl.
diff -r bcaca2433f12 -r c5a496bf1b0b artifacts/doc/conf/backend-db.xml
--- a/artifacts/doc/conf/backend-db.xml Tue Dec 03 11:42:36 2019 +0100
+++ b/artifacts/doc/conf/backend-db.xml Wed Dec 04 16:10:28 2019 +0100
@@ -5,7 +5,7 @@
<password>d4e</password>
<dialect>org.hibernate.dialect.PostgreSQLDialect</dialect>
<driver>org.postgresql.Driver</driver>
- <url>jdbc:postgresql://localhost:5432/d4e</url>
+ <url>jdbc:postgresql://localhost:63333/d4e2</url>
<validation-query>select 1 from rivers</validation-query>
<max-wait>30000</max-wait>
</backend-database>
diff -r bcaca2433f12 -r c5a496bf1b0b artifacts/doc/conf/floodmap.xml
--- a/artifacts/doc/conf/floodmap.xml Tue Dec 03 11:42:36 2019 +0100
+++ b/artifacts/doc/conf/floodmap.xml Wed Dec 04 16:10:28 2019 +0100
@@ -16,5 +16,16 @@
<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>
+ <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>
+
</floodmap>
diff -r bcaca2433f12 -r c5a496bf1b0b artifacts/doc/conf/log4j.properties
--- a/artifacts/doc/conf/log4j.properties Tue Dec 03 11:42:36 2019 +0100
+++ b/artifacts/doc/conf/log4j.properties Wed Dec 04 16:10:28 2019 +0100
@@ -1,4 +1,4 @@
-log4j.rootLogger=DEBUG, FLYS
+log4j.rootLogger=FLYS
########## EXTERNAL PACKAGES
log4j.category.org.hibernate=WARN
diff -r bcaca2433f12 -r c5a496bf1b0b artifacts/doc/conf/seddb-db.xml
--- a/artifacts/doc/conf/seddb-db.xml Tue Dec 03 11:42:36 2019 +0100
+++ b/artifacts/doc/conf/seddb-db.xml Wed Dec 04 16:10:28 2019 +0100
@@ -5,7 +5,7 @@
<password>seddb</password>
<dialect>org.hibernate.dialect.PostgreSQLDialect</dialect>
<driver>org.postgresql.Driver</driver>
- <url>jdbc:postgresql://localhost:5432/seddb</url>
+ <url>jdbc:postgresql://localhost:63333/seddb2</url>
<validation-query>select 1 from gewaesser</validation-query>
<max-wait>30000</max-wait>
<!--
diff -r bcaca2433f12 -r c5a496bf1b0b artifacts/src/main/java/org/dive4elements/river/artifacts/D4EArtifact.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/D4EArtifact.java Tue Dec 03 11:42:36 2019 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/D4EArtifact.java Wed Dec 04 16:10:28 2019 +0100
@@ -1681,6 +1681,8 @@
/** Destroy and clean up state with given id. */
protected void destroyState(String id, Object context) {
State s = getState(context, id);
+ if( s == null )
+ return;
s.endOfLife(this, context);
}
diff -r bcaca2433f12 -r c5a496bf1b0b artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixingsEventFacet.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixingsEventFacet.java Tue Dec 03 11:42:36 2019 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixingsEventFacet.java Wed Dec 04 16:10:28 2019 +0100
@@ -35,6 +35,10 @@
final DoubleRange stationRange) {
super(facetIndex, name, description, type, hash, stateId);
+ if (stationRange == null) {
+ System.out.println("break");
+ }
+
this.stationRange = stationRange;
}
@@ -55,6 +59,6 @@
final FixingsEventFacet o = (FixingsEventFacet) other;
// DoubleRange is immutable, so we can copy the reference here
- o.stationRange = this.stationRange;
+ this.stationRange = o.stationRange;
}
}
\ No newline at end of file
diff -r bcaca2433f12 -r c5a496bf1b0b gwt-client/src/main/java/org/dive4elements/river/client/client/services/UserCollectionsService.java
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/services/UserCollectionsService.java Tue Dec 03 11:42:36 2019 +0100
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/services/UserCollectionsService.java Wed Dec 04 16:10:28 2019 +0100
@@ -8,12 +8,12 @@
package org.dive4elements.river.client.client.services;
+import org.dive4elements.river.client.server.auth.User;
+import org.dive4elements.river.client.shared.model.Collection;
+
import com.google.gwt.user.client.rpc.RemoteService;
import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
-import org.dive4elements.river.client.server.auth.User;
-import org.dive4elements.river.client.shared.model.Collection;
-
/**
* This interface describes a method that retrieves a list of Collections owned
diff -r bcaca2433f12 -r c5a496bf1b0b gwt-client/src/main/java/org/dive4elements/river/client/server/auth/was/Authenticator.java
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/auth/was/Authenticator.java Tue Dec 03 11:42:36 2019 +0100
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/auth/was/Authenticator.java Wed Dec 04 16:10:28 2019 +0100
@@ -13,9 +13,11 @@
import javax.servlet.ServletContext;
import org.apache.http.HttpEntity;
+import org.apache.http.HttpHost;
import org.apache.http.HttpResponse;
import org.apache.http.StatusLine;
import org.apache.http.client.HttpClient;
+import org.apache.http.conn.params.ConnRoutePNames;
import org.apache.http.conn.scheme.Scheme;
import org.apache.http.conn.ssl.SSLSocketFactory;
import org.apache.http.impl.client.DefaultHttpClient;
@@ -47,6 +49,9 @@
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);
diff -r bcaca2433f12 -r c5a496bf1b0b gwt-client/src/main/webapp/WEB-INF/features.xml
--- a/gwt-client/src/main/webapp/WEB-INF/features.xml Tue Dec 03 11:42:36 2019 +0100
+++ b/gwt-client/src/main/webapp/WEB-INF/features.xml Wed Dec 04 16:10:28 2019 +0100
@@ -16,6 +16,7 @@
<ftr:role name="d4e_demo_extern">
<ftr:feature>module:winfo</ftr:feature>
<ftr:feature>module:minfo</ftr:feature>
+ <ftr:feature>module:new_chart</ftr:feature>
<ftr:feature>river:Beispielfluss</ftr:feature>
</ftr:role>
diff -r bcaca2433f12 -r c5a496bf1b0b gwt-client/src/main/webapp/WEB-INF/log4j.properties
--- a/gwt-client/src/main/webapp/WEB-INF/log4j.properties Tue Dec 03 11:42:36 2019 +0100
+++ b/gwt-client/src/main/webapp/WEB-INF/log4j.properties Wed Dec 04 16:10:28 2019 +0100
@@ -1,7 +1,7 @@
log4j.rootLogger=DEBUG, FLYS
########## INTERNAL PACKAGES
-log4j.category.org.dive4elements.river.client.server=DEBUG
+log4j.category.org.dive4elements.river.client.server=INFO
########## EXTERNAL PACKAGES
log4j.category.org.apache.http=ERROR
@@ -13,3 +13,12 @@
log4j.appender.FLYS=org.apache.log4j.ConsoleAppender
log4j.appender.FLYS.Target = System.out
+
+########## LOG USER-AUTHENTICATIONS
+log4j.logger.org.dive4elements.river.client.server.LoginServlet=INFO, AUTH
+log4j.logger.org.dive4elements.river.client.server.SamlServlet=INFO, AUTH
+log4j.appender.AUTH=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.AUTH.DatePattern='.'yyyy-MM
+log4j.appender.AUTH.layout=org.apache.log4j.PatternLayout
+log4j.appender.AUTH.layout.ConversionPattern=%d %m%n
+log4j.appender.AUTH.File=C://Temp/client-3.3.0-auth.log
\ No newline at end of file
More information about the Dive4Elements-commits
mailing list