From c7f54d570ab6a8a3c3ba1db6045d003f988f191d Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
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 ++------
 src/main/java/com/c2kernel/process/resource/Resource.java       | 6 ++++++
 src/main/java/com/c2kernel/process/resource/ResourceLoader.java | 3 +++
 3 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'src/main/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() {
diff --git a/src/main/java/com/c2kernel/process/resource/Resource.java b/src/main/java/com/c2kernel/process/resource/Resource.java
index 4d07f35..2ee95c5 100644
--- a/src/main/java/com/c2kernel/process/resource/Resource.java
+++ b/src/main/java/com/c2kernel/process/resource/Resource.java
@@ -3,6 +3,7 @@ package com.c2kernel.process.resource;
 //Java
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Hashtable;
 
@@ -160,4 +161,9 @@ public class Resource implements ResourceLoader {
             throw new ObjectNotFoundException(e.getMessage(),null);
         }
     }
+
+	@Override
+	public Enumeration<URL> getModuleDefURLs() throws Exception {
+		return ClassLoader.getSystemResources("META-INF/cristal/module.xml");
+	}
 }
diff --git a/src/main/java/com/c2kernel/process/resource/ResourceLoader.java b/src/main/java/com/c2kernel/process/resource/ResourceLoader.java
index fdf2508..2bbc4d1 100644
--- a/src/main/java/com/c2kernel/process/resource/ResourceLoader.java
+++ b/src/main/java/com/c2kernel/process/resource/ResourceLoader.java
@@ -2,6 +2,7 @@ package com.c2kernel.process.resource;
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.Enumeration;
 import java.util.HashMap;
 
 import com.c2kernel.common.InvalidDataException;
@@ -38,4 +39,6 @@ public interface ResourceLoader {
 	public Class<?> getClassForName(String name)
 			throws ClassNotFoundException;
 
+	public Enumeration<URL> getModuleDefURLs() throws Exception;
+
 }
\ No newline at end of file
-- 
cgit v1.2.3