summaryrefslogtreecommitdiff
path: root/src/main/java/com/c2kernel/process/Gateway.java
diff options
context:
space:
mode:
authorAndrew Branson <andrew.branson@cern.ch>2012-06-14 11:35:25 +0200
committerAndrew Branson <andrew.branson@cern.ch>2012-06-14 11:35:25 +0200
commitf20547a9f617a971d7dfa64a5a4564cd2f013170 (patch)
tree03cfcd0b2b344abedfcf857d320a3532a4649b49 /src/main/java/com/c2kernel/process/Gateway.java
parente55bf67f1ba4565ba2816ba58ab13b27807dd540 (diff)
Created ModuleException
Diffstat (limited to 'src/main/java/com/c2kernel/process/Gateway.java')
-rw-r--r--src/main/java/com/c2kernel/process/Gateway.java11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/main/java/com/c2kernel/process/Gateway.java b/src/main/java/com/c2kernel/process/Gateway.java
index aebd19e..8220a35 100644
--- a/src/main/java/com/c2kernel/process/Gateway.java
+++ b/src/main/java/com/c2kernel/process/Gateway.java
@@ -5,7 +5,6 @@ package com.c2kernel.process;
* @author $Author: abranson $
*/
-import java.io.IOException;
import java.net.MalformedURLException;
import java.util.Enumeration;
import java.util.Properties;
@@ -81,12 +80,12 @@ public class Gateway
// init module manager
try {
- mModules = new ModuleManager(ClassLoader.getSystemResources("module.xml"), isServer);
- } catch (IOException e) {
+ mModules = new ModuleManager(ClassLoader.getSystemResources("META-INF/cristal/module.xml"), isServer);
+ } catch (Exception e) {
Logger.error(e);
- throw new InvalidDataException("Could not load module definitions. Classpath problem", "");
- }
-
+ throw new InvalidDataException("Could not load module definitions.", "");
+ }
+
// Start with default props from kernel jar
try {
mC2KProps = FileStringUtility.loadConfigFile( Resource.getKernelResourceURL("textFiles/defaultConf.properties").toString());