Author: michiel
Date: 2009-05-26 11:46:22 +0200 (Tue, 26 May 2009)
New Revision: 35435
Modified:
mmbase/trunk/src/org/mmbase/util/ResourceLoader.java
Log:
Made it possible to specify files relative from webRoot wehn using
ApplicationContextReader
Modified: mmbase/trunk/src/org/mmbase/util/ResourceLoader.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/ResourceLoader.java 2009-05-26
08:33:57 UTC (rev 35434)
+++ mmbase/trunk/src/org/mmbase/util/ResourceLoader.java 2009-05-26
09:46:22 UTC (rev 35435)
@@ -1372,14 +1372,20 @@
protected File getFileFromString(String s) {
if (s == null) return null;
- if (s.startsWith("file:")) {
- try {
+ try {
+
+ if (s.startsWith("file:")) {
return new File(new URI(s)); // hff, how cumbersome, to
translate an URL to a File
- } catch (URISyntaxException use) {
- log.warn("" + s + " : " + use.getMessage() , use);
- return null;
+ } else {
+ ResourceLoader wr = getWebRoot();
+ if (wr != null) {
+ return new File(new File(wr.getResource("/").toURI()),
s);
+ } else {
+ return new File(s);
+ }
}
- } else {
+ } catch (URISyntaxException use) {
+ log.warn("" + s + " : " + use.getMessage() , use);
return new File(s);
}
}
@@ -1410,7 +1416,7 @@
File f = getFileFromString(e.getValue());
bul.append(e.getValue());
if (! f.exists()) {
- bul.append("(" + f + " does not exist)");
+ bul.append("(" + f.toURI() + " does not exist)");
} else if (! f.canRead()) {
bul.append("(" + f + " cannot be read)");
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
