Mercurial > dive4elements > gnv-client

changeset 215:c92a6e0ab79a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added Configuration and Ressources for two new FIS. Current Meter and Ice Station Reports gnv-artifacts/trunk@273 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Tim Englich <tim.englich@intevation.de>
date Wed, 28 Oct 2009 09:53:57 +0000
parents 17beafef6a97
children 9db263ee2678
files gnv-artifacts/ChangeLog gnv-artifacts/doc/conf/conf.xml gnv-artifacts/src/main/resources/lang/artifactMessages.properties gnv-artifacts/src/main/resources/lang/artifactMessages_de.properties gnv-artifacts/src/main/resources/lang/artifactMessages_de_DE.properties gnv-artifacts/src/main/resources/lang/artifactMessages_en.properties
diffstat 6 files changed, 76 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/gnv-artifacts/ChangeLog	Tue Oct 27 16:16:49 2009 +0000
+++ b/gnv-artifacts/ChangeLog	Wed Oct 28 09:53:57 2009 +0000
@@ -1,9 +1,16 @@
+2009-10-28  Tim Englich  <tim.englich@intevation.de>
+
+	* doc/conf/conf.xml: 
+	  Added Configuration for two new FIS. Current Meter and Ice Station Reports
+	* src/main/resources/lang/artifactMessages*.properties: 
+	  Added Ressources for two new FIS. Current Meter and Ice Station Reports
+
 2009-10-27  Tim Englich  <tim.englich@intevation.de>
 
 	* doc/conf/conf.xml: 
-	  Added Configuration for two new FIS. Seegangsarchiv und SEACAT
+	  Added Configuration for two new FIS. Sea State and SEACAT
 	* src/main/resources/lang/artifactMessages*.properties: 
-	  Added Ressources for two new FIS. Seegangsarchiv und SEACAT
+	  Added Ressources for two new FIS. Sea State and SEACAT
 	
 2009-10-27  Tim Englich  <tim.englich@intevation.de>
 	* src/main/resources/lang/artifactMessages*.properties: 
--- a/gnv-artifacts/doc/conf/conf.xml	Tue Oct 27 16:16:49 2009 +0000
+++ b/gnv-artifacts/doc/conf/conf.xml	Wed Oct 28 09:53:57 2009 +0000
@@ -12,7 +12,9 @@
                               ttl="300000" artifact="de.intevation.gnv.artifacts.fis.FISArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="fis_eisklimatologie" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata"  
                               ttl="300000" artifact="de.intevation.gnv.artifacts.fis.FISArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
-           <artifact-factory name="fis_sst" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata"  
+            <artifact-factory name="fis_icestations" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata"  
+                              ttl="300000" artifact="de.intevation.gnv.artifacts.fis.FISArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+            <artifact-factory name="fis_sst" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata"  
                               ttl="300000" artifact="de.intevation.gnv.artifacts.fis.FISArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="fis_delphin" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata"  
                               ttl="300000" artifact="de.intevation.gnv.artifacts.fis.FISArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
@@ -28,7 +30,9 @@
                               ttl="300000" artifact="de.intevation.gnv.artifacts.fis.FISArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="fis_seacat" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata"  
                               ttl="300000" artifact="de.intevation.gnv.artifacts.fis.FISArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
-            <artifact-factory name="fis_wavearchive" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata"  
+            <artifact-factory name="fis_seastate" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata"  
+                              ttl="300000" artifact="de.intevation.gnv.artifacts.fis.FISArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+            <artifact-factory name="fis_currentmeter" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata"  
                               ttl="300000" artifact="de.intevation.gnv.artifacts.fis.FISArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
         </artifact-factories>
     </factories>
@@ -53,6 +57,7 @@
                 </product>
             </products>
         </artifact>
+        
         <artifact name="fis_seacat">
             <products>
                 <product name= "timeSeries">
@@ -65,18 +70,33 @@
                 </product>
             </products>
         </artifact>
-        <artifact name="fis_wavearchive">
+        
+        <artifact name="fis_currentmeter">
+            <products>
+                <product name= "timeSeries">
+                    <artifact-factory name="timeSeries" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata"  
+                             ttl="300000" artifact="de.intevation.gnv.timeseries.TimeSeriesArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                    <parameters>
+                        <parameter name="sourceid" value="33"/>
+                        <parameter name="fisname" value="fis_currentmeter"/>
+                    </parameters>
+                </product>
+            </products>
+        </artifact>
+        
+        <artifact name="fis_seastate">
             <products>
                 <product name= "timeSeries">
                     <artifact-factory name="timeSeries" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata"  
                              ttl="300000" artifact="de.intevation.gnv.timeseries.TimeSeriesArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
                     <parameters>
                         <parameter name="sourceid" value="20"/>
-                        <parameter name="fisname" value="fis_wavearchive"/>
+                        <parameter name="fisname" value="fis_seastate"/>
                     </parameters>
                 </product>
             </products>
         </artifact>
+        
         <artifact name="fis_imis">
             <products>
                 <product name= "timeSeries">
@@ -97,6 +117,7 @@
                 </product>
             </products>
         </artifact>
+        
         <artifact name="fis_staun">
             <products>
                 <product name= "timeSeries">
@@ -117,6 +138,7 @@
                 </product>
             </products>
         </artifact>
+        
         <artifact name="fis_modeldata">
             <products>
                 <product name= "timeSeries">
@@ -151,12 +173,9 @@
                         <parameter name="fisname" value="fis_modeldata"/>
                     </parameters>
                 </product>
-                
-                
-                
-                
             </products>
         </artifact>
