antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

removed changes to systemproperties

Browse source 
(not neccessary to use case-sensitive db.properties...)
This commit is contained in:
kmfdm 2004-05-06 15:37:25 +00:00
parent adbd17d6aa
commit 7ad0968ea4
2 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/helma/framework/core/Application.java
View file

@ -241,7 +241,7 @@ public final class Application implements IPathElement, Runnable {
// create app-level db sources // create app-level db sources
File dbpropfile = new File(appDir, "db.properties"); 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 // the passwd file, to be used with the authenticate() function
CryptFile parentpwfile = null; CryptFile parentpwfile = null;

15
src/helma/util/SystemProperties.java
View file

@ -49,33 +49,22 @@ public final class SystemProperties extends Properties {
* Construct a properties object from a properties file. * Construct a properties object from a properties file.
*/ */
public SystemProperties(String filename) { public SystemProperties(String filename) {
this(filename, null, true); this(filename, null);
} }
/** /**
* Contstruct a properties object with the given default properties. * Contstruct a properties object with the given default properties.
*/ */
public SystemProperties(SystemProperties defaultProps) { 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) * Construct a properties object from a file name with the given default properties (ignoring case)
*/ */
public SystemProperties(String filename, SystemProperties defaultProps) { 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); // System.err.println ("building sysprops with file "+filename+" and node "+node);
super(defaultProps); super(defaultProps);
this.ignoreCase = ignoreCase;
this.defaultProps = defaultProps; this.defaultProps = defaultProps;
file = (filename == null) ? null : new File(filename); file = (filename == null) ? null : new File(filename);
lastcheck = lastread = lastadd = 0; lastcheck = lastread = lastadd = 0;