summaryrefslogtreecommitdiff
path: root/src/main/java/com/c2kernel/scripting
diff options
context:
space:
mode:
authorogattaz <olivier@gattaz.com>2014-07-07 10:59:14 +0200
committerogattaz <olivier@gattaz.com>2014-07-07 10:59:14 +0200
commit6772bfb46b72d859c316a9f6573d0c6be477ad5c (patch)
treedafa343584216685e68b6edae37570eb97cf9d0c /src/main/java/com/c2kernel/scripting
parent2fd193d7936084de91eae46e8c2763914d87ab71 (diff)
parent0b689a787288f5a4ba568157905c3a0577f83821 (diff)
Merge branch 'master' of ssh://dev.cccs.uwe.ac.uk:22/var/git/cristal-kernel
Diffstat (limited to 'src/main/java/com/c2kernel/scripting')
-rw-r--r--src/main/java/com/c2kernel/scripting/ScriptConsole.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/com/c2kernel/scripting/ScriptConsole.java b/src/main/java/com/c2kernel/scripting/ScriptConsole.java
index 8b668a1..6b77a4f 100644
--- a/src/main/java/com/c2kernel/scripting/ScriptConsole.java
+++ b/src/main/java/com/c2kernel/scripting/ScriptConsole.java
@@ -14,8 +14,7 @@ import java.util.StringTokenizer;
import javax.script.Bindings;
import javax.script.ScriptEngine;
-import org.tanukisoftware.wrapper.WrapperManager;
-
+import com.c2kernel.process.AbstractMain;
import com.c2kernel.process.Gateway;
import com.c2kernel.utils.Logger;
import com.c2kernel.utils.server.SocketHandler;
@@ -190,7 +189,7 @@ public class ScriptConsole implements SocketHandler {
// process control
if (command.equals("shutdown")) {
- WrapperManager.stop(0);
+ AbstractMain.shutdown(0);
}
else {
context.setScript(command);