1.1 --- a/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/Bck2BrwsrLauncher.java	Fri Jan 25 10:51:20 2013 +0100
     1.2 +++ b/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/Bck2BrwsrLauncher.java	Fri Jan 25 13:26:28 2013 +0100
     1.3 @@ -126,12 +126,7 @@
     1.4          HttpServer s = HttpServer.createSimpleServer(".", new PortRange(8080, 65535));
     1.5  
     1.6          final ServerConfiguration conf = s.getServerConfiguration();
     1.7 -        conf.addHttpHandler(new Page(resources, 
     1.8 -            "org/apidesign/bck2brwsr/launcher/console.xhtml",
     1.9 -            "org.apidesign.bck2brwsr.launcher.Console", "welcome", "false"
    1.10 -        ), "/console");
    1.11 -        conf.addHttpHandler(new VM(resources), "/bck2brwsr.js");
    1.12 -        conf.addHttpHandler(new VMInit(), "/vm.js");
    1.13 +        conf.addHttpHandler(new VM(resources), "/vm.js");
    1.14          conf.addHttpHandler(new Classes(resources), "/classes/");
    1.15          return s;
    1.16      }
    1.17 @@ -415,6 +410,16 @@
    1.18          public VM(Res loader) throws IOException {
    1.19              StringBuilder sb = new StringBuilder();
    1.20              Bck2Brwsr.generate(sb, loader);
    1.21 +            sb.append(
    1.22 +                "function ldCls(res) {\n"
    1.23 +                + "  var request = new XMLHttpRequest();\n"
    1.24 +                + "  request.open('GET', '/classes/' + res, false);\n"
    1.25 +                + "  request.send();\n"
    1.26 +                + "  var arr = eval('(' + request.responseText + ')');\n"
    1.27 +                + "  return arr;\n"
    1.28 +                + "}\n"
    1.29 +                + "var vm = new bck2brwsr(ldCls);\n"
    1.30 +            );
    1.31              this.bck2brwsr = sb.toString();
    1.32          }
    1.33  
    1.34 @@ -425,25 +430,6 @@
    1.35              response.getWriter().write(bck2brwsr);
    1.36          }
    1.37      }
    1.38 -    private static class VMInit extends HttpHandler {
    1.39 -        public VMInit() {
    1.40 -        }
    1.41 -
    1.42 -        @Override
    1.43 -        public void service(Request request, Response response) throws Exception {
    1.44 -            response.setCharacterEncoding("UTF-8");
    1.45 -            response.setContentType("text/javascript");
    1.46 -            response.getWriter().append(
    1.47 -                "function ldCls(res) {\n"
    1.48 -                + "  var request = new XMLHttpRequest();\n"
    1.49 -                + "  request.open('GET', '/classes/' + res, false);\n"
    1.50 -                + "  request.send();\n"
    1.51 -                + "  var arr = eval('(' + request.responseText + ')');\n"
    1.52 -                + "  return arr;\n"
    1.53 -                + "}\n"
    1.54 -                + "var vm = new bck2brwsr(ldCls);\n");
    1.55 -        }
    1.56 -    }
    1.57  
    1.58      private static class Classes extends HttpHandler {
    1.59          private final Res loader;