--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/context/GNVArtifactContextFactory.java	Wed Jun 02 09:52:39 2010 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/context/GNVArtifactContextFactory.java	Thu Jun 03 16:10:27 2010 +0000
@@ -15,6 +15,8 @@
 
 import de.intevation.gnv.geobackend.base.query.container.exception.QueryContainerException;
 
+import de.intevation.gnv.geobackend.config.Configuration;
+
 import de.intevation.gnv.raster.Filter;
 import de.intevation.gnv.raster.Palette;
 import de.intevation.gnv.raster.PaletteManager;
@@ -34,11 +36,14 @@
 import java.util.HashMap;
 import java.util.Properties;
 
+import javax.xml.xpath.XPathConstants;
+
 import org.apache.log4j.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
+import org.w3c.dom.Node;
 
 /**
  * This factory class is used to create new GNVArtfactContext objects,
@@ -59,7 +64,7 @@
      *
      */
     public static final String XPATH_GEOBACKEND_CONFIGURATION =
-        "artifact-database/geo-backend/backend-configuration";
+        "artifact-database/geo-backend";
 
     /**
      *
@@ -171,25 +176,8 @@
         GNVArtifactContext returnValue = null;
         try {
             log.debug("GNVArtifactContextFactory.createArtifactContext");
-            log.info("Initialisation of the Geo-BackendConnectionPool");
-            String backendConfigurationFile = Config.getStringXPath(config,
-                    XPATH_GEOBACKEND_CONFIGURATION);
-            backendConfigurationFile = Config.replaceConfigDir(
-                backendConfigurationFile);
 
-            Properties properties = getProperties(backendConfigurationFile);
-            ConnectionPoolFactory cpf = ConnectionPoolFactory.getInstance();
-            cpf.initializeConnectionPool(properties);
-
-            log.info("Initialisation of the QueryContainer");
-            String queryConfigurationFile = Config.getStringXPath(config,
-                    XPATH_GEOBACKEND_QUERYCONFIGURATION);
-            queryConfigurationFile = Config.replaceConfigDir(
-                queryConfigurationFile);
-
-            Properties queryProperties = getProperties(queryConfigurationFile);
-            QueryContainerFactory qcf = QueryContainerFactory.getInstance();
-            qcf.initializeQueryContainer(queryProperties);
+            configureGeoBackend(config);
 
             configureCache(config);
 
@@ -217,6 +205,14 @@
         return returnValue;
     }
 
+    protected void configureGeoBackend(Document config)
+    throws FileNotFoundException, IOException, QueryContainerException
+    {
+        Configuration geoConf = Configuration.getInstance();
+        String configDir      = Config.getConfigDirectory().getAbsolutePath();
+        geoConf.init(config, configDir, Config.CONFIG_DIR_PLACEHOLDER);
+    }
+
     /**
      *
      * @param config