[PATCH 2 of 2] Merged
Wald Commits
scm-commit at wald.intevation.org
Mon Feb 22 17:28:39 CET 2016
# HG changeset patch
# User Sascha L. Teichmann <teichmann at intevation.de>
# Date 1456158396 -3600
# Node ID d10f0645b12545e577bd8f80d2296e879ee95590
# Parent 54e515504a3fe92c01e4c4d9746109001aecc6b2
# Parent 884617654878b6897b64641c634941d03753a830
Merged
diff -r 54e515504a3f -r d10f0645b125 .hgtags
--- a/.hgtags Mon Feb 22 17:26:11 2016 +0100
+++ b/.hgtags Mon Feb 22 17:26:36 2016 +0100
@@ -103,3 +103,4 @@
7bc675e4e6e07b758ed06cf5f7d6970490128295 3.1.9
1bc1d696952036c492e016e18fb721032b3320b5 3.1.10
e062d3afd6825e0366f1715b80c60903b1cb11db 3.2.0
+d8e3b20e2c93065eee064a8c707344e5bb63f620 3.2.1
diff -r 54e515504a3f -r d10f0645b125 artifacts/doc/conf/themes.xml
--- a/artifacts/doc/conf/themes.xml Mon Feb 22 17:26:11 2016 +0100
+++ b/artifacts/doc/conf/themes.xml Mon Feb 22 17:26:36 2016 +0100
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE themes [
- <!ENTITY virtual-themes SYSTEM "conf/themes/virtual.xml">
- <!ENTITY default-themes SYSTEM "conf/themes/default.xml">
- <!ENTITY second-themes SYSTEM "conf/themes/second.xml">
+ <!ENTITY virtual SYSTEM "${artifacts.config.dir}/themes/virtual.xml">
+ <!ENTITY default SYSTEM "${artifacts.config.dir}/themes/default.xml">
+ <!ENTITY second SYSTEM "${artifacts.config.dir}/themes/second.xml">
]>
<themes>
- &virtual-themes;
- &default-themes;
- &second-themes;
+ &virtual;
+ &default;
+ &second;
<!-- Mappings are following now. A mapping maps between a name of a facet
and a theme. Always the first matching mapping is taken, so consider putting
diff -r 54e515504a3f -r d10f0645b125 artifacts/src/main/java/org/dive4elements/river/themes/LineStyle.java
--- a/artifacts/src/main/java/org/dive4elements/river/themes/LineStyle.java Mon Feb 22 17:26:11 2016 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/themes/LineStyle.java Mon Feb 22 17:26:36 2016 +0100
@@ -26,4 +26,4 @@
public Color getColor() {
return lineColor;
}
-}
\ No newline at end of file
+}
diff -r 54e515504a3f -r d10f0645b125 artifacts/src/main/java/org/dive4elements/river/utils/RiverMapfileGenerator.java
--- a/artifacts/src/main/java/org/dive4elements/river/utils/RiverMapfileGenerator.java Mon Feb 22 17:26:11 2016 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/utils/RiverMapfileGenerator.java Mon Feb 22 17:26:36 2016 +0100
@@ -11,6 +11,8 @@
import com.vividsolutions.jts.geom.Envelope;
import com.vividsolutions.jts.geom.MultiLineString;
+import org.dive4elements.artifacts.common.utils.Config;
+
import org.dive4elements.river.artifacts.model.LayerInfo;
import org.dive4elements.river.artifacts.model.RiverFactory;
@@ -121,7 +123,9 @@
layerInfo.setFilter("river_id = " + riverID + " and kind_id = 1");
layerInfo.setTitle(riverName + " RiverAxis");
- File layerFile = new File("river-" + riverName + ".map");
+ File layerFile = new File(
+ Config.getConfigDirectory().getParentFile(),
+ "river-" + riverName + ".map");
Template template = getTemplateByName("riveraxis-layer.vm");
if (template == null) {
log.warn("Template riveraxis-layer.vm not found.");
diff -r 54e515504a3f -r d10f0645b125 backend/doc/documentation/de/importer-geodaesie.tex
--- a/backend/doc/documentation/de/importer-geodaesie.tex Mon Feb 22 17:26:11 2016 +0100
+++ b/backend/doc/documentation/de/importer-geodaesie.tex Mon Feb 22 17:26:36 2016 +0100
@@ -136,6 +136,11 @@
für die aktuelle Achse (\textit{achse.shp}) 1 ist
und für sonstige Achsen (weitere Linien-Shapes) 2.
+Hinweis:
+Da die Layer-Konfiguration (Mapfiles) für die Flussachsen beim Start des
+Artefakt-Servers generiert werden, muss der Artefakt-Server neugestartet
+werden um die Flussachse in der Anwendung darstellen zu können.
+
\subsubsection{Hydr. Grenzen}
\hspace{5mm}
\begin{tabular*}{155mm}[t]{l@{\extracolsep\fill}p{125mm}}
diff -r 54e515504a3f -r d10f0645b125 backend/pom-oracle.xml
--- a/backend/pom-oracle.xml Mon Feb 22 17:26:11 2016 +0100
+++ b/backend/pom-oracle.xml Mon Feb 22 17:26:36 2016 +0100
@@ -92,9 +92,23 @@
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
+ <!-- Add less unsave version of transitive hibernate dependency -->
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.2</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>3.6.10.Final</version>
+ <exclusions>
+ <!-- exclude unsafe transitive dependency -->
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
diff -r 54e515504a3f -r d10f0645b125 backend/pom.xml
--- a/backend/pom.xml Mon Feb 22 17:26:11 2016 +0100
+++ b/backend/pom.xml Mon Feb 22 17:26:36 2016 +0100
@@ -92,9 +92,23 @@
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
+ <!-- Add less unsave version of transitive hibernate dependency -->
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.2</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>3.6.10.Final</version>
+ <exclusions>
+ <!-- exclude unsafe transitive dependency -->
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
diff -r 54e515504a3f -r d10f0645b125 doc/INSTALL_DE
--- a/doc/INSTALL_DE Mon Feb 22 17:26:11 2016 +0100
+++ b/doc/INSTALL_DE Mon Feb 22 17:26:36 2016 +0100
@@ -285,6 +285,7 @@
/etc/apache2/sites-available/
# a2ensite d4e-apache.conf
# a2enmod proxy_ajp
+ # a2enmod cgi
# sed -i s/80/8081/ /etc/apache2/ports.conf
# service apache2 restart
diff -r 54e515504a3f -r d10f0645b125 gwt-client/src/main/java/org/dive4elements/river/client/client/ui/DistancePanel.java
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/DistancePanel.java Mon Feb 22 17:26:11 2016 +0100
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/DistancePanel.java Mon Feb 22 17:26:36 2016 +0100
@@ -63,11 +63,11 @@
private static final long serialVersionUID = -883142387908664588L;
- private static final int DEFAULT_STEP_WIDTH = 100;
+ public static final int DEFAULT_STEP_WIDTH = 100;
- private static final String FIELD_LOWER = "ld_from";
- private static final String FIELD_UPPER = "ld_to";
- private static final String FIELD_STEP = "ld_step";
+ public static final String FIELD_LOWER = "ld_from";
+ public static final String FIELD_UPPER = "ld_to";
+ public static final String FIELD_STEP = "ld_step";
protected FLYSConstants MSG = GWT.create(FLYSConstants.class);
@@ -149,9 +149,9 @@
protected String getOldSelectionString(DataList dataList) {
List<Data> items = dataList.getAll();
- Data dFrom = getData(items, FIELD_LOWER);
- Data dTo = getData(items, FIELD_UPPER);
- Data dStep = getData(items, FIELD_STEP);
+ Data dFrom = getData(items, getLowerField());
+ Data dTo = getData(items, getUpperField());
+ Data dStep = getData(items, getStepField());
DataItem[] from = dFrom.getItems();
DataItem[] to = dTo.getItems();
@@ -301,7 +301,7 @@
protected Data getDataFrom() {
String value = String.valueOf(distancePanel.getFrom());
- String field = FIELD_LOWER;
+ String field = getLowerField();
DataItem item = new DefaultDataItem(field, field, value);
return new DefaultData(
@@ -311,7 +311,7 @@
protected Data getDataTo() {
String value = String.valueOf(distancePanel.getTo());
- String field = FIELD_UPPER;
+ String field = getUpperField();
DataItem item = new DefaultDataItem(field, field, value);
return new DefaultData(
@@ -321,7 +321,7 @@
protected Data getDataStep() {
String value = String.valueOf(distancePanel.getStep());
- String field = FIELD_STEP;
+ String field = getStepField();
DataItem item = new DefaultDataItem(field, field, value);
return new DefaultData(
@@ -336,8 +336,8 @@
protected void initMinMaxValues(DataList data) {
- Data f = getData(data.getAll(), FIELD_LOWER);
- Data t = getData(data.getAll(), FIELD_UPPER);
+ Data f = getData(data.getAll(), getLowerField());
+ Data t = getData(data.getAll(), getUpperField());
DataItem[] fItems = f.getItems();
DataItem[] tItems = t.getItems();
@@ -361,7 +361,7 @@
protected void initDefaultFrom(DataList data) {
- Data f = getData(data.getAll(), FIELD_LOWER);
+ Data f = getData(data.getAll(), getLowerField());
double from = getDefaultFrom();
@@ -382,7 +382,7 @@
protected void initDefaultTo(DataList data) {
- Data t = getData(data.getAll(), FIELD_UPPER);
+ Data t = getData(data.getAll(), getUpperField());
double to = getDefaultTo();
@@ -403,9 +403,9 @@
protected void initDefaultStep(DataList data) {
- Data s = getData(data.getAll(), FIELD_STEP);
+ Data s = getData(data.getAll(), getStepField());
- double step = DEFAULT_STEP_WIDTH;
+ double step = getDefaultStep();
try {
step = getDefaultValue(s);
diff -r 54e515504a3f -r d10f0645b125 gwt-client/src/main/java/org/dive4elements/river/client/server/CapabilitiesParser.java
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/CapabilitiesParser.java Mon Feb 22 17:26:11 2016 +0100
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/CapabilitiesParser.java Mon Feb 22 17:26:36 2016 +0100
@@ -163,9 +163,7 @@
protected static Capabilities parse(InputStream is)
throws ServerException
{
- log.debug("GCServiceImpl.parseCapabilitiesResponse");
-
- Document doc = XMLUtils.parseDocument(is, false);
+ Document doc = XMLUtils.parseDocument(is, false, null);
if (doc == null) {
throw new ServerException(ERR_GC_DOC_NOT_VALID);
More information about the Dive4Elements-commits
mailing list