# HG changeset patch
# User Tim Englich <tim.englich@intevation.de>
# Date 1275913320 0
# Node ID 0d15e515f88d3ff0ecef31e28fcae526bc7322fd
# Parent  a4e490e0af5bba985ea5668b30a08bba74a94659
revert wrong commit of conf.xml of revision 1163

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

diff -r a4e490e0af5b -r 0d15e515f88d gnv-artifacts/ChangeLog
--- a/gnv-artifacts/ChangeLog	Mon Jun 07 12:17:57 2010 +0000
+++ b/gnv-artifacts/ChangeLog	Mon Jun 07 12:22:00 2010 +0000
@@ -1,3 +1,18 @@
+2010-06-07  Tim Englich  <tim.englich@intevation.de>
+
+	* doc/conf/conf.xml: 
+	  Revert wrong Commit Revision 1163.
+
+2010-06-07  Tim Englich  <tim.englich@intevation.de>
+
+	* doc/conf/maptemplates/horizontalcrosssection_*.vm, 
+	  doc/conf/maptemplates/layer_polygon.vm, 
+	  doc/conf/maptemplates/layer_point.vm, 
+	  doc/conf/maptemplates/layer_linestring.vm: 
+	  Added Configuration Elements TEMPLATE, DUMP, TOLERANCE and 
+	  METADATA/gml_include_items to enable GetFeatureInforRequests using gml
+	  as INFO_FORMAT for products of type layer.
+
 2010-06-07  Tim Englich  <tim.englich@intevation.de>
 
 	* doc/conf/maptemplates/mapfile.vm: 
diff -r a4e490e0af5b -r 0d15e515f88d gnv-artifacts/doc/conf/conf.xml
--- a/gnv-artifacts/doc/conf/conf.xml	Mon Jun 07 12:17:57 2010 +0000
+++ b/gnv-artifacts/doc/conf/conf.xml	Mon Jun 07 12:22:00 2010 +0000
@@ -3,6 +3,8 @@
     <factories>
         <context-factory>de.intevation.gnv.artifacts.context.GNVArtifactContextFactory</context-factory>
         <artifact-factories>
+            <!-- All Artifactfactories which are available in this Database. 
+                 Each Artifactfactory represents one FIS. -->
             <artifact-factory name="fis_marnet" description="Factory to create an artifact to be used with the FIS Marnet"  
                               ttl="3600000" artifact="de.intevation.artifactdatabase.ProxyArtifact">de.intevation.gnv.artifacts.GNVProductArtifactFactory</artifact-factory>
             <artifact-factory name="fis_imis" description="Factory to create an artifact to be used with the FIS IMIS"  
@@ -41,15 +43,9 @@
                               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-factory name='fis_justanewfis' 
-                              description='Factory to create an artifact to be used with the FIS NEWFISNAME'  
-                              ttl='3600000' 
-                              artifact='de.intevation.artifactdatabase.ProxyArtifact'>
-                   de.intevation.gnv.artifacts.GNVProductArtifactFactory
-         </artifact-factory>
-            
         </artifact-factories>
         <service-factories>
+            <!-- The Servicefactory which is responsible to handle MV-GNV-Interface-Calls -->
             <service-factory
                 name="metadata"
                 service="de.intevation.gnv.artifacts.services.MetaDataService"
@@ -61,25 +57,6 @@
           which will be Access using separate Artifacts.
           Those Artifacts are configured below these Section.-->
     <artifacts>
-    <artifact name='fis_justanewfis'>
-        <products>
-            <product name= "timeSeries">
-                 <artifact-factory name="timeSeries" 
-                                   description="Artiefactfactory for Instantiating the Artifact for TimeSeries on TimeSeriesPoints"  
-                                   ttl="300000" 
-                                   artifact="de.intevation.gnv.timeseries.TimeSeriesArtifact">
-                                   de.intevation.gnv.artifacts.GNVArtifactFactory
-                 </artifact-factory>
-                 <parameters>
-                     <parameter name="sourceid" 
-                              value="4"/>
-                     <parameter name="fisname" 
-                              value="fis_justanewfis"/>
-                 </parameters>
-             </product>
-       </products>
-        </artifact>
-    
         <artifact name="fis_marnet">
             <products>
                 <product name= "timeSeries">
@@ -449,7 +426,6 @@
               of the FIS above.
               The product-Artifacts can be configured here or can be referenced
               using an xlink:href-Attribute. -->
-              
         <artifact name="timeSeries" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${artifacts.config.dir}/products/timeseries/conf_timeseriespoint.xml" />
         <artifact name="timeSeriesMesh" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${artifacts.config.dir}/products/timeseries/conf_mesh.xml" />
         
@@ -526,7 +502,7 @@
         <!-- In this section the required Configuration for mapfile generation is
              given. -->
         <map-generator>
-            <mapfile path="/vol1/home/tim/workspace/gnvdevelop/trunk/gnv-artifacts/doc/mapfiles/mapfile.map" />
+            <mapfile path="${artifacts.config.dir}/../mapfiles/mapfile.map" />
             <templates>
                 <path>${artifacts.config.dir}/maptemplates</path>
                 <maptemplate>mapfile.vm</maptemplate>
@@ -535,11 +511,14 @@
     </gnv>
 
     <mapserver>
-        <server path="http://localhost/cgi-bin/gnvwms" />
+       <!-- This Section configures the required Informations to provide the 
+            WMS-Exports -->
+        <server path="http://$YOURSERVER/cgi-bin/gnv-wms" />
     </mapserver>
 
     <velocity>
-        <logfile path="/vol1/home/tim/workspace/gnvdevelop/trunk/gnv-artifacts/doc/velocity.log" />
+        <!-- This Section configures all required settings for velocity. -->
+        <logfile path="/var/log/artifacts/velocity.log" />
     </velocity>
 
     <ehcache>
@@ -570,11 +549,13 @@
         <sleep-time>60000</sleep-time>
     </cleaner>
     <database>
+        <!-- This Section configures the Settings for connecting to the 
+             Artifact-Database instance. e.g. SQLite -->
         <user>SA</user>
         <password></password>
-        <url>jdbc:h2:${artifacts.config.dir}/artifacts.db</url>
+        <url>jdbc:h2:${artifacts.config.dir}/../artifactdb/artifacts.db</url>
         <!--driver>org.h2.Driver</driver> 
         <sql></sql> -->
     </database>
 
-</artifact-database>
\ No newline at end of file
+</artifact-database>