# HG changeset patch
# User gernotbelger
# Date 1525350554 -7200
# Node ID 2f39cd32e6fb21e450fe654217930c1f63c6fb90
# Parent  2ffb55a53e8d9e09b82d22bd80b6aec00205e034# Parent  f4b66f6692e36a5fc3e75172706ea5ca81a08624
Merge

diff -r f4b66f6692e3 -r 2f39cd32e6fb artifacts/doc/conf/artifacts/manualpoints.xml
--- 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>
diff -r f4b66f6692e3 -r 2f39cd32e6fb artifacts/doc/conf/generators/longitudinal-diagrams.xml
--- 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"
diff -r f4b66f6692e3 -r 2f39cd32e6fb artifacts/doc/conf/jasper/FIXME.txt
--- 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
diff -r f4b66f6692e3 -r 2f39cd32e6fb gwt-client/src/test/java/test/TestMain.java
--- 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