changeset 633:7a136b99ad71

Adapted product configuration regarding the changes in rev704. gnv-artifacts/trunk@712 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Thu, 25 Feb 2010 09:11:56 +0000
parents 62ea2a7b1067
children 58c32df1a44d
files gnv-artifacts/ChangeLog gnv-artifacts/doc/conf/products/horizontalprofile/conf_instantaneouspoint.xml gnv-artifacts/doc/conf/products/horizontalprofile/conf_mesh.xml gnv-artifacts/doc/conf/products/horizontalprofile/conf_mesh_cross.xml gnv-artifacts/doc/conf/products/timeseries/conf_mesh.xml gnv-artifacts/doc/conf/products/timeseries/conf_timeseriespoint.xml gnv-artifacts/doc/conf/products/verticalcrosssection/conf_mesh.xml gnv-artifacts/doc/conf/products/verticalprofile/conf_instantaneouspoint.xml gnv-artifacts/doc/conf/products/verticalprofile/conf_mesh.xml gnv-artifacts/doc/conf/products/verticalprofile/conf_timeseriespoint.xml
diffstat 10 files changed, 110 insertions(+), 124 deletions(-) [+]
line wrap: on
line diff
--- a/gnv-artifacts/ChangeLog	Thu Feb 25 09:06:36 2010 +0000
+++ b/gnv-artifacts/ChangeLog	Thu Feb 25 09:11:56 2010 +0000
@@ -1,3 +1,18 @@
+2010-02-25  Ingo Weinzierl <ingo.weinzierl@intevation.de>
+
+	* doc/conf/products/verticalcrosssection/conf_mesh.xml,
+	  doc/conf/products/timeseries/conf_mesh.xml,
+	  doc/conf/products/timeseries/conf_timeseriespoint.xml,
+	  doc/conf/products/horizontalprofile/conf_mesh.xml,
+	  doc/conf/products/horizontalprofile/conf_instantaneouspoint.xml,
+	  doc/conf/products/horizontalprofile/conf_mesh_cross.xml,
+	  doc/conf/products/verticalprofile/conf_mesh.xml,
+	  doc/conf/products/verticalprofile/conf_timeseriespoint.xml,
+	  doc/conf/products/verticalprofile/conf_instantaneouspoint.xml: Adapted
+	  configuration. Pdf, svg, image exports got an own section in the
+	  outputmodes node. Exports belong to an output mode, now. There are no
+	  outputmodes 'pdf', 'svg', 'png' existing anymore.
+
 2010-02-25  Ingo Weinzierl <ingo.weinzierl@intevation.de>
 
 	* src/main/java/de/intevation/gnv/state/profile/verticalcrosssection/VerticalCrossSectionOutputState.java:
--- a/gnv-artifacts/doc/conf/products/horizontalprofile/conf_instantaneouspoint.xml	Thu Feb 25 09:06:36 2010 +0000
+++ b/gnv-artifacts/doc/conf/products/horizontalprofile/conf_instantaneouspoint.xml	Thu Feb 25 09:11:56 2010 +0000
@@ -225,6 +225,11 @@
                        <inputvalue name="height" type="Integer" value="400"/>
                        <inputvalue name="points" type="Boolean" value="false"/>
                    </parameters>
+                   <exportModes>
+                        <export name="img" description="IMG-Export der Daten" mime-type="image/png" />
+                        <export name="pdf" description="PDF-Export der Daten" mime-type="application/pdf" />
+                        <export name="svg" description="SVG-Export der Daten" mime-type="image/svg+xml" />
+                    </exportModes>
                </outputsMode>
                 <outputsMode name="histogram" description="Histogram of the Values" mime-type="image/png">
                     <parameters>
@@ -233,20 +238,13 @@
                         <inputvalue name="bincount" type="Integer" value="7"/>
                         <inputvalue name="binwidth" type="Integer" value="7"/>
                     </parameters>
