# HG changeset patch
# User Ingo Weinzierl <ingo.weinzierl@intevation.de>
# Date 1299005134 0
# Node ID 0245a87df368546975bd5f7f90e1144604d3f935
# Parent  76744dcbe82614c9b6166ec9f821d6f080d4c0e3
Made the user factory available in the artifact database.

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

diff -r 76744dcbe826 -r 0245a87df368 ChangeLog
--- a/ChangeLog	Tue Mar 01 17:49:17 2011 +0000
+++ b/ChangeLog	Tue Mar 01 18:45:34 2011 +0000
@@ -1,3 +1,11 @@
+2011-03-01  Ingo Weinzierl <ingo@intevation.de>
+
+	* artifact-database/src/main/java/de/intevation/artifactdatabase/ArtifactDatabaseImpl.java:
+	  Setup the user factory.
+
+	* artifact-database/src/main/java/de/intevation/artifactdatabase/FactoryBootstrap.java:
+	  New method to retrieve the user factory.
+
 2011-03-01  Ingo Weinzierl <ingo@intevation.de>
 
 	* artifact-database/doc/example-conf/conf.xml: Added a user-factory
diff -r 76744dcbe826 -r 0245a87df368 artifact-database/src/main/java/de/intevation/artifactdatabase/ArtifactDatabaseImpl.java
--- a/artifact-database/src/main/java/de/intevation/artifactdatabase/ArtifactDatabaseImpl.java	Tue Mar 01 17:49:17 2011 +0000
+++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/ArtifactDatabaseImpl.java	Tue Mar 01 18:45:34 2011 +0000
@@ -350,6 +350,11 @@
     protected HashMap     name2service;
 
     /**
+     * The factory that is used to create and list users.
+     */
+    protected UserFactory userFactory;
+
+    /**
      * Reference to the storage backend.
      */
     protected Backend     backend;
@@ -399,6 +404,7 @@
 
         setupArtifactFactories(bootstrap);
         setupServices(bootstrap);
+        setupUserFactory(bootstrap);
 
         context      = bootstrap.getContext();
         exportSecret = bootstrap.getExportSecret();
@@ -431,6 +437,14 @@
         }
     }
 
+
+    /**
+     * Used to extract the user factory from the bootstrap.
+     */
+    protected void setupUserFactory(FactoryBootstrap bootstrap) {
+        userFactory = bootstrap.getUserFactory();
+    }
+
     /**
      * Used to extract the service factories from the bootstrap
      * parameters, setting up the services and building the internal
diff -r 76744dcbe826 -r 0245a87df368 artifact-database/src/main/java/de/intevation/artifactdatabase/FactoryBootstrap.java
--- a/artifact-database/src/main/java/de/intevation/artifactdatabase/FactoryBootstrap.java	Tue Mar 01 17:49:17 2011 +0000
+++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/FactoryBootstrap.java	Tue Mar 01 18:45:34 2011 +0000
@@ -328,6 +328,15 @@
     }
 
     /**
+     * Returns the user factory.
+     *
+     * @return the user factory.
+     */
+    public UserFactory getUserFactory() {
+        return userFactory;
+    }
+
+    /**
      * Returns the global context created by the global context factory.
      * @return The global context.
      */