From 538370bda464bf1c51f6bb449f61efe46d7f20f3 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Wed, 13 Feb 2013 20:46:52 +0100 Subject: Removed isServer boolean - implied by AbstractMain.runningAsWrapper --- src/main/java/com/c2kernel/process/Gateway.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 1bb451d..70bfb14 100644 --- a/src/main/java/com/c2kernel/process/Gateway.java +++ b/src/main/java/com/c2kernel/process/Gateway.java @@ -71,7 +71,7 @@ public class Gateway * If null, the java system properties are used * @throws InvalidDataException - invalid properties caused a failure in initialisation */ - static public void init(Properties props, boolean isServer) throws InvalidDataException { + static public void init(Properties props) throws InvalidDataException { // Init properties & resources mC2KProps = new Properties(); @@ -89,7 +89,7 @@ public class Gateway // init module manager try { - mModules = new ModuleManager(ClassLoader.getSystemResources("META-INF/cristal/module.xml"), isServer); + mModules = new ModuleManager(ClassLoader.getSystemResources("META-INF/cristal/module.xml"), AbstractMain.runningAsWrapper); } catch (Exception e) { Logger.error(e); throw new InvalidDataException("Could not load module definitions.", ""); @@ -116,7 +116,7 @@ public class Gateway } // if client, run module startup scripts. Otherwise bootstrap will do it after all imports - if (!isServer) mModules.runScripts("startup"); + if (!AbstractMain.runningAsWrapper) mModules.runScripts("startup"); } /** -- cgit v1.2.3