From 7ad0968ea4914175184d1be48440607706cbdad2 Mon Sep 17 00:00:00 2001 From: kmfdm Date: Thu, 6 May 2004 15:37:25 +0000 Subject: [PATCH] removed changes to systemproperties (not neccessary to use case-sensitive db.properties...) --- src/helma/framework/core/Application.java | 2 +- src/helma/util/SystemProperties.java | 15 ++------------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/src/helma/framework/core/Application.java b/src/helma/framework/core/Application.java index aad39ac1..e10c48b4 100644 --- a/src/helma/framework/core/Application.java +++ b/src/helma/framework/core/Application.java @@ -241,7 +241,7 @@ public final class Application implements IPathElement, Runnable { // create app-level db sources File dbpropfile = new File(appDir, "db.properties"); - dbProps = new SystemProperties(dbpropfile.getAbsolutePath(), sysDbProps, false); + dbProps = new SystemProperties(dbpropfile.getAbsolutePath(), sysDbProps); // the passwd file, to be used with the authenticate() function CryptFile parentpwfile = null; diff --git a/src/helma/util/SystemProperties.java b/src/helma/util/SystemProperties.java index 79377f40..85359cee 100644 --- a/src/helma/util/SystemProperties.java +++ b/src/helma/util/SystemProperties.java @@ -49,33 +49,22 @@ public final class SystemProperties extends Properties { * Construct a properties object from a properties file. */ public SystemProperties(String filename) { - this(filename, null, true); + this(filename, null); } /** * Contstruct a properties object with the given default properties. */ public SystemProperties(SystemProperties defaultProps) { - this(null, defaultProps, true); + this(null, defaultProps); } /** * Construct a properties object from a file name with the given default properties (ignoring case) */ public SystemProperties(String filename, SystemProperties defaultProps) { - this(filename, defaultProps, true); - } - - /** - * Construct a properties object from a file name with the given default properties where ignoreCase is a boolean-flag - * @param filename Filename of the file to read in - * @param defaultProps Defaultproperties, which are overwritten by the content of the file - * @param ignoreCase if true, all properties are in lower case, if false the case will be preserved - */ - public SystemProperties(String filename, SystemProperties defaultProps, boolean ignoreCase) { // System.err.println ("building sysprops with file "+filename+" and node "+node); super(defaultProps); - this.ignoreCase = ignoreCase; this.defaultProps = defaultProps; file = (filename == null) ? null : new File(filename); lastcheck = lastread = lastadd = 0;