1.1 --- a/launcher/http/src/main/java/org/apidesign/bck2brwsr/launcher/Bck2BrwsrLauncher.java	Thu May 09 21:51:56 2013 +0200
     1.2 +++ b/launcher/http/src/main/java/org/apidesign/bck2brwsr/launcher/Bck2BrwsrLauncher.java	Sat Apr 26 19:13:56 2014 +0200
     1.3 @@ -17,8 +17,11 @@
     1.4   */
     1.5  package org.apidesign.bck2brwsr.launcher;
     1.6  
     1.7 +import java.io.File;
     1.8  import java.io.IOException;
     1.9  import java.io.InputStream;
    1.10 +import java.net.URL;
    1.11 +import java.util.jar.JarFile;
    1.12  import org.apidesign.vm4brwsr.Bck2Brwsr;
    1.13  
    1.14  /**
    1.15 @@ -36,13 +39,27 @@
    1.16      String harnessResource() {
    1.17          return "org/apidesign/bck2brwsr/launcher/harness.xhtml";
    1.18      }
    1.19 +
    1.20 +    @Override
    1.21 +    String compileJar(JarFile jar) throws IOException {
    1.22 +        return CompileCP.compileJAR(jar);
    1.23 +    }
    1.24 +
    1.25 +    @Override String compileFromClassPath(URL f) {
    1.26 +        try {
    1.27 +            return CompileCP.compileFromClassPath(f);
    1.28 +        } catch (Exception ex) {
    1.29 +            ex.printStackTrace();
    1.30 +            return null;
    1.31 +        }
    1.32 +    }
    1.33      
    1.34      @Override
    1.35      void generateBck2BrwsrJS(StringBuilder sb, final Res loader) throws IOException {
    1.36          class R implements Bck2Brwsr.Resources {
    1.37              @Override
    1.38              public InputStream get(String resource) throws IOException {
    1.39 -                return loader.get(resource);
    1.40 +                return loader.get(resource).openStream();
    1.41              }
    1.42          }
    1.43  
    1.44 @@ -54,7 +71,7 @@
    1.45              + "    request.open('GET', '/classes/' + res, false);\n"
    1.46              + "    request.send();\n"
    1.47              + "    if (request.status !== 200) return null;\n"
    1.48 -            + "    var arr = eval('(' + request.responseText + ')');\n"
    1.49 +            + "    var arr = eval(request.responseText);\n"
    1.50              + "    return arr;\n"
    1.51              + "  }\n"
    1.52              + "  var prevvm = global.bck2brwsr;\n"
    1.53 @@ -63,6 +80,7 @@
    1.54              + "    args.unshift(ldCls);\n"
    1.55              + "    return prevvm.apply(null, args);\n"
    1.56              + "  };\n"
    1.57 +            + "  global.bck2brwsr.registerExtension = prevvm.registerExtension;\n"
    1.58              + "})(this);\n"
    1.59          );
    1.60      }