[PATCH] undo unwanted commit
Wald Commits
scm-commit at wald.intevation.org
Mon Oct 14 16:41:03 CEST 2019
# HG changeset patch
# User dnt_bjoernsen <d.tironi at bjoernsen.de>
# Date 1571064047 -7200
# Mon Oct 14 16:40:47 2019 +0200
# Node ID bc50ecfc58c5a18e553332228b4a6aeab30c40b6
# Parent f51e23eb036abdd8c4ca6585d0cd1686bd1c9255
undo unwanted commit
diff -r f51e23eb036a -r bc50ecfc58c5 artifacts/doc/conf/backend-db.xml
--- a/artifacts/doc/conf/backend-db.xml Mon Oct 14 16:27:31 2019 +0200
+++ b/artifacts/doc/conf/backend-db.xml Mon Oct 14 16:40:47 2019 +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:5432/d4e</url>
<validation-query>select 1 from rivers</validation-query>
<max-wait>30000</max-wait>
</backend-database>
diff -r f51e23eb036a -r bc50ecfc58c5 artifacts/doc/conf/floodmap.xml
--- a/artifacts/doc/conf/floodmap.xml Mon Oct 14 16:27:31 2019 +0200
+++ b/artifacts/doc/conf/floodmap.xml Mon Oct 14 16:40:47 2019 +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 f51e23eb036a -r bc50ecfc58c5 artifacts/doc/conf/seddb-db.xml
--- a/artifacts/doc/conf/seddb-db.xml Mon Oct 14 16:27:31 2019 +0200
+++ b/artifacts/doc/conf/seddb-db.xml Mon Oct 14 16:40:47 2019 +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:5432/seddb</url>
<validation-query>select 1 from gewaesser</validation-query>
<max-wait>30000</max-wait>
<!--
diff -r f51e23eb036a -r bc50ecfc58c5 artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/Fitting.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/Fitting.java Mon Oct 14 16:27:31 2019 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/Fitting.java Mon Oct 14 16:40:47 2019 +0200
@@ -23,9 +23,6 @@
public class Fitting {
private static Logger log = Logger.getLogger(Fitting.class);
- private static double[] previousParameters = null; // new double[] { Double.MAX_VALUE, Double.MAX_VALUE, Double.MAX_VALUE }; Dann schlägt die
- // Kurvenanpassung fehl! Gernot hat recht!
-
/** Use instance of this factory to find meta infos for outliers. */
public interface QWDFactory {
QWD create(double q, double w, double deltaW, boolean isOutlier);
@@ -124,13 +121,10 @@
for (final FittingData fittingData : data)
cf.addObservedPoint(fittingData.q, fittingData.w);
- parameters = cf.fit(function, // previousParameters != null ? previousParameters :
- function.getInitialGuess());
-
+ parameters = cf.fit(function, function.getInitialGuess());
break;
}
catch (final MathException me) {
-
if (log.isDebugEnabled()) {
log.debug("tolerance " + tolerance + " + failed.", me);
}
@@ -146,7 +140,7 @@
*/
return null;
}
- previousParameters = parameters;
+
// This is the parameterized function for a given km.
instance = function.instantiate(parameters);
diff -r f51e23eb036a -r bc50ecfc58c5 artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/inundationduration/VegetationWmsResource.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/inundationduration/VegetationWmsResource.java Mon Oct 14 16:27:31 2019 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/inundationduration/VegetationWmsResource.java Mon Oct 14 16:40:47 2019 +0200
@@ -57,8 +57,8 @@
final Client client = new Client(new Context(), protocols);
// FIXME
/* Nachfolgende 2 Zeilen sind nur für die BCE-Entwicklungsumgebung bestimmt */
- client.getContext().getParameters().add("proxyHost", "proxy.bce01.de");
- client.getContext().getParameters().add("proxyPort", "8080");
+ // client.getContext().getParameters().add("proxyHost", "proxy.bce01.de");
+ // client.getContext().getParameters().add("proxyPort", "8080");
return client;
}
};
diff -r f51e23eb036a -r bc50ecfc58c5 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 Mon Oct 14 16:27:31 2019 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/auth/was/Authenticator.java Mon Oct 14 16:40:47 2019 +0200
@@ -13,11 +13,9 @@
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;
@@ -51,9 +49,6 @@
Request httpget = new Request("https://geoportal.bafg.de/" +
"administration/WAS", username, password, encoding);
- HttpHost proxy = new HttpHost("proxy.bce01.de",8080);
- httpclient.getParams().setParameter(ConnRoutePNames.DEFAULT_PROXY,proxy);
-
HttpResponse response = httpclient.execute(httpget);
StatusLine stline = response.getStatusLine();
if (stline.getStatusCode() != 200) {
More information about the Dive4Elements-commits
mailing list