# HG changeset patch
# User Tim Englich <tim.englich@intevation.de>
# Date 1268996260 0
# Node ID 8dc8d04084d45e3f761fd291f81f7f92c255c3a2
# Parent  5d45357dbc6d3bdcdf8e11e65b7f360721cd3539
Integrated FIS Marine Features with Product Layer into the System.

gnv-artifacts/trunk@802 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 5d45357dbc6d -r 8dc8d04084d4 gnv-artifacts/ChangeLog
--- a/gnv-artifacts/ChangeLog	Fri Mar 19 10:02:15 2010 +0000
+++ b/gnv-artifacts/ChangeLog	Fri Mar 19 10:57:40 2010 +0000
@@ -1,3 +1,14 @@
+2010-03-19  Tim Englich  <tim.englich@intevation.de>
+
+	* src/main/resources/lang/artifactMessages*.properties: 
+	  Added Ressources for new FIS Marine Features.
+	
+	* doc/conf/conf.xml:
+	
+	  ISSUE 205
+	
+	  Integrated FIS Marine Features with Product Layer into the System.
+
 2010-03-19  Tim Englich  <tim.englich@intevation.de>
 
 	* doc/conf/queries.properties: 
diff -r 5d45357dbc6d -r 8dc8d04084d4 gnv-artifacts/doc/conf/conf.xml
--- a/gnv-artifacts/doc/conf/conf.xml	Fri Mar 19 10:02:15 2010 +0000
+++ b/gnv-artifacts/doc/conf/conf.xml	Fri Mar 19 10:57:40 2010 +0000
@@ -1,4 +1,5 @@
 <artifact-database>
+    <export-secret>BLABLABLBALBLABL</export-secret>
     <factories>
         <context-factory>de.intevation.gnv.artifacts.context.GNVArtifactContextFactory</context-factory>
         <artifact-factories>
@@ -38,6 +39,8 @@
                               ttl="3600000" artifact="de.intevation.artifactdatabase.ProxyArtifact">de.intevation.gnv.artifacts.GNVProductArtifactFactory</artifact-factory>
             <artifact-factory name="fis_contis" description="Factory to create an artifact to be used with the FIS Conthis"  
                               ttl="3600000" artifact="de.intevation.artifactdatabase.ProxyArtifact">de.intevation.gnv.artifacts.GNVProductArtifactFactory</artifact-factory>
+            <artifact-factory name="fis_marinefeatures" description="Factory to create an artifact to be used with the FIS Conthis"  
+                              ttl="3600000" artifact="de.intevation.artifactdatabase.ProxyArtifact">de.intevation.gnv.artifacts.GNVProductArtifactFactory</artifact-factory>
         </artifact-factories>
         <service-factories>
             <service-factory
@@ -401,6 +404,21 @@
             </products>
         </artifact>
         
+        <artifact name="fis_marinefeatures">
+            <products>
+                <product name= "layer">
+                    <artifact-factory name="layer" description="Artiefactfactory for Instantiating the Artifact for the Product Layer"
+                             ttl="300000" artifact="de.intevation.gnv.layer.LayerArtifact">de.intevation.gnv.artifacts.GNVArtifactFactory</artifact-factory>
+                    <parameters>
+                        <parameter name="sourceid" value="median%"/>
+                        <parameter name="fisname" value="fis_marinefeatures"/>
+                    </parameters>
+                </product>
+            </products>
+        </artifact>
+        
+        
+        
         <!--  Product specific Artifacts which are referenced by the Artifacts
               of the FIS above.
               The product-Artifacts can be configured here or can be referenced
@@ -481,7 +499,7 @@
 
         <!-- In this section the required Configuration for mapfile generation is
              given. -->
-        <map-generator>
+            <map-generator>
             <mapfile path="/opt/artifacts/mapfiles/mapfile.map" />
             <templates>
                 <path>${artifacts.config.dir}/maptemplates</path>
diff -r 5d45357dbc6d -r 8dc8d04084d4 gnv-artifacts/src/main/resources/lang/artifactMessages.properties
--- a/gnv-artifacts/src/main/resources/lang/artifactMessages.properties	Fri Mar 19 10:02:15 2010 +0000
+++ b/gnv-artifacts/src/main/resources/lang/artifactMessages.properties	Fri Mar 19 10:57:40 2010 +0000
@@ -16,6 +16,7 @@
 fis_icestations = Ice Station Report
 fis_nauthis = Nauthis
 fis_contis=Contis
+fis_marinefeatures = Marine Features
 
 meshid= Mesh
 fis = Data set
diff -r 5d45357dbc6d -r 8dc8d04084d4 gnv-artifacts/src/main/resources/lang/artifactMessages_de.properties
--- a/gnv-artifacts/src/main/resources/lang/artifactMessages_de.properties	Fri Mar 19 10:02:15 2010 +0000
+++ b/gnv-artifacts/src/main/resources/lang/artifactMessages_de.properties	Fri Mar 19 10:57:40 2010 +0000
@@ -16,6 +16,7 @@
 fis_icestations = Eismeldungen
 fis_nauthis = Nauthis
 fis_contis=Contis
+fis_marinefeatures = Marine Features
 
 fis = Fachinformationssystem
 product= Produkt
diff -r 5d45357dbc6d -r 8dc8d04084d4 gnv-artifacts/src/main/resources/lang/artifactMessages_de_DE.properties
--- a/gnv-artifacts/src/main/resources/lang/artifactMessages_de_DE.properties	Fri Mar 19 10:02:15 2010 +0000
+++ b/gnv-artifacts/src/main/resources/lang/artifactMessages_de_DE.properties	Fri Mar 19 10:57:40 2010 +0000
@@ -16,6 +16,7 @@
 fis_icestations = Eismeldungen
 fis_nauthis = Nauthis
 fis_contis=Contis
+fis_marinefeatures = Marine Features
 
 fis= Fachinformationssystem
 product= Produkt
diff -r 5d45357dbc6d -r 8dc8d04084d4 gnv-artifacts/src/main/resources/lang/artifactMessages_en.properties
--- a/gnv-artifacts/src/main/resources/lang/artifactMessages_en.properties	Fri Mar 19 10:02:15 2010 +0000
+++ b/gnv-artifacts/src/main/resources/lang/artifactMessages_en.properties	Fri Mar 19 10:57:40 2010 +0000
@@ -16,6 +16,7 @@
 fis_icestations = Ice Station Report
 fis_nauthis = Nauthis
 fis_contis=Contis
+fis_marinefeatures = Marine Features
 
 meshid= Mesh
 fis = Data set