--- a/flys-artifacts/ChangeLog	Thu Aug 11 12:24:31 2011 +0000
+++ b/flys-artifacts/ChangeLog	Thu Aug 11 12:43:00 2011 +0000
@@ -1,3 +1,10 @@
+2011-08-11  Felix Wolfsteller <felix.wolfsteller@intevation.de>
+
+	* doc/conf/conf.xml,
+	  doc/conf/artifacts/annotation.xml,
+	  doc/conf/meta-data-system.xml:
+	  Added configuration for AnnotationArtifacts.
+
 2011-08-11  Felix Wolfsteller <felix.wolfsteller@intevation.de>
 
 	Added demo- implementation of a AnnotationArtifact and its Facet.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/flys-artifacts/doc/conf/artifacts/annotation.xml	Thu Aug 11 12:43:00 2011 +0000
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<artifact name="annotation">
+    <states>
+        <state id="state.annotation.river"
+               description="state.annotation.river"
+               state="de.intevation.flys.artifacts.states.AnnotationRiverState">
+           <outputmodes>
+             <outputmode name="longitudinal_section" description="output.longitudinal_section" mime-type="image/png" type="chart">
+                  <facets>
+                     <facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations" />
+                  </facets>
+              </outputmode>
+           </outputmodes>
+        </state>
+    </states>
+</artifact>

--- a/flys-artifacts/doc/conf/conf.xml	Thu Aug 11 12:24:31 2011 +0000
+++ b/flys-artifacts/doc/conf/conf.xml	Thu Aug 11 12:43:00 2011 +0000
@@ -20,6 +20,9 @@
             <artifact-factory name="wmsbackground" description="Factory to create an artifact to be used in WINFO"
                 ttl="3600000"
                 artifact="de.intevation.flys.artifacts.WMSBackgroundArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+            <artifact-factory name="annotations" description="Factory to create an artifact to access Annotations for Points at rivers"
+                ttl="3600000"
+                artifact="de.intevation.flys.artifacts.AnnotationArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
         </artifact-factories>
 
         <user-factory name="default" description="Factory to create new users">de.intevation.artifactdatabase.DefaultUserFactory</user-factory>
@@ -60,6 +63,7 @@
     <artifacts>
         <artifact name="winfo" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${artifacts.config.dir}/artifacts/winfo.xml" />
         <artifact name="riveraxis" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${artifacts.config.dir}/artifacts/riveraxis.xml" />
+        <artifact name="annotation" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${artifacts.config.dir}/artifacts/annotation.xml" />
         <artifact name="wmsbackground" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${artifacts.config.dir}/artifacts/wmsbackground.xml" />
     </artifacts>
 

--- a/flys-artifacts/doc/conf/meta-data-system.xml	Thu Aug 11 12:24:31 2011 +0000
+++ b/flys-artifacts/doc/conf/meta-data-system.xml	Thu Aug 11 12:43:00 2011 +0000
@@ -204,12 +204,19 @@
         </dc:if>
         <dc:if test="dc:contains($artifact-outs, 'longitudinal_section')">
             <longitudinal-section>
+              <dc:call-macro name="longitudinal_section-recommended"/>
               <fixations><dc:attribute name="ref" value="fixations-${river_id}"/></fixations>
               <flood-protections><dc:attribute name="ref" value="flood-protections-${river_id}"/></flood-protections>
               <flood-water-marks><dc:attribute name="ref" value="flood-water-marks-${river_id}"/></flood-water-marks>
               <water-levels><dc:attribute name="ref" value="water-levels-${river_id}"/></water-levels>
               <extra-longitudinal-sections><dc:attribute name="ref" value="extra-longitudinal-sections-${river_id}"/></extra-longitudinal-sections>
             </longitudinal-section>
+            <dc:macro name="longitudinal_section-recommended">
+              <annotation>
+                        <dc:attribute name="factory" value="annotations"/>
+                        <dc:attribute name="db-ids" value="${river_id}"/>
+              </annotation>
+            </dc:macro>
         </dc:if>
         <dc:if test="dc:contains($artifact-outs, 'floodmap')">
             <floodmap>
@@ -223,6 +230,9 @@
             </dc:choose>
             </floodmap>
             <dc:macro name="flood-map-recommended">
+              <dc:comment>
+                 FIXME: Following two macros look identical to me.
+              </dc:comment>
                 <kilometrage>
                     <riveraxis>
                         <dc:attribute name="factory" value="riveraxis"/>