WebSVN – pub – Path Comparison – / – /pluggablejs/ Rev 64 and /pluggablejs/ Rev 65

Ignore whitespace Rev 64 → Rev 65

 /pluggablejs/trunk/ChangeLog
 ,3 → 1,12
+.1.1build34: not a release
+        * Renamed the $net object to $net_outlyer to be less intrusive
+        * Interactive shell prints the result of each line (optionally and on by default)
+        * Cleaner use of internal variables, there's no longer a need to
+          reserve any variable name / namespace beyond $net_outlyer
+        * lang.array() family of methods to create Java arrays
+        * lang.var_dump() to help in debugging
+        * lang.for_each()
 .1.0build33: 2008-07-01
         * Sandbox can be created with no associated file (only boilerPlate code
           will be issued)

 /pluggablejs/trunk/src/net/outlyer/plugins/Shell.java
 ,11 → 31,14
 import javax.script.ScriptException;
 import net.outlyer.plugins.utils.*;
+import static net.outlyer.plugins.Internal.getInternalObjectFieldName;
 /**
  * Sample shell for tests, or scripts.
  * Files passed as arguments will be loaded and executed.
  */
 public final class Shell {
     public static void interactive(final PluginEnvironment pe) {
         try {
             final Sandbox sandbox = pe.createSandbox(null);
 ,19 → 46,45
             final Input in = new Input();
             final Output out = new Output();
-            System.err.printf("pluggablejsShell v%d.%d.%d\n",API.VERSION,API.MIN_SUPPORTED_VERSION,API.REVISION);
+            System.err.printf("pluggablejsShell v%d.%d.%d\n", API.VERSION, API.MIN_SUPPORTED_VERSION, API.REVISION);
             final boolean isWin = System.getProperty("os.name").toLowerCase().startsWith("windows");
             // apparently windows doesn't get EOF until enter is pressed
-            System.err.printf(" use EOF (%s) or break (CTRL+C) to exit\n", (isWin)?"CTRL+Z,Enter":"CTRL+D");
+            System.err.printf(" use EOF (%s) or break (CTRL+C) to exit\n", (isWin) ? "CTRL+Z,Enter" : "CTRL+D");
+            // This object is used as a template to identify JavaScript arrays;
+            // since the sun.org.mozilla.javascript package is forbidden a more
+            // direct check can't be used
+            Object jsArray;
+            // This is the name of the internal function used to dump
+            // javascript arrays
+            final String arrayDumpFn = getInternalObjectFieldName("shell.arrayDump");
             try {
-                // undocumented feature: when
-                // $net.outlyer.runtime.internal.shell is true an extra println() is
+                // undocumented features: when
+                // $net_outlyer.runtime.internal.shell,autoEOL is true an extra println() is
                 // issued after each eval
-                rhino.eval("$net.outlyer.runtime.internal.shell = { autoEOL: false, };");
+                // and when
+                // $net_outlyer.runtime.internal.shell.inspect is true the result
+                // of each line is automatically printed
+                rhino.eval(getInternalObjectFieldName("shell")+" = { " +
+                                          " autoEOL: false, inspect: true, arrayDump: null };");
+                jsArray = rhino.eval("new Array()");
+                // Define the arrayDump internal function
+                rhino.eval(arrayDumpFn+
+                                    " = function(arr) {\n" +
+                                    " var s = new String();" +
+                                    " s += '[';\n" +
+                                    " for (var i=0;i<arr.length;++i) {\n" +
+                                    "   s += arr[i]+',';\n" +
+                                    " }\n" +
+                                    " java.lang.System.out.println(s.substring(0,s.length-1)+']');\n" +
+                                    "};");
             }
             catch (final ScriptException e) {
                 e.printStackTrace();
+                throw new IllegalStateException("Failed to initialise interactive shell");
             }
             while (true) {
                 out.print("pjsh% : ");
 ,12 → 92,33
                 if (null == line) {
                     break;
                 }
+                if (line.isEmpty()) {
+                    continue;
+                }
                 try {
-                    rhino.eval(line);
-                    final boolean eol = (Boolean) rhino.eval("$net.outlyer.runtime.internal.shell.autoEOL");
+                    final Object result = rhino.eval(line);
+                    final boolean eol = (Boolean) rhino.eval(getInternalObjectFieldName("shell.autoEOL"));
                     if (eol) {
                         out.println();
                     }
+                    final boolean insp = (Boolean) rhino.eval(getInternalObjectFieldName("shell.inspect"));
+                    if (insp) {
+                        if (null==result) {
+                            out.println("null");
+                        }
+                        else if (result.getClass() == jsArray.getClass()) { // JavaScript array
+                            // Store...
+                            Internal.setInternalValue(rhino, "result", result);
+                            // Dump
+                            rhino.eval(String.format("%s(%s);",
+                                    arrayDumpFn,
+                                    getInternalObjectFieldName("get")+"('result')"));
+                            Internal.setInternalValue(rhino, "result", null);
+                        }
+                        else {
+                            out.println(result.toString());
+                        }
+                    }
                 }
                 catch (final ScriptException e) {
                     System.err.println("//[E] Error: " + e.getMessage());
 ,14 → 133,14
             System.exit(5);
         }
     }
-    public static void main(String...args) {
+    public static void main(String... args) {
         if (args.length == 0) {
             System.err.printf("Usage: \n" +
-                              "   java [...] %s <file1.js [file2.js [...]]>\n"+
-                              " or\n"+
-                              "   java [...] %1$s <-i|--interactive>\n",
-                              Shell.class.getName());
+                    "   java [...] %s <file1.js [file2.js [...]]>\n" +
+                    " or\n" +
+                    "   java [...] %1$s <-i|--interactive>\n",
+                    Shell.class.getName());
             System.exit(1);
         }
 ,14 → 158,14
         pe.exportObject("lang", new LanguageExtensions());
         final PluginObject po = new PluginObject();
         pe.setPluginObject(po);
         if (args.length == 1 && (args[0].equals("-i") || args[0].equals("--interactive"))) {
             interactive(pe);
             assert false;
         }
         // Non-interactive mode
         for (final String path : args) {
             try {
                 final Sandbox sandbox = pe.createSandbox(new File(path).toURI());

 /pluggablejs/trunk/src/net/outlyer/plugins/API.java
 ,7 → 33,7
  * {@link http://www.gnu.org/software/libtool/manual.html#Versioning}, i.e.
  * <pre>
  * API version = "current"
- * API revvision = "revision"
+ * API revision = "revision"
  * API min_supported_revision = "current" - "age"
  * </pre>
  *
 ,7 → 55,7
      * existing ones neither remove any of them.
      * @see #VERSION
      */
-    public static final int REVISION = 0;
+    public static final int REVISION = 1;
     /**
      * Number of previous Versions supported.

 /pluggablejs/trunk/src/net/outlyer/plugins/Internal.java
 ,0 → 1,96
+package net.outlyer.plugins;
+/*
+ * Copyright (c) 2008, Toni Corvera. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+// $Id$
+import java.util.Map;
+import javax.script.ScriptEngine;
+import javax.script.ScriptException;
+/**
+ * This class provides centralised access to features used internally.
+ */
+class Internal {
+    /**
+     * The reserved object is the only concrete variable name reserved
+     * in the global namespace.
+     * @return $net_outlyer
+     */
+    static String getReservedObjectName() {
+        return "$net_outlyer";
+    }
+    /**
+     * Gets the name of the runtime object
+     * @return
+     */
+    static String getRuntimeObjectName() {
+        return getReservedObjectName()+".runtime";
+    }
+    /**
+     * Gets the name of the internal object.
+     * Fields of this object provide access to internal features.
+     */
+    static String getInternalObjectName() {
+        return getRuntimeObjectName()+".internal";
+    }
+    static String getInternalObjectFieldName(final String fieldName) {
+        return getInternalObjectName()+"."+fieldName;
+    }
+    private static String mapName = "$_";
+    static String getInternalInitialisation() {
+        return String.format("= {\n" +
+                             " %2$s: new java.util.HashMap(),\n" +
+                             " set: function(n,v) {\n"+
+                             "  %1$s.put(n,v);\n" +
+                             "  return v;\n" +
+                             " },\n" +
+                             " get: function(n) {\n" +
+                             "  return %1$s.get(n);\n" +
+                             " }\n"+
+                             "};",
+                             getInternalObjectFieldName(mapName),
+                             mapName);
+    }
+    static void setInternalValue(final ScriptEngine engine,
+                                 final String name,
+                                 final Object value) throws ScriptException {
+        final Map map = (Map) engine.eval(getInternalObjectFieldName(mapName));
+        map.put(name, value);
+    }
+    static Object getInternalValue(final ScriptEngine e,
+                                   final String name) throws ScriptException {
+        final Map map = (Map) e.eval(getInternalObjectFieldName(mapName));
+        return map.get(name);
+    }
+}
 Property changes:
 Added: svn:keywords
 +Rev Id Date
 \ No newline at end of property

 /pluggablejs/trunk/src/net/outlyer/plugins/Functor.java
 ,0 → 1,50
+package net.outlyer.plugins;
+/*
+ * Copyright (c) 2008, Toni Corvera. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+// $Id$
+/**
+ * Basically a wrapper inspired by {@link java.util.concurrent.Callable}
+ * and {@link java.lang.Runnable}.
+ * Allows exported methods to explicitly declare a parameter as a
+ * function to be applied to an object.
+ * <br />
+ * Defines a single method, {@link #apply}.
+ * <br />
+ * Due to Rhino's code adaptations, passing a JavaScript function
+ * where a {@link Functor} is expected works transparently, e.g.:
+ * <code>lang.for_each(arr, function() { ... });</code>
+ * @see net.outlyer.plugins.utils.LanguageExtensions
+ * @see net.outlyer.plugins.utils.LanguageExtensions#for_each(Object[], Functor)
+ *
+ * @since {@link API#REVISION} 1
+ */
+public interface Functor<ResultType, ParamType> {
+    /**
+     * Apply the function to object p and return a ResultType object.
+     */
+    ResultType apply(final ParamType p);
+}
 Property changes:
 Added: svn:keywords
 +Rev Id Date
 \ No newline at end of property

 /pluggablejs/trunk/src/net/outlyer/plugins/utils/LanguageExtensions.java
 ,11 → 26,10
 // $Id$
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import javax.script.ScriptException;
-import net.outlyer.plugins.SandboxAccessorImpl;
+import java.lang.reflect.Array;
+import java.util.Arrays;
+import net.outlyer.plugins.Functor;
+import net.outlyer.plugins.SandboxAccessor;
 /**
  * Extra facilities found in other languages or more complete
 ,39 → 36,162
  * versions of available facilities.
  * Recommended name: lang
  */
-public class LanguageExtensions extends SandboxAccessorImpl {
+public class LanguageExtensions extends LanguageExtensions_V1
+                                implements SandboxAccessor {
+    public static final int revision = 2;
+    // The array() family is mostly redundant since rhino translates
+    // automatically as required from JavaScript arrays to Java arrays
+    // but there are some edge-cases in which they might be desirable
     /**
-     * ScriptEngine's eval.
-     * The built-in eval() appears to be less-powerful, in general they're
-     * equivalent, but if the eval'ed string is obtainer from input
-     * <code>eval()</code> appears to ignore it, while
-     * <code>LanguageExtensions.eval()</code> does eval it.
-     * @param code Code to evaluate
-     * @return Eval's result
+     * Create an array of the same class as the provided object.
+     * @param tplt Template for the array, must be non-null and non-Void
+     * @param size Size of the array to create (can be 0)
+     * @since {@link #revision} 2
      */
-    public Object eval(final String code) {
-        try {
-            return getSandbox().getCurrentEngine().eval(code);
+    public <T> T[] array(final T tplt, int size) {
+        if (null == tplt || Void.class == tplt.getClass()) {
+            return null;
         }
-        catch (final ScriptException e) {
-            // FIXME: Handle better
-            System.err.println("Exception: " + e.getMessage());
+        return (T[]) Array.newInstance(tplt.getClass(), size);
+    }
+    /**
+     * Create an array of the provided class.
+     * @param c Class of the array elements, must be non-null and different from Void.class
+     * @param size Size of the array (can be 0)
+     * @since {@link #revision} 2
+     */
+    public <T> T[] array(final Class<T> c, int size) {
+        return (T[]) Array.newInstance(c, size);
+    }
+    /**
+     * Create an array and copy a set of elements to it.
+     * Note that a JavaScript array will produce a java.lang.Object array
+     * @param size Size of the array to create (if less than
+     *          <code>initValues.length</code>, will use
+     *          <code>initValues.length</code> instead) (i.e., use 0 to
+     *          get the same size as initValues)
+     * @param initValues Initial values to put in the array
+     * @since {@link #revision} 2
+     */
+    public <T> T[] array(final T[] initValues, int size) {
+        if (null == initValues) {
+            return null;
         }
-        return null;
+        final T[] a = Arrays.copyOf(initValues, Math.max(size, initValues.length));
+        if (null == a) {
+            return null;
+        }
+        for (int i=0; i<initValues.length; ++i) {
+            a[i] = initValues[i];
+        }
+        return a;
     }
-    public Object include(final String fileName) { // TODO: Support jar URIs
-        try {
-            return getSandbox().getCurrentEngine().eval(new FileReader(new File(fileName)));
+    /**
+     * Shorthand form, allows getting a Java array from a JavaScript array.
+     * @param initValues
+     * @since {@link #revision} 2
+     */
+    public <T> T[] array(final T[] initValues) {
+        return array(initValues, initValues.length);
+    }
+    public void var_dump(final Object obj) {
+        System.out.println(var_dump_(obj));
+    }
+    private String var_dump_(final Object obj) {
+        final StringBuilder sb = new StringBuilder();
+        if (null == obj) {
+        sb.append("null");
+    }
+    else if (obj.getClass() == String.class) {
+        sb.append("String(").append(((String)obj).length())
+          .append(") \"").append(obj).append("\"");
+    }
+    else if (Number.class.isInstance(obj)) {
+        final Class c = obj.getClass();
+        String v;
+        if (c == Double.class) { // Most probable
+            v = String.format("double(%f)", (Double)obj);
         }
-        catch (final FileNotFoundException e) {
-            // FIXME: Handle better
-            System.err.println("Failed to read "+fileName);
+        else if (c == Float.class) {
+            v = String.format("float(%f)", (Float)obj);
         }
-        catch (final ScriptException e) {
-            // FIXME: Handle better
-            System.err.println("Exception: " + e.getMessage());
+        else if (c == Long.class) {
+            v = String.format("long(%d)", (Long)obj);
         }
-        return null;
+        else if (c == Integer.class) {
+            v = String.format("int(%d)", (Integer)obj);
+        }
+        else if (c == Short.class) {
+            v = String.format("short(%d)", (Short)obj);
+        }
+        else if (c == Byte.class) {
+            v = String.format("byte(%d)", (Byte)obj);
+        }
+        else {
+            v = String.format("%s(%f)", c.getSimpleName(),
+                      ((Number)obj).doubleValue());
+        }
+        sb.append(v);
     }
+    else if (obj.getClass().isArray()) {
+        sb.append("array(").append(java.lang.reflect.Array.getLength(obj))
+          .append(") {\n");
+        /*
+        for (final Object elem : java.util.Arrays.asList(obj)) {
+            sb.append(var_dump_(elem));
+        }
+        */
+        int len = java.lang.reflect.Array.getLength(obj);
+        for (int i=0; i<len; ++i) {
+            sb.append("  [").append(i).append("]=>\n  ")
+              .append(var_dump_(java.lang.reflect.Array.get(obj, i)))
+              .append("\n");
+        }
+        sb.append("}");
+    }
+    else {
+        sb.append(obj);
+    }
+    return sb.toString();
+    }
+    /**
+     * Apply a function to each element of an iterable collection.
+     * @see #for_each(Object[], Functor)
+     * @param c Collection to which to apply
+     * @param f Function to apply
+     * @since {@link #revision} 2
+     */
+    public <T> void for_each(final Iterable<T> c, final Functor<Object, T> f) {
+        for (final T elem : c) {
+            f.apply(elem);
+        }
+    }
+    /**
+     * Apply a function to each element of an array
+     * A JavaScript function can be used transparently as a functor, e.g.:
+     * <br />
+     * <code>var arr = lang.array(new Array(1, 2, 3));<br />
+     * lang.for_each(arr, function(x) { err.println("Element: "+x); });</code>>
+     * Will produce:
+     * <pre>Element: 1<br />Element: 2<br />Element: 3</pre>
+     * @param a Array to which to apply
+     * @param f Function to apply
+     * @since {@link #revision} 2
+     */
+    public <T> void for_each(final T[] a, final Functor<Object, T> f) {
+        if (null == a || null == f) {
+            return; // FIXME: Error handling
+        }
+        for_each(Arrays.asList(a), f);
+    }
 }

 /pluggablejs/trunk/src/net/outlyer/plugins/utils/LanguageExtensions_V1.java
 ,0 → 1,79
+package net.outlyer.plugins.utils;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import javax.script.ScriptException;
+import net.outlyer.plugins.SandboxAccessorImpl;
+/*
+ * Copyright (c) 2008, Toni Corvera. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+// $Id$
+/**
+ * Initial version of LanguageExtensions.
+ * @see LanguageExtensions
+ */
+class LanguageExtensions_V1 extends SandboxAccessorImpl {
+    /**
+     * ScriptEngine's eval.
+     * The built-in eval() appears to be less-powerful, in general they're
+     * equivalent, but if the eval'ed string is obtainer from input
+     * <code>eval()</code> appears to ignore it, while
+     * <code>LanguageExtensions.eval()</code> does eval it.
+     * @param code Code to evaluate
+     * @return Eval's result
+     */
+    public Object eval(final String code) {
+        try {
+            return getSandbox().getCurrentEngine().eval(code);
+        }
+        catch (final ScriptException e) {
+            // FIXME: Handle better
+            System.err.println("Exception: " + e.getMessage());
+        }
+        return null;
+    }
+    /**
+     * Load an external file
+     * @deprecated Not yet stabilised
+     */
+    public Object include(final String fileName) {  // TODO: Support jar URIs
+        try {
+            return getSandbox().getCurrentEngine().eval(new FileReader(new File(fileName)));
+        }
+        catch (final FileNotFoundException e) {
+            // FIXME: Handle better
+            System.err.println("Failed to read " + fileName);
+        }
+        catch (final ScriptException e) {
+            // FIXME: Handle better
+            System.err.println("Exception: " + e.getMessage());
+        }
+        return null;
+    }
+}
 Property changes:
 Added: svn:keywords
 +Rev Id Date
 \ No newline at end of property

 /pluggablejs/trunk/src/net/outlyer/plugins/SandboxImpl.java
 ,13 → 98,6
     }
     /**
-     * Namespace for variables used by the enviroment
-     */
-    private static String namespace() {
-        return "$net.outlyer.runtime.internal";
-    }
-    /**
      * Creates a unique variable name.
      */
     private static String uniqueVarName() {
 ,8 → 110,7
      * @see #uniqueVarName
      */
     private static String uniqueFQVarName() {
-        return new StringBuilder(namespace()).append(".")
-                    .append(uniqueVarName()).toString();
+        return Internal.getInternalObjectFieldName(uniqueVarName());
     }
     /**
 ,12 → 152,12
             // $net.outlyer.runtime.sandbox Contains a reference to this object
             //  Implementation note: PluginEnvironment.EXPORTED_SANDBOX_VARIABLE
             //   should have the same name
-            final NamespaceContainer.$Net $net = new NamespaceContainer.$Net(pE, this);
-            assert this == $net.outlyer.runtime.sandbox;
-            rhino.put("$net", $net);
+            final NamespaceContainer.$Net_Outlyer $nspc = new NamespaceContainer.$Net_Outlyer(pE, this);
+            assert this == $nspc.runtime.sandbox;
+            rhino.put(Internal.getReservedObjectName(), $nspc);
             // ....internal can be used to store random internal data, it's
             // a dynamic object so that fields can be created as needed
-            rhino.eval("$net.outlyer.runtime.internal={};");
+            rhino.eval(Internal.getInternalObjectName()+Internal.getInternalInitialisation());
             if (null != prependText) {
                 rhino.eval(prependText);

 /pluggablejs/trunk/src/net/outlyer/plugins/PluginEnvironment.java
 ,8 → 65,6
     // so the lower the number the better to reduce unexpected side effects
     private static int linesToCheckForSupport = 1;
-    static final String EXPORTED_SANDBOX_VARIABLE = "$net.outlyer.runtime.sandbox";
     {
         exportedObjects = new HashMap();
         pluginObject = null;
 ,7 → 73,9
         // plugin is guaranteed to be a SandboxAccessor, regardless of which
         // exact object it ends up mapping to, see enableSandboxAccess()
         boilerPlate.append("plugin.sandboxGetter = new java.util.concurrent.Callable(function() {")
-                   .append(" return $net.outlyer.runtime.sandbox; });\n");
+                   .append(" return ")
+                   .append(Internal.getRuntimeObjectName())
+                   .append(".sandbox; });\n");
     }
     ////////////////////////////////////////////////////////
 ,6 → 220,7
     // Non-public interface
     ////////////////////////////////////////////////////////
     /**
      * Makes a {@link SanboxAccessor}'s field <code>getSandbox</code>
      * be evaluable as a <code>Callable&lt;Sandbox&gt;</code>, i.e.,
 ,7 → 247,8
         boilerPlate.append(name).append(".sandboxGetter=new java.util.concurrent.Callable(function() {")
                    .append(" return ")
-                   .append(EXPORTED_SANDBOX_VARIABLE).append("; });\n");
+                   .append(Internal.getRuntimeObjectName())
+                   .append(".sandbox").append("; });\n");
     }
     PluginProperties checkForSupport(final URI uri) throws PluginException {

 /pluggablejs/trunk/src/net/outlyer/plugins/NamespaceContainer.java
 ,19 → 41,14
         }
     }
-    public static class Outlyer {
+    /**
+     * This object is published as $net_outlyer
+     */
+    public static class $Net_Outlyer {
         public final Runtime runtime;
-        private Outlyer(final PluginEnvironment pe, final Sandbox sandbox) {
+        $Net_Outlyer(final PluginEnvironment pe, final Sandbox sandbox) {
             runtime = new Runtime(pe, sandbox);
         }
     }
-    public static class $Net {
-        public final Outlyer outlyer;
-        $Net(final PluginEnvironment pe, final Sandbox sandbox) {
-            outlyer = new Outlyer(pe, sandbox);
-        }
-    }
 }

 /pluggablejs/trunk/Makefile
 ,7 → 5,7
 buildnum=$(shell grep 'build.number' build.num | cut -d'=' -f2)
 version=$(shell grep '<property name="version"' build.xml | sed -r 's/.*value="([^"]*)".*/\1/')
-jarbasename=pluggablejs-$(version)-build$(buildnum).jar
+jarbasename=pluggablejs-$(version)build$(buildnum).jar
 bindir=$(DESTDIR)/$(prefix)/bin

/pluggablejs/trunk/build.num
1,3 → 1,3
#Build Number for ANT. Do not edit!
#Mon Jun 30 20:53:31 CEST 2008
build.number=33
#Wed Jul 02 21:19:34 CEST 2008
build.number=34

 /pluggablejs/trunk/build.xml
 ,7 → 10,7
     <property name="depends" location="lib"/>
     <property name="version" value="1.1.0"/>
-    <property name="jarbasename" value="pluggablejs-${version}-build" /><!-- followed by build.number, can't resolve yet -->
+    <property name="jarbasename" value="pluggablejs-${version}build" /><!-- followed by build.number, can't resolve yet -->
     <target name="init">
         <!-- Create timestamp, sets TODAY (full, human), DSTAMP (yyyymmdd) and

Subversion Repositories pub

Compare Revisions

Ignore whitespace Rev 64 → Rev 65

/pluggablejs/trunk/TODO
0,0 → 1,2

? Rename $net to $net_outlyer_runtime to be less intrusive

/pluggablejs/trunk
Property changes:
Modified: svn:mergeinfo
Merged /pluggablejs/branches/1.1.1build34:r64