Author: andre
Date: 2009-11-18 15:26:17 +0100 (Wed, 18 Nov 2009)
New Revision: 39775
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/module/tools/ApplicationInstaller.java
mmbase/trunk/core/src/main/java/org/mmbase/util/ResourceLoader.java
Log:
MMB-1894
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/module/tools/ApplicationInstaller.java
===================================================================
---
mmbase/trunk/core/src/main/java/org/mmbase/module/tools/ApplicationInstaller.java
2009-11-18 14:05:01 UTC (rev 39774)
+++
mmbase/trunk/core/src/main/java/org/mmbase/module/tools/ApplicationInstaller.java
2009-11-18 14:26:17 UTC (rev 39775)
@@ -728,7 +728,7 @@
// if 'inactive' in the config/builder path, fail
String path = mmb.getBuilderPath(name, "");
if (path != null) {
- result.error("The builder '" + name + "' was already on
our system, but inactive." +
+ result.error("The builder '" + name + "' was already on
our system, but inactive. " +
"To install this application, make the
builder '" + path + name + ".xml ' active");
continue;
}
Modified: mmbase/trunk/core/src/main/java/org/mmbase/util/ResourceLoader.java
===================================================================
--- mmbase/trunk/core/src/main/java/org/mmbase/util/ResourceLoader.java
2009-11-18 14:05:01 UTC (rev 39774)
+++ mmbase/trunk/core/src/main/java/org/mmbase/util/ResourceLoader.java
2009-11-18 14:26:17 UTC (rev 39775)
@@ -1200,13 +1200,15 @@
URL u;
try {
if (name.startsWith("file:")) {
- u = new URL(null, name, this);
+ u = new URL(null, new URI(name).toURL().toString(), this);
} else {
File file = getFile(name);
if (file == null) return
NOT_AVAILABLE_URLSTREAM_HANDLER.openConnection(name);
String fileUrl = file.toURI().toURL().toString();
u = new URL(null, fileUrl, this);
}
+ } catch (java.net.URISyntaxException use) {
+ throw new AssertionError(use.getMessage());
} catch (MalformedURLException mfue) {
throw new AssertionError(mfue.getMessage());
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
