# HG changeset patch
# User Ingo Weinzierl <ingo.weinzierl@intevation.de>
# Date 1299508994 0
# Node ID 1a025ff0f7fda6fff4f28ce9d9a03c5492c33114
# Parent  47a4bc7a9ddf7b9a39cc2e38be933dc64eb2b3bb
Added a nodes for the user-factory and collection-factory to the configuration.

flys-artifacts/trunk@1414 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 47a4bc7a9ddf -r 1a025ff0f7fd flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Tue Mar 01 17:18:08 2011 +0000
+++ b/flys-artifacts/ChangeLog	Mon Mar 07 14:43:14 2011 +0000
@@ -1,3 +1,8 @@
+2011-03-07  Ingo Weinzierl <ingo@intevation.de>
+
+	* doc/conf/conf.xml: Added a section user-factory and collection-factory in
+	  the factories part of the configuration.
+
 2011-03-01  Ingo Weinzierl <ingo@intevation.de>
 
 	* src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java:
diff -r 47a4bc7a9ddf -r 1a025ff0f7fd flys-artifacts/doc/conf/conf.xml
--- a/flys-artifacts/doc/conf/conf.xml	Tue Mar 01 17:18:08 2011 +0000
+++ b/flys-artifacts/doc/conf/conf.xml	Mon Mar 07 14:43:14 2011 +0000
@@ -2,6 +2,13 @@
     <export-secret>YOUR_SECRET</export-secret>
     <factories>
         <context-factory>de.intevation.flys.artifacts.context.FLYSContextFactory</context-factory>
+
+        <collection-factory
+            name="DefaultArtifactCollectionFactory"
+            description="The default artifact collection factory"
+            ttl="60000"
+            artifact-collection="de.intevation.artifactdatabase.DefaultArtifactCollection">de.intevation.artifactdatabase.DefaultArtifactCollectionFactory</collection-factory>
+
         <artifact-factories>
             <!-- All Artifactfactories which are available in this Database.
                  Each Artifactfactory represents one river. -->
@@ -9,6 +16,8 @@
                 ttl="3600000"
                 artifact="de.intevation.flys.artifacts.WINFOArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
         </artifact-factories>
+
+        <user-factory name="default" description="Factory to create new users">de.intevation.artifactdatabase.DefaultUserFactory</user-factory>
     </factories>
 
     <artifacts>