# HG changeset patch
# User Tim Englich <tim.englich@intevation.de>
# Date 1256123428 0
# Node ID 226091ed3cbd8b36312de0ecd211e8bc0f336e1a
# Parent  d0bad2d374fd18954486e0c7ab680e4a205c99fb
Added relative locations for further required Configurationfiles . issue59

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

diff -r d0bad2d374fd -r 226091ed3cbd gnv-artifacts/ChangeLog
--- a/gnv-artifacts/ChangeLog	Wed Oct 21 10:36:38 2009 +0000
+++ b/gnv-artifacts/ChangeLog	Wed Oct 21 11:10:28 2009 +0000
@@ -1,9 +1,16 @@
 2009-10-21  Tim Englich  <tim.englich@intevation.de>
 
+	* doc/conf/conf.xml: 
+	  Added relative locations for further required configurationfiles . issue59 
+	* src/main/java/de/intevation/gnv/artifacts/context/GNVArtifactContextFactory.java (createArtifactContext):
+	 Added the prossibility to configure the location of required configurationfiles not absolute. issue59 
+	
+2009-10-21  Tim Englich  <tim.englich@intevation.de>
+	
 	* doc/conf/arcsdeconnectionpool.properties: 
-	  Added separat ConnectionPoolPrperties to this Project.
+	  Added separat ConnectionPoolProperties to this Project.
 	* doc/conf/*: 
-	  Moved ConfigurationFiles from /src/test/ressources to doc/conf
+	  Moved ConfigurationFiles from src/test/ressources to doc/conf
 	* src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java (configurationDir): 
 	  Changed Configuration Folder to doc/conf
 
diff -r d0bad2d374fd -r 226091ed3cbd gnv-artifacts/doc/conf/conf.xml
--- a/gnv-artifacts/doc/conf/conf.xml	Wed Oct 21 10:36:38 2009 +0000
+++ b/gnv-artifacts/doc/conf/conf.xml	Wed Oct 21 11:10:28 2009 +0000
@@ -1046,11 +1046,11 @@
            
     </artifacts>
     <ehcache>
-        <configuration>doc/conf/ehcache.xml</configuration>
+        <configuration>${artifacts.config.dir}/ehcache.xml</configuration>
     </ehcache>
     <geo-backend>
-        <backend-configuration>doc/conf/arcsdeconnectionpool.properties</backend-configuration>
-        <query-configuration>doc/conf/queries.properties</query-configuration>
+        <backend-configuration>${artifacts.config.dir}/arcsdeconnectionpool.properties</backend-configuration>
+        <query-configuration>${artifacts.config.dir}/queries.properties</query-configuration>
     </geo-backend>
     <rest-server>
         <port>8181</port>
@@ -1060,7 +1060,7 @@
         <sleep-time>300000</sleep-time>
     </cleaner>
     <database>
-        <user></user>
+        <user>SA</user>
         <password></password>
         <!--url>jdbc:h2:src/test/ressources/artifacts.db</url>
         <driver>org.h2.Driver</driver> 
diff -r d0bad2d374fd -r 226091ed3cbd gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/context/GNVArtifactContextFactory.java
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/context/GNVArtifactContextFactory.java	Wed Oct 21 10:36:38 2009 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/context/GNVArtifactContextFactory.java	Wed Oct 21 11:10:28 2009 +0000
@@ -53,6 +53,8 @@
             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);
@@ -60,6 +62,8 @@
             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);
@@ -67,6 +71,7 @@
             log.info("Initialisation of the Cache");
             String cacheConfigurationFile = Config.getStringXPath(config,
                     CACHECONFIGNODEPATH);
+            cacheConfigurationFile = Config.replaceConfigDir(cacheConfigurationFile);
             CacheFactory cf = CacheFactory.getInstance();
             cf.initializeCache(cacheConfigurationFile);