-                </outputsMode>
-               <outputsMode name="pdf" description="PDF-Export der Daten" mime-type="application/pdf">
-                    <parameters>
-                        <inputvalue name="width" type="Integer" value="600"/>
-                        <inputvalue name="height" type="Integer" value="400"/>
-                        <inputvalue name="points" type="Boolean" value="false"/>
-                    </parameters>
-                </outputsMode>
-               <outputsMode name="svg" description="SVG-Export der Daten" mime-type="image/svg+xml">
-                    <parameters>
-                        <inputvalue name="width" type="Integer" value="600"/>
-                        <inputvalue name="height" type="Integer" value="400"/>
-                        <inputvalue name="points" type="Boolean" value="false"/>
-                    </parameters>
+                    <exportModes>
+                        <export name="img" description="IMG-Export der Daten" mime-type="image/png" />
+                        <!-- not implemented yet
+                        <export name="pdf" description="PDF-Export der Daten" mime-type="application/pdf" />
+                        <export name="svg" description="SVG-Export der Daten" mime-type="image/svg+xml" />
+                        -->
+                    </exportModes>
                 </outputsMode>
                <outputsMode name="csv" description="CSV-Export der Daten" mime-type="text/plain"/>
                <outputsMode name="odv" description="ODV-Export der Daten" mime-type="text/plain"/>
--- a/gnv-artifacts/doc/conf/products/horizontalprofile/conf_mesh.xml	Thu Feb 25 09:06:36 2010 +0000
+++ b/gnv-artifacts/doc/conf/products/horizontalprofile/conf_mesh.xml	Thu Feb 25 09:11:56 2010 +0000
@@ -226,6 +226,11 @@
                        <inputvalue name="height" type="Integer" value="400"/>
                        <inputvalue name="points" type="Boolean" value="false"/>
                    </parameters>
+                   <exportModes>
+                       <export name="img" description="IMG-Export der Daten" mime-type="image/png" />
+                       <export name="pdf" description="PDF-Export der Daten" mime-type="application/pdf" />
+                       <export name="svg" description="SVG-Export der Daten" mime-type="image/svg+xml" />
+                   </exportModes>
                </outputsMode>
                 <outputsMode name="histogram" description="Histogram of the Values" mime-type="image/png">
                     <parameters>
@@ -234,20 +239,13 @@
                         <inputvalue name="bincount" type="Integer" value="7"/>
                         <inputvalue name="binwidth" type="Integer" value="7"/>
                     </parameters>
-                </outputsMode>
-               <outputsMode name="pdf" description="PDF-Export der Daten" mime-type="application/pdf">
-                    <parameters>
-                        <inputvalue name="width" type="Integer" value="600"/>
-                        <inputvalue name="height" type="Integer" value="400"/>
-                        <inputvalue name="points" type="Boolean" value="false"/>
-                    </parameters>
-                </outputsMode>
-               <outputsMode name="svg" description="SVG-Export der Daten" mime-type="image/svg+xml">
-                    <parameters>
-                        <inputvalue name="width" type="Integer" value="600"/>
-                        <inputvalue name="height" type="Integer" value="400"/>
-                        <inputvalue name="points" type="Boolean" value="false"/>
-                    </parameters>
+                    <exportModes>
+                        <export name="img" description="IMG-Export der Daten" mime-type="image/png" />
+                        <!-- not implemented yet
+                        <export name="pdf" description="PDF-Export der Daten" mime-type="application/pdf" />
+                        <export name="svg" description="SVG-Export der Daten" mime-type="image/svg+xml" />
+                        -->
+                    </exportModes>
                 </outputsMode>
                <outputsMode name="csv" description="CSV-Export der Daten" mime-type="text/plain"/>
                <outputsMode name="odv" description="ODV-Export der Daten" mime-type="text/plain"/>
