From fb12fd3e4d657fb21c917569a48b57dc509b26fc Mon Sep 17 00:00:00 2001
From: hns <hannesw@gmail.com>
Date: Mon, 20 Oct 2008 13:35:43 +0000
Subject: [PATCH] =?UTF-8?q?Make=20location=20of=20db.properties=20customiz?=
 =?UTF-8?q?able=20using=20the=20dbPropFile=20server=20property.=20Contribu?=
 =?UTF-8?q?ted=20by=20Bernhard=20Fr=C3=B6hlich.=20Fixes=20bug=20640=20<htt?=
 =?UTF-8?q?p://helma.org/bugs/show=5Fbug.cgi=3Fid=3D640>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/helma/main/Server.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/helma/main/Server.java b/src/helma/main/Server.java
index 2f7985b8..71e91a24 100644
--- a/src/helma/main/Server.java
+++ b/src/helma/main/Server.java
@@ -435,14 +435,21 @@ public class Server implements Runnable {
 
 
         // read db.properties file in helma home directory
+        String dbPropfile = sysProps.getProperty("dbPropFile");
+        File file;
+        if ((dbPropfile != null) && !"".equals(dbPropfile.trim())) {
+            file = new File(dbPropfile);
+        } else {
+            file = new File(hopHome, "db.properties");
+        }
+
         dbProps = new ResourceProperties();
         dbProps.setIgnoreCase(false);
-        dbProps.addResource(new FileResource(new File(hopHome, "db.properties")));
+        dbProps.addResource(new FileResource(file));
         DbSource.setDefaultProps(dbProps);
 
         // read apps.properties file
         String appsPropfile = sysProps.getProperty("appsPropFile");
-        File file;
         if ((appsPropfile != null) && !"".equals(appsPropfile.trim())) {
             file = new File(appsPropfile);
         } else {