diff -r f18b7262fe91 -r bd80952bfd11 launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/BaseHTTPLauncher.java --- a/launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/BaseHTTPLauncher.java Sun Apr 28 17:42:49 2013 +0200 +++ b/launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/BaseHTTPLauncher.java Sun Apr 28 21:17:04 2013 +0200 @@ -41,7 +41,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.apidesign.bck2brwsr.launcher.InvocationContext.Resource; -import org.apidesign.vm4brwsr.Bck2Brwsr; import org.glassfish.grizzly.PortRange; import org.glassfish.grizzly.http.server.HttpHandler; import org.glassfish.grizzly.http.server.HttpServer; @@ -56,7 +55,7 @@ * Supports execution in native browser as well as Java's internal * execution engine. */ -class BaseHTTPLauncher extends Launcher implements Closeable { +abstract class BaseHTTPLauncher extends Launcher implements Closeable { private static final Logger LOG = Logger.getLogger(BaseHTTPLauncher.class.getName()); private static final InvocationContext END = new InvocationContext(null, null, null); private final Set loaders = new LinkedHashSet<>(); @@ -70,7 +69,7 @@ public BaseHTTPLauncher(String cmd) { this.cmd = cmd; - addClassLoader(Bck2Brwsr.class.getClassLoader()); + addClassLoader(BaseHTTPLauncher.class.getClassLoader()); setTimeout(180000); } @@ -455,29 +454,9 @@ } } - void generateBck2BrwsrJS(StringBuilder sb, Bck2Brwsr.Resources loader) throws IOException { - Bck2Brwsr.generate(sb, loader); - sb.append( - "(function WrapperVM(global) {" - + " function ldCls(res) {\n" - + " var request = new XMLHttpRequest();\n" - + " request.open('GET', '/classes/' + res, false);\n" - + " request.send();\n" - + " if (request.status !== 200) return null;\n" - + " var arr = eval('(' + request.responseText + ')');\n" - + " return arr;\n" - + " }\n" - + " var prevvm = global.bck2brwsr;\n" - + " global.bck2brwsr = function() {\n" - + " var args = Array.prototype.slice.apply(arguments);\n" - + " args.unshift(ldCls);\n" - + " return prevvm.apply(null, args);\n" - + " };\n" - + "})(this);\n"); - } + abstract void generateBck2BrwsrJS(StringBuilder sb, Object loader) throws IOException; - private class Res implements Bck2Brwsr.Resources { - @Override + private class Res { public InputStream get(String resource) throws IOException { for (ClassLoader l : loaders) { URL u = null;