--- a/gnv-artifacts/doc/conf/products/horizontalprofile/conf_mesh_cross.xml	Thu Feb 25 09:06:36 2010 +0000
+++ b/gnv-artifacts/doc/conf/products/horizontalprofile/conf_mesh_cross.xml	Thu Feb 25 09:11:56 2010 +0000
@@ -192,6 +192,11 @@
                        <inputvalue name="height" type="Integer" value="400"/>
                        <inputvalue name="points" type="Boolean" value="false"/>
                    </parameters>
+                   <exportModes>
+                        <export name="img" description="IMG-Export der Daten" mime-type="image/png" />
+                        <export name="pdf" description="PDF-Export der Daten" mime-type="application/pdf" />
+                        <export name="svg" description="SVG-Export der Daten" mime-type="image/svg+xml" />
+                    </exportModes>
                </outputsMode>
                <outputsMode name="histogram" description="Histogram of the Values" mime-type="image/png">
                     <parameters>
@@ -200,20 +205,13 @@
                         <inputvalue name="bincount" type="Integer" value="7"/>
                         <inputvalue name="binwidth" type="Integer" value="7"/>
                     </parameters>
-                </outputsMode>
-               <outputsMode name="pdf" description="PDF-Export der Daten" mime-type="application/pdf">
-                    <parameters>
-                        <inputvalue name="width" type="Integer" value="600"/>
-                        <inputvalue name="height" type="Integer" value="400"/>
-                        <inputvalue name="points" type="Boolean" value="false"/>
-                    </parameters>
-                </outputsMode>
-               <outputsMode name="svg" description="SVG-Export der Daten" mime-type="image/svg+xml">
-                    <parameters>
-                        <inputvalue name="width" type="Integer" value="600"/>
-                        <inputvalue name="height" type="Integer" value="400"/>
-                        <inputvalue name="points" type="Boolean" value="false"/>
-                    </parameters>
+                    <exportModes>
+                        <export name="img" description="IMG-Export der Daten" mime-type="image/png" />
+                        <!-- not implemented yet
+                        <export name="pdf" description="PDF-Export der Daten" mime-type="application/pdf" />
+                        <export name="svg" description="SVG-Export der Daten" mime-type="image/svg+xml" />
+                        -->
+                    </exportModes>
                 </outputsMode>
                <outputsMode name="csv" description="CSV-Export der Daten" mime-type="text/plain"/>
                <outputsMode name="odv" description="ODV-Export der Daten" mime-type="text/plain"/>
--- a/gnv-artifacts/doc/conf/products/timeseries/conf_mesh.xml	Thu Feb 25 09:06:36 2010 +0000
+++ b/gnv-artifacts/doc/conf/products/timeseries/conf_mesh.xml	Thu Feb 25 09:11:56 2010 +0000
@@ -215,7 +215,9 @@
                         <inputvalue name="points" type="Boolean" value="false"/>
                     </parameters>
                     <exportModes>
+                        <export name="img" description="IMG-Export der Daten" mime-type="image/png" />
                         <export name="pdf" description="PDF-Export der Daten" mime-type="application/pdf" />
+                        <export name="svg" description="SVG-Export der Daten" mime-type="image/svg+xml" />
                     </exportModes>
                 </outputsMode>
                 <outputsMode name="histogram" description="Histogram of the Values" mime-type="image/png">
@@ -225,20 +227,13 @@
                         <inputvalue name="bincount" type="Integer" value="7"/>
                         <inputvalue name="binwidth" type="Integer" value="7"/>
                     </parameters>
