[Yanel-commits] rev 24342 -
public/yanel/trunk/src/core/java/org/wyona/yanel/core
michi at wyona.com
michi at wyona.com
Fri May 11 01:08:32 CEST 2007
Author: michi
Date: 2007-05-11 01:08:30 +0200 (Fri, 11 May 2007)
New Revision: 24342
Modified:
public/yanel/trunk/src/core/java/org/wyona/yanel/core/ResourceTypeRegistry.java
Log:
check if config is file and logging improved
Modified: public/yanel/trunk/src/core/java/org/wyona/yanel/core/ResourceTypeRegistry.java
===================================================================
--- public/yanel/trunk/src/core/java/org/wyona/yanel/core/ResourceTypeRegistry.java 2007-05-10 21:58:53 UTC (rev 24341)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/core/ResourceTypeRegistry.java 2007-05-10 23:08:30 UTC (rev 24342)
@@ -94,9 +94,10 @@
} else if (CONFIGURATION_FILE.endsWith("properties")) {
- propertiesURL = ResourceTypeRegistry.class.getClassLoader()
- .getResource(CONFIGURATION_FILE);
+ log.warn("DEPRECATED: " + CONFIGURATION_FILE);
+ propertiesURL = ResourceTypeRegistry.class.getClassLoader().getResource(CONFIGURATION_FILE);
+
Properties props = new Properties();
try {
props.load(propertiesURL.openStream());
@@ -112,13 +113,13 @@
.getAbsolutePath(), tokens[i]);
}
- if (resConfigFile.exists()) {
+ if (resConfigFile.isFile()) {
ResourceTypeDefinition rtd = new ResourceTypeDefinition(resConfigFile);
log.debug("Universal Name: " + rtd.getResourceTypeUniversalName());
log.debug("Classname: " + rtd.getResourceTypeClassname());
hm.put(rtd.getResourceTypeUniversalName(), rtd);
} else {
- log.warn("No such file or directory: " + resConfigFile);
+ log.error("No such file: " + resConfigFile);
}
}
} catch (Exception e) {
@@ -146,17 +147,16 @@
for (int i = 0; i < resourceTypes.length; i++) {
File resConfigFile = new File(resourceTypes[i].getAttribute("src"));
if (!resConfigFile.isAbsolute()) {
- resConfigFile = FileUtil.file(resourceTypeConfigFile.getParentFile()
- .getAbsolutePath(), resourceTypes[i].getAttribute("src"));
+ resConfigFile = FileUtil.file(resourceTypeConfigFile.getParentFile().getAbsolutePath(), resourceTypes[i].getAttribute("src"));
}
- if (resConfigFile.exists()) {
+ if (resConfigFile.isFile()) {
ResourceTypeDefinition rtd = new ResourceTypeDefinition(resConfigFile);
log.debug("Universal Name: " + rtd.getResourceTypeUniversalName());
log.debug("Classname: " + rtd.getResourceTypeClassname());
hm.put(rtd.getResourceTypeUniversalName(), rtd);
} else {
- log.warn("No such file or directory: " + resConfigFile);
+ log.error("No such file: " + resConfigFile);
}
}
} catch (Exception e) {
More information about the Yanel-commits
mailing list