Merge branch 'master' of ssh://dev.cccs.uwe.ac.uk:22/var/git/cristal-kernel

2 files changed, 3 insertions, 11 deletions

diff --git a/src/main/java/com/c2kernel/scripting/Script.java b/src/main/java/com/c2kernel/scripting/Script.java
index e3b4478..83849d9 100644
--- a/src/main/java/com/c2kernel/scripting/Script.java
+++ b/src/main/java/com/c2kernel/scripting/Script.java
@@ -151,7 +151,7 @@ public class Script
         beans.put("storage", Gateway.getStorage());

         beans.put("db", Gateway.getStorage().getDb());

         beans.put("proxy", Gateway.getProxyManager());

-        beans.put("lookup", Gateway.getLDAPLookup());

+        beans.put("lookup", Gateway.getLookup());

         beans.put("orb", Gateway.getORB());

         beans.put("agent", agent);

         beans.put("output", out);

@@ -173,7 +173,7 @@ public class Script
     }

 

     public void setScriptEngine(String lang) throws ScriptingEngineException {

-    	engine = new ScriptEngineManager().getEngineByName(lang);

+    	engine = new ScriptEngineManager(getClass().getClassLoader()).getEngineByName(lang);

     	if (engine==null)

     		throw new ScriptingEngineException("No script engine for '"+lang+"' found.");

     	Bindings beans = engine.createBindings();

diff --git a/src/main/java/com/c2kernel/scripting/ScriptConsole.java b/src/main/java/com/c2kernel/scripting/ScriptConsole.java
index 3aeda26..8b668a1 100644
--- a/src/main/java/com/c2kernel/scripting/ScriptConsole.java
+++ b/src/main/java/com/c2kernel/scripting/ScriptConsole.java
@@ -16,7 +16,6 @@ import javax.script.ScriptEngine;
 

 import org.tanukisoftware.wrapper.WrapperManager;

 

-import com.c2kernel.entity.proxy.AgentProxy;

 import com.c2kernel.process.Gateway;

 import com.c2kernel.utils.Logger;

 import com.c2kernel.utils.server.SocketHandler;

@@ -147,16 +146,9 @@ public class ScriptConsole implements SocketHandler {
         // get system objects

         try {

             Logger.addLogStream(output, 0);

-            AgentProxy user = Gateway.getCurrentUser();

-            try {

-            	if (user == null) user = (AgentProxy)Gateway.getProxyManager().getProxy(

-            		Gateway.getLDAPLookup().getRoleManager().getAgentPath("system"));

-        		} catch (Exception ex) {

-        			output.println("System agent unavailable");

-        		}

             Script context;           

             try {

-            	context = new Script("javascript", user, output);

+            	context = new Script("javascript", null, output);

             } catch (Exception ex) {

             	output.println("Error initializing console script context");

             	ex.printStackTrace(output);