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

use Properties.getProperty() to get driver, url, username and password

Browse source 
because Properties.keys() does not include the default Properties' keys.
Improved error messages for missing driver and url properties.
This commit is contained in:
hns 2004-05-19 13:57:22 +00:00
parent 0a030f932a
commit c908d1d097
1 changed files with 38 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/helma/objectmodel/db/DbSource.java
View file

@ -88,22 +88,50 @@ public class DbSource {
lastRead = (defaultProps == null) ? props.lastModified()
: Math.max(props.lastModified(),
defaultProps.lastModified());
// get JDBC URL and driver class name
url = props.getProperty(name + ".url");
driver = props.getProperty(name + ".driver");
// sanity checks
if (url == null) {
throw new NullPointerException(name+".url is not defined in db.properties");
}
if (driver == null) {
throw new NullPointerException(name+".driver class not defined in db.properties");
}
// test if this is an Oracle driver
isOracle = driver.startsWith("oracle.jdbc.driver");
// test if driver class is available
Class.forName(driver);
// set up driver connection properties
conProps=new Properties();
String prop = props.getProperty(name + ".user");
if (prop != null) {
conProps.put("user", prop);
}
prop = props.getProperty(name + ".password");
if (prop != null) {
conProps.put("password", prop);
}
// read any remaining extra properties to be passed to the driver
for (Enumeration e = props.keys(); e.hasMoreElements(); ) {
String key = (String) e.nextElement();
if (!key.toLowerCase().startsWith(name.toLowerCase()))
continue;
if (key.equalsIgnoreCase(name + ".url")) {
url = props.getProperty(key);
String fullkey = (String) e.nextElement();
int dot = fullkey.indexOf('.');
// filter out properties that don't belong to this data source
if (dot < 0 || !fullkey.substring(0, dot).equalsIgnoreCase(name)) {
continue;
}
if (key.equalsIgnoreCase(name + ".driver")) {
driver = props.getProperty(key);
isOracle = driver != null && driver.startsWith("oracle.jdbc");
Class.forName(driver);
String key = fullkey.substring(dot+1);
// filter out properties we alread have
if ("url".equalsIgnoreCase(key) ||
"driver".equalsIgnoreCase(key) ||
"user".equalsIgnoreCase(key) ||
"password".equalsIgnoreCase(key)) {
continue;
}
conProps.setProperty(key.substring(name.length()+1), props.getProperty(key));
conProps.setProperty(key, props.getProperty(fullkey));
}
}