From 684e01bb190c7d0b95347b732aeb3cdeda4740d7 Mon Sep 17 00:00:00 2001
From: abranson <andrew.branson@cern.ch>
Date: Tue, 18 Oct 2011 17:00:33 +0200
Subject: Module support

---
 source/com/c2kernel/scripting/ErrorInfo.java     |  5 +++++
 source/com/c2kernel/scripting/Script.java        | 11 ++++++++---
 source/com/c2kernel/scripting/ScriptConsole.java |  6 +++---
 3 files changed, 16 insertions(+), 6 deletions(-)

(limited to 'source/com/c2kernel/scripting')

diff --git a/source/com/c2kernel/scripting/ErrorInfo.java b/source/com/c2kernel/scripting/ErrorInfo.java
index f14038f..26c0384 100644
--- a/source/com/c2kernel/scripting/ErrorInfo.java
+++ b/source/com/c2kernel/scripting/ErrorInfo.java
@@ -18,6 +18,11 @@ public class ErrorInfo {
         super();
         msg = new ArrayList<String>();
     }
+    
+    public ErrorInfo(String error) {
+    	this();
+    	msg.add(error);
+    }
 
     public void addError(String error) {
         msg.add(error);
diff --git a/source/com/c2kernel/scripting/Script.java b/source/com/c2kernel/scripting/Script.java
index 0820c26..c056e95 100644
--- a/source/com/c2kernel/scripting/Script.java
+++ b/source/com/c2kernel/scripting/Script.java
@@ -72,19 +72,24 @@ public class Script
      * Creates a script executor for the supplied expression, bypassing the xml parsing bit
      * Output class is forced to an object.
      */
-    public Script(String lang, String expr, BSFManager scriptManager) throws ScriptingEngineException
+    public Script(String lang, String expr, BSFManager scriptManager, Class<?> returnType) throws ScriptingEngineException
     {
         setScriptEnv(scriptManager);
         mName = "<expr>";
         mLang = lang;
         mVersion = "";
-        mOutputClass = Object.class;
+        mOutputClass = returnType;
         mScript = expr;
     }
 
     public Script(String lang, String expr) throws ScriptingEngineException
     {
-        this(lang, expr, new BSFManager());
+        this(lang, expr, new BSFManager(), Object.class);
+    }
+    
+    public Script(String lang, String expr, Class<?> returnType) throws ScriptingEngineException
+    {
+        this(lang, expr, new BSFManager(), returnType);
     }
 
     public Script(ItemProxy object, AgentProxy subject, Job job) throws ScriptingEngineException
diff --git a/source/com/c2kernel/scripting/ScriptConsole.java b/source/com/c2kernel/scripting/ScriptConsole.java
index 33d4b7f..99ad90f 100644
--- a/source/com/c2kernel/scripting/ScriptConsole.java
+++ b/source/com/c2kernel/scripting/ScriptConsole.java
@@ -194,13 +194,13 @@ public class ScriptConsole implements SocketHandler {
                         } catch (NumberFormatException ex) { }
                     }
                     else if(command.equals("help")) {
-                        output.println(Resource.getTextResource("textFiles/consoleHelp.txt"));
+                        output.println(Resource.findTextResource("textFiles/consoleHelp.txt"));
                         continue;
                     }
                     else if(command.equals("version")) {
-						output.println("Domain version: "+Resource.getDomainVersion());
 						output.println("Kernel version: "+Resource.getKernelVersion());
-                    	continue;
+						output.println("Modules loaded: "+Gateway.getModuleManager().getModuleVersions());
+						continue;
                     }
                     try {
                         if (command.endsWith("\\")) {
-- 
cgit v1.2.3