Mercurial > dive4elements > river
changeset 9051:2f39cd32e6fb
Merge
author | gernotbelger |
---|---|
date | Thu, 03 May 2018 14:29:14 +0200 |
parents | 2ffb55a53e8d (diff) f4b66f6692e3 (current diff) |
children | a6c19528ac16 |
files | |
diffstat | 4 files changed, 3 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/artifacts/manualpoints.xml Thu May 03 14:17:58 2018 +0200 +++ b/artifacts/doc/conf/artifacts/manualpoints.xml Thu May 03 14:29:14 2018 +0200 @@ -35,8 +35,6 @@ <facet name="sq_relation_e.manualpoints" /> <facet name="bed_longitudinal_section.manualpoints" /> <facet name="sq_relation_f.manualpoints" /> - - <!-- brauchen wir .manualpoints für sinfo ergebnisse? --> </facets> </outputmode> </outputmodes>
--- a/artifacts/doc/conf/generators/longitudinal-diagrams.xml Thu May 03 14:17:58 2018 +0200 +++ b/artifacts/doc/conf/generators/longitudinal-diagrams.xml Thu May 03 14:29:14 2018 +0200 @@ -88,9 +88,6 @@ </subtitle> </output-generator> -<!-- -,flow_velocity_chartinfo - --> <output-generator names="sinfo_flow_depth,sinfo_flow_depth_chartinfo" class="org.dive4elements.river.exports.LongitudinalSectionGenerator2"
--- a/artifacts/doc/conf/jasper/FIXME.txt Thu May 03 14:17:58 2018 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -Awful: -- source files together with compiled files in one directory -- source files part of 'conf', but user will probably never be able to conf them -- compiled files checked-in into SCM -- compilation process not part of maven (not even part of project at all) -- we have different jasper reports for different languages; instead introduce variables and give i10n strings as report variables \ No newline at end of file
--- a/gwt-client/src/test/java/test/TestMain.java Thu May 03 14:17:58 2018 +0200 +++ b/gwt-client/src/test/java/test/TestMain.java Thu May 03 14:29:14 2018 +0200 @@ -11,14 +11,14 @@ import java.io.IOException; import org.dive4elements.river.client.shared.exceptions.ServerException; -import org.junit.Test; /** * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a> */ public class TestMain { - @Test + // REMARK: ignored, because maven will auto-test all tests, but this one needs a running river-artifacts + // @Test public void testSInfoFlowDepthMinMax() throws ServerException, IOException { // TODO Auto-generated method stub @@ -37,5 +37,4 @@ new String[] { "bedheight", "bedheight-single-36-2015-FP-2015_0-502", "sinfo_flowdepthminmax_heights" }); proof.runTest(true); } - -} +} \ No newline at end of file