+
         <artifact name="fis_eisklimatologie">
             <products>
                 <product name= "timeSeries">
@@ -177,6 +196,20 @@
                 </product>
             </products>
         </artifact>
+        
+        <artifact name="fis_icestations">
+            <products>
+                <product name= "timeSeries">
+                    <artifact-factory name="timeSeries" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata"  
+                              ttl="300000" artifact="de.intevation.gnv.timeseries.TimeSeriesArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                    <parameters>
+                        <parameter name="sourceid" value="38"/>
+                        <parameter name="fisname" value="fis_icestations"/>
+                    </parameters>
+                </product>
+            </products>
+        </artifact>
+        
         <artifact name="fis_sst">
             <products>
                 <product name= "timeSeries">
@@ -203,6 +236,7 @@
                 </product>
             </products>
         </artifact>
+        
         <artifact name="fis_delphin">
             <products>
                 <product name= "horizontalProfile">
@@ -216,6 +250,7 @@
                 
             </products>
         </artifact>
+        
         <artifact name="fis_thermosalinograph">
             <products>
                 <product name= "horizontalProfile">
@@ -229,6 +264,7 @@
                 
             </products>
         </artifact>
+        
         <artifact name="fis_chemusurvey">
             <products>
                 <product name= "horizontalProfile">
@@ -242,8 +278,17 @@
                 
             </products>
         </artifact>
+        
         <artifact name="fis_gts">
             <products>
+                <product name= "timeSeries">
+                    <artifact-factory name="timeSeries" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata"  
+                             ttl="300000" artifact="de.intevation.gnv.timeseries.TimeSeriesArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                    <parameters>
+                        <parameter name="sourceid" value="5"/>
+                        <parameter name="fisname" value="fis_gts"/>
+                    </parameters>
+                </product>
                 <product name= "verticalProfile">
                     <artifact-factory name="verticalProfileInstantaneousPoint" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata"  
                              ttl="300000" artifact="de.intevation.gnv.profile.vertical.VerticalProfileInstantaneousPointArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
@@ -254,6 +299,7 @@
                 </product>
             </products>
         </artifact>
+        
         <artifact name="fis_bsh_ctd">
             <products>
                 <product name= "verticalProfile">
@@ -266,6 +312,7 @@
                 </product>
             </products>
         </artifact>
+        
         <artifact name="fis_bsh_xbt">
             <products>
                 <product name= "verticalProfile">
@@ -279,7 +326,6 @@
             </products>
         </artifact>
         
-        
         <artifact name="timeSeries" xlink:href="${artifacts.config.dir}/products/timeseries/conf_timeseriespoint.xml" />
         <artifact name="timeSeriesMesh" xlink:href="${artifacts.config.dir}/products/timeseries/conf_mesh.xml" />
         
--- a/gnv-artifacts/src/main/resources/lang/artifactMessages.properties	Tue Oct 27 16:16:49 2009 +0000
+++ b/gnv-artifacts/src/main/resources/lang/artifactMessages.properties	Wed Oct 28 09:53:57 2009 +0000
@@ -10,8 +10,10 @@
 fis_bsh_xbt = XBT
 fis_eisklimatologie = Eisklimatologie
 fis_sst = SST
-fis_wavearchive = Wavearchiv
+fis_seastate = Sea State
 fis_seacat = SeaCat
+fis_currentmeter = Current Meter
+fis_icestations = Ice Station Report
 
 meshid= Mesh
 product= Product
--- a/gnv-artifacts/src/main/resources/lang/artifactMessages_de.properties	Tue Oct 27 16:16:49 2009 +0000
+++ b/gnv-artifacts/src/main/resources/lang/artifactMessages_de.properties	Wed Oct 28 09:53:57 2009 +0000
@@ -10,8 +10,10 @@
 fis_bsh_xbt = XBT
 fis_eisklimatologie = Eisklimatologie
 fis_sst = SST
-fis_wavearchive = Seegangsarchiv
+fis_seastate = Seegangsarchiv
 fis_seacat = SeaCat
+fis_currentmeter = Strommesser
+fis_icestations = Eismeldungen
 
 product= Produkt
 timeSeries= Zeitserie
--- a/gnv-artifacts/src/main/resources/lang/artifactMessages_de_DE.properties	Tue Oct 27 16:16:49 2009 +0000
+++ b/gnv-artifacts/src/main/resources/lang/artifactMessages_de_DE.properties	Wed Oct 28 09:53:57 2009 +0000
@@ -10,8 +10,10 @@
 fis_bsh_xbt = XBT
 fis_eisklimatologie = Eisklimatologie
 fis_sst = SST
-fis_wavearchive = Seegangsarchiv
+fis_seastate = Seegangsarchiv
 fis_seacat = SeaCat
+fis_currentmeter = Strommesser
+fis_icestations = Eismeldungen
 
 product= Produkt
 timeSeries= Zeitserie
--- a/gnv-artifacts/src/main/resources/lang/artifactMessages_en.properties	Tue Oct 27 16:16:49 2009 +0000
+++ b/gnv-artifacts/src/main/resources/lang/artifactMessages_en.properties	Wed Oct 28 09:53:57 2009 +0000
@@ -10,8 +10,10 @@
 fis_bsh_xbt = XBT
 fis_eisklimatologie = Iceclimatology
 fis_sst = SST
-fis_wavearchive = Wavearchiv
+fis_seastate = Sea State
 fis_seacat = SeaCat
+fis_currentmeter = Current Meter
+fis_icestations = Ice Station Report
 
 meshid= Mesh
 product= Product
http://dive4elements.wald.intevation.org