--- a/artifact-database/src/main/java/de/intevation/artifactdatabase/Config.java	Tue Sep 08 07:51:34 2009 +0000
+++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/Config.java	Wed Sep 09 07:55:44 2009 +0000
@@ -29,9 +29,13 @@
 {
     private static Logger logger = Logger.getLogger(Config.class);
 
-    public static final String CONFIG_PROPERTY = "artifact.database.config";
+    public static final String CONFIG_DIR = "artifact.database.dir";
 
-    public static final String CONFIG_DEFAULT  = "artifactdb-conf.xml";
+    public static final File CONFIG_DIR_DEFAULT =
+        new File(new File(System.getProperty("user.home",
+            System.getProperty("user.dir", "."))), ".artifactdb");
+
+    public static final String CONFIG_FILE  = "conf.xml";
 
     private static Document config;
 
@@ -45,9 +49,26 @@
         return config;
     }
 
+    public static File getConfigDirectory() {
+        String configDirString = System.getProperty(CONFIG_DIR);
+
+        File configDir = configDirString != null
+            ? new File(configDirString)
+            : CONFIG_DIR_DEFAULT;
+
+        if (!configDir.isDirectory()) {
+            logger.warn("'" + configDir + "' is not a directory.");
+            configDir = CONFIG_DIR_DEFAULT;
+        }
+
+        return configDir;
+    }
+
     private static Document loadConfig() {
-        File file = new File(
-            System.getProperty(CONFIG_PROPERTY, CONFIG_DEFAULT));
+
+        File configDir = getConfigDirectory();
+
+        File file = new File(configDir, CONFIG_FILE);
 
         if (!file.canRead() && !file.isFile()) {
             logger.error("Cannot read config file '"