From c7f54d570ab6a8a3c3ba1db6045d003f988f191d Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Wed, 9 Apr 2014 11:50:42 +0200 Subject: ResourceLoader.getModuleDefURLs interface method to allow the ResourceLoader to specify exactly where the module.xml files come from. Dumpc2kProps cleanup --- src/main/java/com/c2kernel/process/Gateway.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/main/java/com/c2kernel/process/Gateway.java') diff --git a/src/main/java/com/c2kernel/process/Gateway.java b/src/main/java/com/c2kernel/process/Gateway.java index 0d9dbe6..ea49ded 100644 --- a/src/main/java/com/c2kernel/process/Gateway.java +++ b/src/main/java/com/c2kernel/process/Gateway.java @@ -108,7 +108,7 @@ public class Gateway // init module manager try { - mModules = new ModuleManager(ClassLoader.getSystemResources("META-INF/cristal/module.xml"), AbstractMain.runningAsWrapper); + mModules = new ModuleManager(mResource.getModuleDefURLs(), AbstractMain.runningAsWrapper); } catch (Exception e) { Logger.error(e); throw new InvalidDataException("Could not load module definitions.", ""); @@ -437,11 +437,7 @@ public class Gateway static public void dumpC2KProps(int logLevel) { if (!Logger.doLog(logLevel)) return; - Logger.msg(logLevel, "C2K Properties:"); - for (Enumeration e = propertyNames(); e.hasMoreElements();) { - String name = (String) e.nextElement(); - Logger.msg(" "+name+": "+getProperty(name)); - } + mC2KProps.dumpProps(logLevel); } static public ObjectProperties getProperties() { -- cgit v1.2.3