-                </outputsMode>
-                <outputsMode name="svg" description="SVG-Export der Daten" mime-type="image/svg+xml">
-                    <parameters>
-                        <inputvalue name="width" type="Integer" value="600"/>
-                        <inputvalue name="height" type="Integer" value="400"/>
-                        <inputvalue name="points" type="Boolean" value="false"/>
-                    </parameters>
-                </outputsMode>
-                <outputsMode name="pdf" description="PDF-Export der Daten" mime-type="application/pdf">
-                    <parameters>
-                        <inputvalue name="width" type="Integer" value="600"/>
-                        <inputvalue name="height" type="Integer" value="400"/>
-                        <inputvalue name="points" type="Boolean" value="false"/>
-                    </parameters>
+                    <exportModes>
+                        <export name="img" description="IMG-Export der Daten" mime-type="image/png" />
+                        <!-- not yet implemented
+                        <export name="pdf" description="PDF-Export der Daten" mime-type="application/pdf" />
+                        <export name="svg" description="SVG-Export der Daten" mime-type="image/svg+xml" />
+                        -->
+                    </exportModes>
                 </outputsMode>
                 <outputsMode name="csv" description="CSV-Export der Daten" mime-type="text/plain"/>
                 <outputsMode name="odv" description="ODV-Export der Daten" mime-type="text/plain"/>
--- a/gnv-artifacts/doc/conf/products/timeseries/conf_timeseriespoint.xml	Thu Feb 25 09:06:36 2010 +0000
+++ b/gnv-artifacts/doc/conf/products/timeseries/conf_timeseriespoint.xml	Thu Feb 25 09:11:56 2010 +0000
@@ -198,7 +198,9 @@
                         <inputvalue name="points" type="Boolean" value="false"/>
                     </parameters>
                     <exportModes>
+                        <export name="img" description="IMG-Export der Daten" mime-type="image/png" />
                         <export name="pdf" description="PDF-Export der Daten" mime-type="application/pdf" />
+                        <export name="svg" description="SVG-Export der Daten" mime-type="image/svg+xml" />
                     </exportModes>
                 </outputsMode>
                 <outputsMode name="histogram" description="Histogram of the Values" mime-type="image/png">
@@ -208,20 +210,13 @@
                         <inputvalue name="bincount" type="Integer" value="7"/>
                         <inputvalue name="binwidth" type="Integer" value="7"/>
                     </parameters>
-                </outputsMode>
-                <outputsMode name="pdf" description="PDF-Export der Daten" mime-type="application/pdf">
-                    <parameters>
-                        <inputvalue name="width" type="Integer" value="600"/>
-                        <inputvalue name="height" type="Integer" value="400"/>
-                        <inputvalue name="points" type="Boolean" value="false"/>
-                    </parameters>
-                </outputsMode>
-                <outputsMode name="svg" description="SVG-Export der Daten" mime-type="image/svg+xml">
-                    <parameters>
-                        <inputvalue name="width" type="Integer" value="600"/>
-                        <inputvalue name="height" type="Integer" value="400"/>
-                        <inputvalue name="points" type="Boolean" value="false"/>
-                    </parameters>
+                    <exportModes>
+                        <export name="img" description="IMG-Export der Daten" mime-type="image/png" />
+                        <!-- not yet implemented
+                        <export name="pdf" description="PDF-Export der Daten" mime-type="application/pdf" />
+                        <export name="svg" description="SVG-Export der Daten" mime-type="image/svg+xml" />
+                        -->
+                    </exportModes>
                 </outputsMode>
                 <outputsMode name="csv" description="CSV-Export der Daten" mime-type="text/plain"/>
                 <outputsMode name="odv" description="ODV-Export der Daten" mime-type="text/plain"/>
--- a/gnv-artifacts/doc/conf/products/verticalcrosssection/conf_mesh.xml	Thu Feb 25 09:06:36 2010 +0000
+++ b/gnv-artifacts/doc/conf/products/verticalcrosssection/conf_mesh.xml	Thu Feb 25 09:11:56 2010 +0000
@@ -169,19 +169,12 @@
                          <inputvalue name="width" type="Integer" value="600"/>
                          <inputvalue name="height" type="Integer" value="400"/>
                      </parameters>
+                     <exportModes>
+                        <export name="img" description="IMG-Export der Daten" mime-type="image/png" />
+                        <export name="pdf" description="PDF-Export der Daten" mime-type="application/pdf" />
+                        <export name="svg" description="SVG-Export der Daten" mime-type="image/svg+xml" />
+                    </exportModes>
                  </outputsMode>
