@@ -146,23 +146,6 @@ var log = logging.getLogger(__name__); }); } return '"' + x + '"'; - }, - - /* - * TODO this is a preliminary hack to support JSAdapter properties for the - * storable module. JSAdapters identify as functions with the typeof operator, - * and we use this to generate proxies in the DB representation of persistent - * object references. We need to find out how to implement this without - * messing with the main JSON module. - */ - 'function': function(x) { - if (x instanceof JSAdapter && x._type && typeof x.save == 'function') { - if (!x._id) { - throw Error("Trying to save non-persistent property"); - } - return '{"_id": "' + x._id + '", "_type": "' + x._type + '"}' - } - return null; } }; modules/core/JSON.js @@ -51,6 +51,7 @@ public class RhinoEngine { AppClassLoader loader = new AppClassLoader(); HelmaWrapFactory wrapFactory = new HelmaWrapFactory(); HelmaContextFactory contextFactory = new HelmaContextFactory(this); + ModuleScope mainScope = null; public static final Object[] EMPTY_ARGS = new Object[0]; protected boolean isInitialized = false; @@ -182,8 +183,8 @@ public class RhinoEngine { } ReloadableScript script = new ReloadableScript(resource, this); scripts.put(resource, script); - Scriptable scope = new ModuleScope("__main__", resource, topLevelScope); - retval = script.evaluate(scope, cx); + mainScope = new ModuleScope("__main__", resource, topLevelScope); + retval = script.evaluate(mainScope, cx); if (retval instanceof Wrapper) { return ((Wrapper) retval).unwrap(); } @@ -250,7 +251,8 @@ public class RhinoEngine { try { Repository repository = repositories.get(0); Resource resource = repository.getResource("<shell>"); - ModuleScope scope = new ModuleScope("<shell>", resource, topLevelScope); + Scriptable parentScope = mainScope != null ? mainScope : topLevelScope; + ModuleScope scope = new ModuleScope("<shell>", resource, parentScope); try { getScript("helma.shell").evaluate(scope, cx); } catch (Exception x) { src/org/helma/javascript/RhinoEngine.java @@ -25,7 +25,6 @@ import org.mozilla.javascript.tools.ToolErrorReporter; import java.io.IOException; import java.io.PrintWriter; -import java.io.FileNotFoundException; import java.util.Collections; import java.util.List; import java.util.regex.Matcher; src/org/helma/tools/HelmaShell.java modules/helma/cache.js modules/helma/storage.js src/org/helma/storage/NotStorableException.java src/org/helma/storage/Storage.java src/org/helma/storage/file/FileStorage.java src/org/helma/storage/file/FileStorageTransaction.java 38e8e9cafb5edf9038c01757a8d71a5a89dd1cd5 Chris Zumbrunn chris@zumbrunn.com http://github.com/zumbrunn/helma-ng/commit/02126dc362270def8389c988c2e3e6cfd17865d6 02126dc362270def8389c988c2e3e6cfd17865d6 2008-09-05T09:47:14-07:00 2008-09-05T09:47:14-07:00 Merge commit 'hns/master' 1176bc257573c9ccd978062367cdf2191cffa05d Chris Zumbrunn chris@zumbrunn.com