Fix for AVATAR_JS-106, REPL module wraped with URLHandler

Reviewed-by: kinsleyw

patches/lib/module.js.patch

@@ -1,11 +1,12 @@
---- ../nodejs/lib/module.js	2013-12-02 16:45:51.723090200 -0800
-+++ src/main/js/lib/module.js	2013-12-05 16:49:59.264917800 -0800
-@@ -271,13 +271,19 @@
+--- ../node/lib/module.js	2013-12-09 10:27:58.000000000 +0100
++++ ./src/main/js/lib/module.js	2013-12-09 11:12:07.000000000 +0100
+@@ -271,13 +271,20 @@
    return [id, [path.dirname(parent.filename)]];
  };
  
 +var AccessController = java.security.AccessController;
 +var PrivilegedAction = java.security.PrivilegedAction;       
++var Server = Packages.net.java.avatar.js.Server;
  
  Module._load = function(request, parent, isMain) {
    if (parent) {
@@ -21,16 +22,16 @@
  
    var cachedModule = Module._cache[filename];
    if (cachedModule) {
-@@ -288,7 +294,7 @@
+@@ -288,7 +295,7 @@
      // REPL is a special case, because it needs the real require.
      if (filename == 'repl') {
        var replModule = new Module('repl');
 -      replModule._compile(NativeModule.getSource('repl'), 'repl.js');
-+      replModule._compile(NativeModule.getSource('/lib/repl.js'), 'repl.js');
++      replModule._compile(null, Server.getResource('/lib/repl.js'));
        NativeModule._cache.repl = replModule;
        return replModule.exports;
      }
-@@ -309,7 +315,11 @@
+@@ -309,7 +316,11 @@
    var hadException = true;
  
    try {
@@ -42,7 +43,7 @@
      hadException = false;
    } finally {
      if (hadException) {
-@@ -325,6 +335,11 @@
+@@ -325,6 +336,11 @@
      return request;
    }
  
@@ -54,7 +55,7 @@
    var resolvedModule = Module._resolveLookupPaths(request, parent);
    var id = resolvedModule[0];
    var paths = resolvedModule[1];
-@@ -373,8 +388,11 @@
+@@ -373,8 +389,11 @@
  // Returns exception if any
  Module.prototype._compile = function(content, filename) {
    var self = this;
@@ -66,7 +67,7 @@
  
    function require(path) {
      return self.require(path);
-@@ -434,7 +452,10 @@
+@@ -434,7 +453,10 @@
    }
  
    // create wrapper function
@@ -78,7 +79,7 @@
  
    var compiledWrapper = runInThisContext(wrapper, filename, true);
    if (global.v8debug) {
-@@ -470,8 +491,7 @@
+@@ -470,8 +492,7 @@
  
  // Native extension for .js
  Module._extensions['.js'] = function(module, filename) {
@@ -88,7 +89,7 @@
  };
  
  
-@@ -508,7 +528,9 @@
+@@ -508,7 +529,9 @@
      var homeDir = process.env.HOME;
    }
  

src/main/java/net/java/avatar/js/Loader.java

@@ -126,8 +126,6 @@ public abstract class Loader {
      */
     public abstract boolean exists(final String id);
 
-    public abstract String load(final String id) throws IOException;
-
     /**
      * Returns the value of a compiled-in property.
      * @param key the key whose value is desired
@@ -195,25 +193,6 @@ public abstract class Loader {
             return BUILD_PROPERTIES.getProperty(key);
         }
 
-        @Override
-        public String load(final String id) throws IOException {
-            final int BUFFERSIZE = 64 * 1024;
-            final byte[] data = new byte[BUFFERSIZE];
-            final ByteArrayOutputStream buffer = new ByteArrayOutputStream(BUFFERSIZE);
-            try (final InputStream is = this.getClass().getResourceAsStream(id)) {
-                if (is == null) {
-                    return null;
-                } else {
-                    for (int bytesRead = is.read(data, 0, data.length);
-                         bytesRead != -1;
-                         bytesRead = is.read(data, 0, data.length)) {
-                        buffer.write(data, 0, bytesRead);
-                    }
-                }
-            }
-            return new String(buffer.toByteArray(), "utf-8");
-        }
-
         protected String pathFor(final String id) {
             return MODULES_DIR + id + SCRIPT_EXTENSION;
         }

src/main/js/net/java/avatar/js/init.js

@@ -112,15 +112,6 @@ var gc = global.gc;
         return exists;
     }
 
-    NativeModule.getSource = function(id) {
-        var source = AccessController.doPrivileged(new PrivilegedAction() {
-            run: function() {
-                return __avatar.loader.load(id);
-            }
-        }, avatarContext, avatarPermission);
-        return source;
-    }
-
     NativeModule.wrap = function(script) {
         return Packages.net.java.avatar.js.Loader.wrap(script);
     };