-                 <outputsMode name="pdf" description="PDF-Export der Daten" mime-type="application/pdf">
-                    <parameters>
-                        <inputvalue name="width" type="Integer" value="600"/>
-                        <inputvalue name="height" type="Integer" value="400"/>
-                    </parameters>
-                </outputsMode>
-                 <outputsMode name="svg" description="SVG-Export der Daten" mime-type="image/svg+xml">
-                    <parameters>
-                        <inputvalue name="width" type="Integer" value="600"/>
-                        <inputvalue name="height" type="Integer" value="400"/>
-                    </parameters>
-                </outputsMode>
              </outputsModes>
          </state>
      </states>
--- a/gnv-artifacts/doc/conf/products/verticalprofile/conf_instantaneouspoint.xml	Thu Feb 25 09:06:36 2010 +0000
+++ b/gnv-artifacts/doc/conf/products/verticalprofile/conf_instantaneouspoint.xml	Thu Feb 25 09:11:56 2010 +0000
@@ -102,21 +102,19 @@
                         <inputvalue name="bincount" type="Integer" value="7"/>
                         <inputvalue name="binwidth" type="Integer" value="7"/>
                     </parameters>
+                    <exportModes>
+                        <export name="img" description="IMG-Export der Daten" mime-type="image/png" />
+                        <export name="pdf" description="PDF-Export der Daten" mime-type="application/pdf" />
+                        <export name="svg" description="SVG-Export der Daten" mime-type="image/svg+xml" />
+                    </exportModes> 
                 </outputsMode>
-             <outputsMode name="pdf" description="PDF-Export der Daten" mime-type="application/pdf">
-                    <parameters>
-                        <inputvalue name="width" type="Integer" value="600"/>
-                        <inputvalue name="height" type="Integer" value="400"/>
-                        <inputvalue name="points" type="Boolean" value="false"/>
-                    </parameters>
-                </outputsMode>
-             <outputsMode name="svg" description="SVG-Export der Daten" mime-type="image/svg+xml">
-                    <parameters>
-                        <inputvalue name="width" type="Integer" value="600"/>
-                        <inputvalue name="height" type="Integer" value="400"/>
-                        <inputvalue name="points" type="Boolean" value="false"/>
-                    </parameters>
-                </outputsMode>
+                <exportModes>
+                        <export name="img" description="IMG-Export der Daten" mime-type="image/png" />
+                        <!-- not implemented yet
+                        <export name="pdf" description="PDF-Export der Daten" mime-type="application/pdf" />
+                        <export name="svg" description="SVG-Export der Daten" mime-type="image/svg+xml" />
+                        -->
+                    </exportModes>
              <outputsMode name="csv" description="CSV-Export der Daten" mime-type="text/plain"/>
              <outputsMode name="odv" description="ODV-Export der Daten" mime-type="text/plain"/>
              <outputsMode name="statistics" description="Statistik zu den Daten" mime-type="text/xml"/>
--- a/gnv-artifacts/doc/conf/products/verticalprofile/conf_mesh.xml	Thu Feb 25 09:06:36 2010 +0000
+++ b/gnv-artifacts/doc/conf/products/verticalprofile/conf_mesh.xml	Thu Feb 25 09:11:56 2010 +0000
@@ -230,6 +230,11 @@
                        <inputvalue name="height" type="Integer" value="400"/>
                        <inputvalue name="points" type="Boolean" value="false"/>
                    </parameters>
+                   <exportModes>
+                       <export name="img" description="IMG-Export der Daten" mime-type="image/png" />
+                       <export name="pdf" description="PDF-Export der Daten" mime-type="application/pdf" />
+                       <export name="svg" description="SVG-Export der Daten" mime-type="image/svg+xml" />
+                   </exportModes>
                </outputsMode>
                <outputsMode name="histogram" description="Histogram of the Values" mime-type="image/png">
                     <parameters>
@@ -238,20 +243,13 @@
                         <inputvalue name="bincount" type="Integer" value="7"/>
                         <inputvalue name="binwidth" type="Integer" value="7"/>
                     </parameters>
-                </outputsMode>
-               <outputsMode name="pdf" description="PDF-Export der Daten" mime-type="application/pdf">
-                    <parameters>
-                        <inputvalue name="width" type="Integer" value="600"/>
-                        <inputvalue name="height" type="Integer" value="400"/>
-                        <inputvalue name="points" type="Boolean" value="false"/>
-                    </parameters>
-                </outputsMode>
-               <outputsMode name="svg" description="SVG-Export der Daten" mime-type="image/svg+xml">
-                    <parameters>
-                        <inputvalue name="width" type="Integer" value="600"/>
-                        <inputvalue name="height" type="Integer" value="400"/>
-                        <inputvalue name="points" type="Boolean" value="false"/>
-                    </parameters>
+                    <exportModes>
+                        <export name="img" description="IMG-Export der Daten" mime-type="image/png" />
+                        <!-- not implemented yet
+                        <export name="pdf" description="PDF-Export der Daten" mime-type="application/pdf" />
+                        <export name="svg" description="SVG-Export der Daten" mime-type="image/svg+xml" />
+                        -->
+                    </exportModes>
                 </outputsMode>
                <outputsMode name="csv" description="CSV-Export der Daten" mime-type="text/plain"/>
                <outputsMode name="odv" description="ODV-Export der Daten" mime-type="text/plain"/>
--- a/gnv-artifacts/doc/conf/products/verticalprofile/conf_timeseriespoint.xml	Thu Feb 25 09:06:36 2010 +0000
+++ b/gnv-artifacts/doc/conf/products/verticalprofile/conf_timeseriespoint.xml	Thu Feb 25 09:11:56 2010 +0000
@@ -168,6 +168,11 @@
                         <inputvalue name="height" type="Integer" value="400"/>
                         <inputvalue name="points" type="Boolean" value="false"/>
                     </parameters>
+                    <exportModes>
+                       <export name="img" description="IMG-Export der Daten" mime-type="image/png" />
+                       <export name="pdf" description="PDF-Export der Daten" mime-type="application/pdf" />
+                       <export name="svg" description="SVG-Export der Daten" mime-type="image/svg+xml" />
+                    </exportModes>
                 </outputsMode>
                 <outputsMode name="histogram" description="Histogram of the Values" mime-type="image/png">
                     <parameters>
@@ -176,20 +181,13 @@
                         <inputvalue name="bincount" type="Integer" value="7"/>
                         <inputvalue name="binwidth" type="Integer" value="7"/>
                     </parameters>
-                </outputsMode>
-                <outputsMode name="pdf" description="PDF-Export der Daten" mime-type="application/pdf">
-                    <parameters>
-                        <inputvalue name="width" type="Integer" value="600"/>
-                        <inputvalue name="height" type="Integer" value="400"/>
-                        <inputvalue name="points" type="Boolean" value="false"/>
-                    </parameters>
-                </outputsMode>
-                <outputsMode name="svg" description="SVG-Export der Daten" mime-type="image/svg+xml">
-                    <parameters>
-                        <inputvalue name="width" type="Integer" value="600"/>
-                        <inputvalue name="height" type="Integer" value="400"/>
-                        <inputvalue name="points" type="Boolean" value="false"/>
-                    </parameters>
+                    <exportModes>
+                       <export name="img" description="IMG-Export der Daten" mime-type="image/png" />
+                       <!-- not implemented yet
+                       <export name="pdf" description="PDF-Export der Daten" mime-type="application/pdf" />
+                       <export name="svg" description="SVG-Export der Daten" mime-type="image/svg+xml" />
+                       -->
+                    </exportModes>
                 </outputsMode>
                 <outputsMode name="csv" description="CSV-Export der Daten" mime-type="text/plain"/>
                 <outputsMode name="odv" description="ODV-Export der Daten" mime-type="text/plain"/>

http://dive4elements.wald.intevation.org